Add ImportPhysicsVectorMap and use it for neutron data

whokion · Apr 1, 2024 · 611dec6 · 611dec6
1 parent bcf3788
commit 611dec6
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/celeritas/io/ImportData.hh b/src/celeritas/io/ImportData.hh
@@ -58,9 +58,7 @@ struct ImportData
     using ImportSBMap = std::map<ZInt, ImportSBTable>;
     using ImportLivermorePEMap = std::map<ZInt, ImportLivermorePE>;
     using ImportAtomicRelaxationMap = std::map<ZInt, ImportAtomicRelaxation>;
-    using ImportNeutronCaptureMap = std::map<ZInt, ImportPhysicsVector>;
-    using ImportNeutronElasticMap = std::map<ZInt, ImportPhysicsVector>;
-    using ImportNeutronInelasticMap = std::map<ZInt, ImportPhysicsVector>;
+    using ImportPhysicsVectorMap = std::map<ZInt, ImportPhysicsVector>;
     using ImportOpticalMap = std::map<MatIdx, ImportOpticalMaterial>;
     //!@}
 
@@ -77,9 +75,8 @@ struct ImportData
     ImportOpticalParameters optical_params;
     ImportSBMap sb_data;
     ImportLivermorePEMap livermore_pe_data;
-    ImportNeutronCaptureMap neutron_capture_data;
-    ImportNeutronElasticMap neutron_elastic_data;
-    ImportNeutronInelasticMap neutron_inelastic_data;
+    ImportPhysicsVectorMap neutron_elastic_data;
+    ImportPhysicsVectorMap neutron_inelastic_data;
     ImportAtomicRelaxationMap atomic_relaxation_data;
 
     std::string units;  //!< "cgs", "clhep", or "si"