Merge pull request #15 from njoy/bugfix/misc

Fixes while integrating into NJOY21
njoy · Mar 22, 2021 · 665bac1 · 665bac1
2 parents 24efb1d + ad862dc
commit 665bac1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/src/RECONR/ENDFtk.hpp b/src/RECONR/ENDFtk.hpp
@@ -1,4 +1,5 @@
 #include "ENDFtk/tree/Tape.hpp"
+#include "ENDFtk/tree/fromFile.hpp"
 #include "ENDFtk/file/1.hpp"
 #include "ENDFtk/file/2.hpp"
 #include "ENDFtk/file/3.hpp"

diff --git a/src/RECONR/RECONR/ProcessedEvaluation/src/mf1.hpp b/src/RECONR/RECONR/ProcessedEvaluation/src/mf1.hpp
@@ -38,10 +38,10 @@ auto mf1( const Logger& logger,
 
   double err = sequence[ "err" ];
   ENDFtk::section::Type< 1, 451 > mt451( 
-    mt.ZA(),    mt.AWR(),   mt.LRP(),   mt.LFI(),   mt.NLIB(),  mt.NMOD(),  
+    mt.ZA(),    mt.AWR(),   2, /*LRP*/  mt.LFI(),   mt.NLIB(),  mt.NMOD(),
     mt.ELIS(),  mt.STA(),   mt.LIS(),   mt.LISO(),  mt.NFOR(),  
     mt.AWI(),   mt.EMAX(),  mt.LREL(),  mt.NSUB(),  mt.NVER(),  
-    mt.TEMP(),  mt.LDRV(),  
+    mt.TEMP(),  1, /*LDRV*/
     std::move( description ),
     std::move( directory ),
     err // rtol

diff --git a/src/RECONR/RECONR/src/getEvaluated.hpp b/src/RECONR/RECONR/src/getEvaluated.hpp
@@ -5,8 +5,8 @@ Format_t getEvaluated( const Logger& logger, std::string filename ){
       "\nReading evaluated data from file: {}", filename )
          << std::endl;
   try {
-    auto evaluated = njoy::utility::slurpFileToMemory( filename );
-    return Format_t{ std::move( evaluated ) };
+    auto tree = ENDFtk::tree::fromFile( filename );
+    return tree;
   } catch( ... ){
     Log::info( "Error ocurred when trying to open evaluated data file: {}.",
                filename );

diff --git a/src/RECONR/ResonanceReconstructionDataDelivery/Factory/src/collectRP.hpp b/src/RECONR/ResonanceReconstructionDataDelivery/Factory/src/collectRP.hpp
@@ -7,5 +7,9 @@ RPVariant collectRP( const Material_t& material ){
 
 static
 RPVariant collectRP( const ENDFMaterial_t& material ){
+  if( not material.hasFile( 2 ) ){
+    Log::error( "ENDF file does not have MF=2." );
+    Log::info( "Unable to proceed---until changes are made." );
+  }
   return material.file( 2 ).section( 151 ).parse< 2, 151 >();
 }
diff --git a/src/RECONR/ResonanceReconstructionDataDelivery/Factory/src/projectile.hpp b/src/RECONR/ResonanceReconstructionDataDelivery/Factory/src/projectile.hpp
@@ -9,11 +9,15 @@ elementary::ParticleID projectile(
     case 10010:
       return elementary::ParticleID( elementary::NuclideID( 1, 1, 0 ) );
       break;
+    case 3:
+      return elementary::ParticleID( 
+          elementary::FundamentalParticleID( "photon" ) );
+      break;
     default:
+      Log::error( "Failed to create a projectile." );
       Log::info( "I don't know how to make a particle ID out of: {}.", 
                  info.NSUB() );
       throw std::exception();
-
   }
 }