diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx index 66b0e0bdb16cb63844caa55906c220dd209a716c..565dc69ecbaae94c69074747c57a35958971fa50 100644 --- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx +++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx @@ -55,25 +55,10 @@ iGeant4::G4TransportTool::G4TransportTool(const std::string& type, const IInterface* parent ) : ISF::BaseSimulatorTool(type, name, parent) { - declareProperty("Dll", m_libList); - declareProperty("Physics", m_physList); - declareProperty("FieldMap", m_fieldMap); - declareProperty("ReleaseGeoModel", m_releaseGeoModel); - declareProperty("RecordFlux", m_recordFlux); - declareProperty("McEventCollection", m_mcEventCollectionName); - declareProperty("G4Commands", m_g4commands, "Commands to send to the G4UI"); - declareProperty("MultiThreading", m_useMT, "Multi-threading specific settings"); //declareProperty("KillAllNeutrinos", m_KillAllNeutrinos=true); //declareProperty("KillLowEPhotons", m_KillLowEPhotons=-1.); - declareProperty("PrintTimingInfo", m_doTiming ); - declareProperty("ActivateParallelWorlds",m_activateParallelGeometries,"Toggle on/off the G4 parallel geometry system"); - } -//________________________________________________________________________ -iGeant4::G4TransportTool::~G4TransportTool() -{} - //________________________________________________________________________ StatusCode iGeant4::G4TransportTool::initialize() { diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h index ee3fcd7668243331600cd73dbdb42016984ab80a..88a82528d910806fbc147b096daebed2d769d9e8 100644 --- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h +++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h @@ -63,7 +63,7 @@ namespace iGeant4 G4TransportTool(const std::string&,const std::string&,const IInterface*); /** Destructor */ - virtual ~G4TransportTool (); + virtual ~G4TransportTool () = default; /** AlgTool initialize method */ virtual StatusCode initialize() override final; @@ -102,7 +102,7 @@ namespace iGeant4 /// @{ // timing checks - bool m_doTiming{true}; + Gaudi::Property<bool> m_doTiming{this, "PrintTimingInfo", true, ""}; //float m_runTime; float m_accumulatedEventTime{0.}; float m_accumulatedEventTimeSq{0.}; @@ -120,21 +120,21 @@ namespace iGeant4 mutex_t m_mutex; }; mutable SG::SlotSpecificObj<Slot> m_slots ATLAS_THREAD_SAFE; - std::string m_mcEventCollectionName{"TruthEvent"}; + Gaudi::Property<std::string> m_mcEventCollectionName{this, "McEventCollection", "TruthEvent", ""}; /// Helper Tool to provide G4RunManager PublicToolHandle<ISF::IG4RunManagerHelper> m_g4RunManagerHelper{this, "G4RunManagerHelper", "iGeant4::G4RunManagerHelper/G4RunManagerHelper", ""}; G4AtlasRunManager *m_pRunMgr{}; - std::string m_libList{""}; - std::string m_physList{""}; - std::string m_fieldMap{""}; - bool m_releaseGeoModel{true}; - bool m_recordFlux{false}; + Gaudi::Property<std::string> m_libList{this, "Dll", "", ""}; + Gaudi::Property<std::string> m_physList{this, "Physics", "", ""}; + Gaudi::Property<std::string> m_fieldMap{this, "FieldMap", "", ""}; + Gaudi::Property<bool> m_releaseGeoModel{this, "ReleaseGeoModel", true, ""}; + Gaudi::Property<bool> m_recordFlux{this, "RecordFlux", false, ""}; /// Commands to send to the G4 UI - std::vector<std::string> m_g4commands; + Gaudi::Property<std::vector<std::string> > m_g4commands{this, "G4Commands", {}, "Commands to send to the G4UI"}; /// Activate multi-threading configuration - bool m_useMT{false}; - bool m_activateParallelGeometries{false}; + Gaudi::Property<bool> m_useMT{this,"MultiThreading", false, "Multi-threading specific settings"}; + Gaudi::Property<bool> m_activateParallelGeometries{this, "ActivateParallelWorlds", false, "Toggle on/off the G4 parallel geometry system"}; // Random number service ServiceHandle<IAthRNGSvc> m_rndmGenSvc{this, "RandomNumberService", "AthRNGSvc", ""}; ///