diff --git a/Common/SimConfig/include/SimConfig/G4Params.h b/Common/SimConfig/include/SimConfig/G4Params.h index fe8b269a230af..3c6506bddf801 100644 --- a/Common/SimConfig/include/SimConfig/G4Params.h +++ b/Common/SimConfig/include/SimConfig/G4Params.h @@ -24,8 +24,8 @@ namespace conf enum class EG4Physics { kFTFP_BERT_optical = 0, /* just ordinary */ kFTFP_BERT_optical_biasing = 1, /* with biasing enabled */ - kFTFP_INCLXX_optical = 2, /* special INCL++ version */ - kFTFP_BERT_HP_optical = 3 /* enable low energy neutron transport */ + kFTFP_INCLXX_optical = 2, /* special INCL++ version */ + kFTFP_BERT_HP_optical = 3 /* enable low energy neutron transport */ }; // parameters to influence the G4 engine diff --git a/Common/SimConfig/include/SimConfig/SimParams.h b/Common/SimConfig/include/SimConfig/SimParams.h index ad57c099eeeee..2c103f43b2b04 100644 --- a/Common/SimConfig/include/SimConfig/SimParams.h +++ b/Common/SimConfig/include/SimConfig/SimParams.h @@ -37,7 +37,7 @@ struct SimCutParams : public o2::conf::ConfigurableParamHelper { float tunnelZ = 1900; // Z-value from where we apply maxRTrackingZDC (default value taken from standard "hall" dimensions) float globalDensityFactor = 1.f; // global factor that scales all material densities for systematic studies - bool lowneut = false; + bool lowneut = false; O2ParamDef(SimCutParams, "SimCutParams"); }; diff --git a/Common/SimConfig/src/G4Params.cxx b/Common/SimConfig/src/G4Params.cxx index bed38245cb34b..48f7a1c240d7b 100644 --- a/Common/SimConfig/src/G4Params.cxx +++ b/Common/SimConfig/src/G4Params.cxx @@ -19,8 +19,8 @@ namespace conf namespace { - static const std::string confstrings[4] = {"FTFP_BERT_EMV+optical", "FTFP_BERT_EMV+optical+biasing", "FTFP_INCLXX_EMV+optical", - "FTFP_BERT_HP_EMV+optical"}; +static const std::string confstrings[4] = {"FTFP_BERT_EMV+optical", "FTFP_BERT_EMV+optical+biasing", "FTFP_INCLXX_EMV+optical", + "FTFP_BERT_HP_EMV+optical"}; } std::string const& G4Params::getPhysicsConfigString() const diff --git a/Detectors/Base/include/DetectorsBase/MaterialManager.h b/Detectors/Base/include/DetectorsBase/MaterialManager.h index 1a4edd8a52969..4448998ee3d33 100644 --- a/Detectors/Base/include/DetectorsBase/MaterialManager.h +++ b/Detectors/Base/include/DetectorsBase/MaterialManager.h @@ -132,8 +132,8 @@ class MaterialManager void SpecialCut(const char* modname, int localindex, ECut parID, Float_t val); /// Set flag fro low energy neutron transport - void SetLowEnergyNeutronTransport(bool flag) {mLowNeut = flag;} - + void SetLowEnergyNeutronTransport(bool flag) { mLowNeut = flag; } + /// load cuts and process flags from a data file (like AliRoot did) void loadCutsAndProcessesFromFile(const char* modname, const char* filename); void loadCutsAndProcessesFromJSON(ESpecial special = ESpecial::kFALSE, std::string const& filename = ""); @@ -269,6 +269,7 @@ class MaterialManager bool mApplySpecialCuts = true; /// Flag for low energy neutron transport bool mLowNeut = false; + public: ClassDefNV(MaterialManager, 0); }; diff --git a/Detectors/Base/src/MaterialManager.cxx b/Detectors/Base/src/MaterialManager.cxx index 1f4a91f4dcbb2..1c636f65ab4e8 100644 --- a/Detectors/Base/src/MaterialManager.cxx +++ b/Detectors/Base/src/MaterialManager.cxx @@ -255,8 +255,9 @@ void MaterialManager::Cut(ESpecial special, int globalindex, ECut cut, Float_t v return; } // if low energy neutron transport is requested seeting kCUTNEU will set to 0.005eV - if (mLowNeut && cut == ECut::kCUTNEU) val = 5.e-12; - + if (mLowNeut && cut == ECut::kCUTNEU) + val = 5.e-12; + auto it = mCutIDToName.find(cut); if (it == mCutIDToName.end()) { return;