Preparatory changes for the HepMC3 migration for packages in AthSimulation
This merge request mainly makes the following replacements for classes which are part of the AthSimulation project:
HepMC::GenParticle* --> HepMC::GenParticlePtr
const HepMC::GenParticle* --> HepMC::ConstGenParticlePtr
HepMC::GenVertex* --> HepMC::GenVertexPtr
const HepMC::GenVertex* --> HepMC::ConstGenVertexPtr
Plus a few other syntax replacements to use helper functions defined in AtlasHepMC/GenParticle.h
and AtlasHepMC/GenVertex.h
.
The purpose is to prepare for the migration from HepMC2 to HepMC3. Further syntax changes will be required.
Merge request reports
Activity
added 235 commits
-
e1bf2109...f9deb867 - 224 commits from branch
atlas:master
- 45a5300c - Tweak ConstGenParticlePtr and ConstGenVertexPtr definitions for HepMC2
- 5e545bdb - Migrate MCTruth package to use (Const)GenParticlePtr
- 6db0bcfd - Migrate ISF_Core and ISF_Geant4 packages to use (Const)GenParticlePtr
- 4431e700 - Migrate Frozen Showers packages to use (Const)GenParticlePtr
- db82677d - Migrate BeamEffects package to use (Const)GenParticlePtr
- 9e89b093 - Migrate G4UserActions and TrackWriteFastSim packages to use (Const)GenParticlePtr
- 846850e7 - Migrate TruthUtils package to use (Const)GenParticlePtr
- da8d37de - Migrate McEventCollectionFilter package to use (Const)GenParticlePtr
- 2bec5e3e - Migrate xAODTruthCnv package to use (Const)GenParticlePtr
- 9f161eb7 - Migrate HitAnalysis package to use the HepMC::barcode helper method
- baa37b58 - Migrate TruthJiveXML package to use the HepMC::barcode helper method
Toggle commit list-
e1bf2109...f9deb867 - 224 commits from branch
This merge request affects 18 packages:
- Event/xAOD/xAODTruthCnv
- Generators/AtlasHepMC
- Generators/TruthUtils
- LArCalorimeter/LArG4/LArG4FastSimulation
- LArCalorimeter/LArG4/LArG4ShowerLib
- Simulation/BeamEffects
- Simulation/G4Sim/MCTruth
- Simulation/G4Utilities/G4UserActions
- Simulation/G4Utilities/TrackWriteFastSim
- Simulation/ISF/ISF_Core/ISF_Event
- Simulation/ISF/ISF_Core/ISF_Services
- Simulation/ISF/ISF_Geant4/ISF_Geant4Event
- Simulation/ISF/ISF_Geant4/ISF_Geant4Tools
- Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools
- Simulation/ISF/ISF_SimulationSelectors
- Simulation/Tools/HitAnalysis
- Simulation/Tools/McEventCollectionFilter
- Simulation/TruthJiveXML
Adding @zmarshal ,@jchapman ,@akraszna ,@pavol ,@vpascuzz as watchers
added EDM Generators JetEtmiss LAr Simulation master labels
CI Result FAILURE (hash baa37b58)Athena AthSimulation AnalysisBase AthGeneration externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 1, warnings 7
AthSimulation: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 16710]added 8 commits
- ff3adbf2 - Migrate ISF_Core and ISF_Geant4 packages to use (Const)GenParticlePtr
- 0937668f - Migrate Frozen Showers packages to use (Const)GenParticlePtr
- 6fea7b14 - Migrate BeamEffects package to use (Const)GenParticlePtr
- 84a8cd60 - Migrate G4UserActions and TrackWriteFastSim packages to use (Const)GenParticlePtr
- 117eab0e - Migrate TruthUtils package to use (Const)GenParticlePtr
- edc9deba - Migrate McEventCollectionFilter package to use (Const)GenParticlePtr
- 0faf241d - Migrate xAODTruthCnv package to use (Const)GenParticlePtr
- 4d9ae908 - Migrate TruthJiveXML package to use the HepMC::barcode helper method
Toggle commit listThis merge request affects 17 packages:
- Event/xAOD/xAODTruthCnv
- Generators/AtlasHepMC
- Generators/TruthUtils
- LArCalorimeter/LArG4/LArG4FastSimulation
- LArCalorimeter/LArG4/LArG4ShowerLib
- Simulation/BeamEffects
- Simulation/G4Sim/MCTruth
- Simulation/G4Utilities/G4UserActions
- Simulation/G4Utilities/TrackWriteFastSim
- Simulation/ISF/ISF_Core/ISF_Event
- Simulation/ISF/ISF_Core/ISF_Services
- Simulation/ISF/ISF_Geant4/ISF_Geant4Event
- Simulation/ISF/ISF_Geant4/ISF_Geant4Tools
- Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools
- Simulation/ISF/ISF_SimulationSelectors
- Simulation/Tools/McEventCollectionFilter
- Simulation/TruthJiveXML
Adding @zmarshal ,@jchapman ,@akraszna ,@pavol ,@vpascuzz as watchers
CI Result SUCCESS (hash 4d9ae908)Athena AthSimulation AnalysisBase AthGeneration externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 1
AthSimulation: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 16730]added 8 commits
- 996c1537 - Migrate ISF_Core and ISF_Geant4 packages to use (Const)GenParticlePtr
- 509eabd3 - Migrate Frozen Showers packages to use (Const)GenParticlePtr
- ba77fb24 - Migrate BeamEffects package to use (Const)GenParticlePtr
- 642d3573 - Migrate G4UserActions and TrackWriteFastSim packages to use (Const)GenParticlePtr
- ba0b8345 - Migrate TruthUtils package to use (Const)GenParticlePtr
- 8cc87eda - Migrate McEventCollectionFilter package to use (Const)GenParticlePtr
- e7222ecd - Migrate xAODTruthCnv package to use (Const)GenParticlePtr
- 8dd70780 - Migrate TruthJiveXML package to use the HepMC::barcode helper method
Toggle commit listThis merge request affects 17 packages:
- Event/xAOD/xAODTruthCnv
- Generators/AtlasHepMC
- Generators/TruthUtils
- LArCalorimeter/LArG4/LArG4FastSimulation
- LArCalorimeter/LArG4/LArG4ShowerLib
- Simulation/BeamEffects
- Simulation/G4Sim/MCTruth
- Simulation/G4Utilities/G4UserActions
- Simulation/G4Utilities/TrackWriteFastSim
- Simulation/ISF/ISF_Core/ISF_Event
- Simulation/ISF/ISF_Core/ISF_Services
- Simulation/ISF/ISF_Geant4/ISF_Geant4Event
- Simulation/ISF/ISF_Geant4/ISF_Geant4Tools
- Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools
- Simulation/ISF/ISF_SimulationSelectors
- Simulation/Tools/McEventCollectionFilter
- Simulation/TruthJiveXML
Adding @zmarshal ,@jchapman ,@akraszna ,@pavol ,@vpascuzz as watchers
added review-pending-level-1 label
FYI @averbyts.
CI Result SUCCESS (hash 8dd70780)Athena AthSimulation AnalysisBase AthGeneration externals cmake make required tests optional tests Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 16762]added review-approved label and removed review-pending-level-1 label
mentioned in commit 416beb44
added sweep:ignore label