Adding interaction type

Author: whaeck

src/dryad/InteractionType.hpp

@@ -0,0 +1,20 @@
+#ifndef NJOY_DRYAD_INTERACTIONTYPE
+#define NJOY_DRYAD_INTERACTIONTYPE
+
+// system includes
+
+// other includes
+
+namespace njoy {
+namespace dryad {
+
+enum class InteractionType : short {
+
+  Atomic = 1,
+  Nuclear = 2
+};
+
+} // dryad namespace
+} // njoy namespace
+
+#endif

src/dryad/ProjectileTarget.hpp

@@ -6,6 +6,7 @@
 
 // other includes
 #include "dryad/type-aliases.hpp"
+#include "dryad/InteractionType.hpp"
 #include "dryad/ParticleID.hpp"
 #include "dryad/Reaction.hpp"
 
@@ -22,6 +23,8 @@ namespace dryad {
     ParticleID projectile_id_;
     ParticleID target_id_;
 
+    InteractionType interaction_;
+
     std::vector< Reaction > reactions_;
 
     bool linearised_;

src/dryad/format/endf/createInteractionType.hpp

@@ -0,0 +1,46 @@
+#ifndef NJOY_DRYAD_FORMAT_ENDF_CREATEINTERACTIONTYPE
+#define NJOY_DRYAD_FORMAT_ENDF_CREATEINTERACTIONTYPE
+
+// system includes
+#include <vector>
+
+// other includes
+#include "tools/Log.hpp"
+#include "dryad/InteractionType.hpp"
+
+namespace njoy {
+namespace dryad {
+namespace format {
+namespace endf {
+
+  /**
+   *  @brief Create the interaction type
+   */
+  InteractionType createInteractionType( int sublibrary ) {
+
+    switch ( sublibrary ) {
+
+      case     0 : return InteractionType::Nuclear;
+      case     3 : return InteractionType::Atomic;
+      case    10 : return InteractionType::Nuclear;
+      case   113 : return InteractionType::Atomic;
+      case 10010 : return InteractionType::Nuclear;
+      case 10020 : return InteractionType::Nuclear;
+      case 10030 : return InteractionType::Nuclear;
+      case 20030 : return InteractionType::Nuclear;
+      case 20040 : return InteractionType::Nuclear;
+      default : {
+
+        Log::error( "ENDF sublibrary {} does not define projectile-target data",
+                    sublibrary );
+        throw std::exception();
+      }
+    }
+  }
+
+} // endf namespace
+} // format namespace
+} // dryad namespace
+} // njoy namespace
+
+#endif

src/dryad/format/endf/createParticleID.hpp

@@ -21,9 +21,9 @@ namespace endf {
     switch ( sublibrary ) {
 
       case     0 : return ParticleID( "g" );
-      case     3 : return ParticleID( "photoatomic" );
+      case     3 : return ParticleID( "g" );
       case    10 : return ParticleID( "n" );
-      case   113 : return ParticleID( "e" );
+      case   113 : return ParticleID( "e-" );
       case 10010 : return ParticleID( "p" );
       case 10020 : return ParticleID( "d" );
       case 10030 : return ParticleID( "t" );

src/dryad/format/endf/test/CMakeLists.txt

@@ -1,7 +1,8 @@
-add_cpp_test( format.endf.createBoundaries   createBoundaries.test.cpp )
-add_cpp_test( format.endf.createInterpolant  createInterpolant.test.cpp )
-add_cpp_test( format.endf.createInterpolants createInterpolants.test.cpp )
-add_cpp_test( format.endf.createParticleID   createParticleID.test.cpp )
+add_cpp_test( format.endf.createBoundaries      createBoundaries.test.cpp )
+add_cpp_test( format.endf.createInterpolant     createInterpolant.test.cpp )
+add_cpp_test( format.endf.createInterpolants    createInterpolants.test.cpp )
+add_cpp_test( format.endf.createParticleID      createParticleID.test.cpp )
+add_cpp_test( format.endf.createInteractionType createInteractionType.test.cpp )
 
 add_cpp_test( format.endf.createTabulatedCrossSection     createTabulatedCrossSection.test.cpp )
 add_cpp_test( format.endf.createReaction                  createReaction.test.cpp )

src/dryad/format/endf/test/createInteractionType.test.cpp

@@ -0,0 +1,40 @@
+// include Catch2
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+using Catch::Matchers::WithinRel;
+
+// what we are testing
+#include "dryad/format/endf/createInteractionType.hpp"
+
+// other includes
+
+// convenience typedefs
+using namespace njoy::dryad;
+
+SCENARIO( "createInteractionType" ) {
+
+  GIVEN( "ENDF sublibrary values" ) {
+
+    WHEN( "a single sublibrary value is given" ) {
+
+      THEN( "it can be converted" ) {
+
+        CHECK( InteractionType::Nuclear == format::endf::createInteractionType( 0 ) );
+        CHECK( InteractionType::Atomic == format::endf::createInteractionType( 3 ) );
+        CHECK( InteractionType::Nuclear == format::endf::createInteractionType( 10 ) );
+        CHECK( InteractionType::Atomic == format::endf::createInteractionType( 113 ) );
+        CHECK( InteractionType::Nuclear == format::endf::createInteractionType( 10010 ) );
+        CHECK( InteractionType::Nuclear == format::endf::createInteractionType( 10020 ) );
+        CHECK( InteractionType::Nuclear == format::endf::createInteractionType( 10030 ) );
+        CHECK( InteractionType::Nuclear == format::endf::createInteractionType( 20030 ) );
+        CHECK( InteractionType::Nuclear == format::endf::createInteractionType( 20040 ) );
+      } // THEN
+
+      THEN( "an exception is thrown for an unknown or unsupported sublibrary type" ) {
+
+        CHECK_THROWS( format::endf::createInteractionType( 1 ) );
+        CHECK_THROWS( format::endf::createInteractionType( 40090 ) );
+      } // THEN
+    } // WHEN
+  } // GIVEN
+} // SCENARIO

src/dryad/format/endf/test/createParticleID.test.cpp

@@ -19,7 +19,15 @@ SCENARIO( "createParticleID" ) {
 
       THEN( "it can be converted" ) {
 
+        CHECK( ParticleID( "g" ) == format::endf::createParticleID( 0 ) );
+        CHECK( ParticleID( "g" ) == format::endf::createParticleID( 3 ) );
         CHECK( ParticleID( "n" ) == format::endf::createParticleID( 10 ) );
+        CHECK( ParticleID( "e-" ) == format::endf::createParticleID( 113 ) );
+        CHECK( ParticleID( "p" ) == format::endf::createParticleID( 10010 ) );
+        CHECK( ParticleID( "d" ) == format::endf::createParticleID( 10020 ) );
+        CHECK( ParticleID( "t" ) == format::endf::createParticleID( 10030 ) );
+        CHECK( ParticleID( "he3" ) == format::endf::createParticleID( 20030 ) );
+        CHECK( ParticleID( "a" ) == format::endf::createParticleID( 20040 ) );
       } // THEN
 
       THEN( "an exception is thrown for an unknown or unsupported sublibrary type" ) {