Skip to content

WIP: Another step to rationalise the G4AtlasRunManagers code (both ST and MT) and...

Andrea Dell'Acqua requested to merge (removed):SimulationSelectorRefactor_master into master

Another step to rationalise the G4AtlasRunManagers code (both ST and MT) and extend the MT mechanism to ISF

  • a new package G4AtlasRun was created and populated with all relevant files which used to be under G4AtlasAlg

new file: Simulation/G4Atlas/G4AtlasRun/CMakeLists.txt new file: Simulation/G4Atlas/G4AtlasRun/src/components/G4AtlasRun_entries.cxx renamed: Simulation/G4Atlas/G4AtlasAlg/G4AtlasAlg/G4AtlasMTRunManager.h -> Simulation/G4Atlas/G4AtlasRun/G4AtlasRun/G4AtlasMTRunManager.h renamed: Simulation/G4Atlas/G4AtlasAlg/G4AtlasAlg/G4AtlasRunManager.h -> Simulation/G4Atlas/G4AtlasRun/G4AtlasRun/G4AtlasSTRunManager.h renamed: Simulation/G4Atlas/G4AtlasAlg/G4AtlasAlg/G4AtlasUserWorkerThreadInitialization.h -> Simulation/G4Atlas/G4AtlasRun/G4AtlasRun/G4AtlasUserWorkerThreadInitialization.h renamed: Simulation/G4Atlas/G4AtlasAlg/G4AtlasAlg/G4AtlasWorkerRunManager.h -> Simulation/G4Atlas/G4AtlasRun/G4AtlasRun/G4AtlasWorkerRunManager.h renamed: Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasFluxRecorder.cxx -> Simulation/G4Atlas/G4AtlasRun/src/G4AtlasFluxRecorder.cxx renamed: Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasFluxRecorder.h -> Simulation/G4Atlas/G4AtlasRun/src/G4AtlasFluxRecorder.h renamed: Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasMTRunManager.cxx -> Simulation/G4Atlas/G4AtlasRun/src/G4AtlasMTRunManager.cxx renamed: Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasRunManager.cxx -> Simulation/G4Atlas/G4AtlasRun/src/G4AtlasSTRunManager.cxx renamed: Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasUserWorkerThreadInitialization.cxx -> Simulation/G4Atlas/G4AtlasRun/src/G4AtlasUserWorkerThreadInitialization.cxx renamed: Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasWorkerRunManager.cxx -> Simulation/G4Atlas/G4AtlasRun/src/G4AtlasWorkerRunManager.cxx

  • a class which used to be under Simulation/ISF/ISF_Geant4/ISF_Geant4Tools was also moved to G4AtlasRun to avoid X-dependencies

renamed: Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4DetectorConstruction.cxx -> Simulation/G4Atlas/G4AtlasRun/src/G4DetectorConstruction.cxx renamed: Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4DetectorConstruction.h -> Simulation/G4Atlas/G4AtlasRun/src/G4DetectorConstruction.h

  • the G4RunManagerHelper set of classes in Simulation/ISF/ISF_Geant4/ISF_Geant4Tools was moved to G4AtlasAlg and heavily modified

renamed: Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/ISF_Geant4Tools/IG4RunManagerHelper.h -> Simulation/G4Atlas/G4AtlasRun/G4AtlasRun/IG4RunManagerHelper.h deleted: Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4RunManagerHelper.cxx deleted: Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4RunManagerHelper.h new file: Simulation/G4Atlas/G4AtlasRun/G4AtlasRun/G4RunManagerHelper.h new file: Simulation/G4Atlas/G4AtlasRun/src/G4RunManagerHelper.cxx

  • files in G4AtlasAlg , ISF_FatrasToolsG4 and ISF_Geant4Tools were modified to use the new layout

modified: Simulation/G4Atlas/G4AtlasAlg/CMakeLists.txt modified: Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.cxx modified: Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.h modified: Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt modified: Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h modified: Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4ParticleDecayHelper.h modified: Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx modified: Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4ParticleDecayHelper.cxx modified: Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt modified: Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx modified: Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h modified: Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/components/ISF_Geant4Tools_entries.cxx

Merge request reports