Merge branch 'master' into METTrig-test-1 (af966c65) · Commits · Peter Sherwood / athena

Commit af966c65 authored 6 years ago by Manfredi Ronzani

Merge branch 'master' into METTrig-test-1

Former-commit-id: f776e6dc

parents 9dbc329e 91ca0271

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/AsgSelectionToolWrapper.cxx 11 additions, 11 deletions

.../DerivationFrameworkTools/src/AsgSelectionToolWrapper.cxx
Simulation/G4Atlas/G4AtlasAlg/G4AtlasAlg/G4AtlasRunManager.h 3 additions, 3 deletions

Simulation/G4Atlas/G4AtlasAlg/G4AtlasAlg/G4AtlasRunManager.h
Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.cxx 1 addition, 1 deletion

Simulation/G4Atlas/G4AtlasAlg/src/G4AtlasAlg.cxx
Simulation/ISF/ISF_Config/share/AllDet_detDescr.py 0 additions, 4 deletions

Simulation/ISF/ISF_Config/share/AllDet_detDescr.py
Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt 1 addition, 0 deletions

Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/CMakeLists.txt
Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h 20 additions, 11 deletions

...s/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h
Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx 18 additions, 29 deletions

...SF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx
Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt 2 additions, 1 deletion

Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/CMakeLists.txt
Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/ISF_Geant4Tools/G4AtlasRunManager.h 0 additions, 125 deletions

...eant4/ISF_Geant4Tools/ISF_Geant4Tools/G4AtlasRunManager.h
Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/ISF_Geant4Tools/IG4RunManagerHelper.h 2 additions, 2 deletions

...nt4/ISF_Geant4Tools/ISF_Geant4Tools/IG4RunManagerHelper.h
Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4AtlasRunManager.cxx 0 additions, 234 deletions

.../ISF/ISF_Geant4/ISF_Geant4Tools/src/G4AtlasRunManager.cxx
Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4RunManagerHelper.cxx 1 addition, 1 deletion

...ISF/ISF_Geant4/ISF_Geant4Tools/src/G4RunManagerHelper.cxx
Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4RunManagerHelper.h 1 addition, 1 deletion

...n/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4RunManagerHelper.h
Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx 2 additions, 2 deletions

...tion/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx
Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h 2 additions, 2 deletions

...lation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.h
TileCalorimeter/TileConditions/TileConditions/ITileCellNoiseTool.h 3 additions, 7 deletions

...imeter/TileConditions/TileConditions/ITileCellNoiseTool.h
TileCalorimeter/TileConditions/TileConditions/ITileCondToolOfc.h 2 additions, 5 deletions

...orimeter/TileConditions/TileConditions/ITileCondToolOfc.h
TileCalorimeter/TileConditions/TileConditions/TileCellNoiseTool.h 10 additions, 8 deletions

...rimeter/TileConditions/TileConditions/TileCellNoiseTool.h
TileCalorimeter/TileConditions/TileConditions/TileCondToolOfc.h 8 additions, 6 deletions

...lorimeter/TileConditions/TileConditions/TileCondToolOfc.h
TileCalorimeter/TileConditions/src/TileCellNoiseTool.cxx 3 additions, 17 deletions

TileCalorimeter/TileConditions/src/TileCellNoiseTool.cxx

with 90 additions and 470 deletions

Please register or to comment