Use HepMC functions from AtlasHepMC/MagicNumbers.h for selection

Use HepMC functions from AtlasHepMC/MagicNumbers.h for selection

Tag @jchapman @ewelina @christos

Please have a look.

Note:

• This MR should be supplemented with another one, which would remove the conditions in a bit more complex places
• The original logic in master sometimes uses >= and sometimes > for comparison. After this MR it will be at least consistent.

This merge request affects 17 packages:

• Generators/GenAnalysisTools/TruthHelper
• Generators/GeneratorFilters
• Generators/TruthUtils
• PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis
• PhysicsAnalysis/D3PDMaker/TruthD3PDMaker
• PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth
• Reconstruction/Jet/JetSimTools
• Reconstruction/egamma/EgammaPhysValMonitoring
• Simulation/G4Atlas/G4AtlasTests
• Simulation/G4Utilities/TrackWriteFastSim
• Simulation/Tools/HitAnalysis
• Simulation/Tools/McEventCollectionFilter
• Tracking/TrkValidation/TrkValAlgs
• Tracking/TrkVertexFitter/TrkVertexSeedFinderTools
• Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim
• Trigger/TrigT1/TrigT1NSWSimTools

Affected files list will not be printed in this case

Adding @zmarshal ,@jcatmore ,@calpigia ,@serodrig ,@thompson ,@amorley ,@jchapman ,@goetz as watchers

added Analysis Derivation Egamma Generators JetEtmiss Reconstruction Simulation Tracking Trigger analysis-review-required master review-pending-level-1 labels

added 1 commit

• c1e18108 - One more change

Compare with previous version

This merge request affects 17 packages:

• Generators/GenAnalysisTools/TruthHelper
• Generators/GeneratorFilters
• Generators/TruthUtils
• PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis
• PhysicsAnalysis/D3PDMaker/TruthD3PDMaker
• PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth
• Reconstruction/Jet/JetSimTools
• Reconstruction/egamma/EgammaPhysValMonitoring
• Simulation/G4Atlas/G4AtlasTests
• Simulation/G4Utilities/TrackWriteFastSim
• Simulation/Tools/HitAnalysis
• Simulation/Tools/McEventCollectionFilter
• Tracking/TrkValidation/TrkValAlgs
• Tracking/TrkVertexFitter/TrkVertexSeedFinderTools
• Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim
• Trigger/TrigT1/TrigT1NSWSimTools

Affected files list will not be printed in this case

Adding @zmarshal ,@jcatmore ,@calpigia ,@serodrig ,@thompson ,@amorley ,@jchapman ,@goetz as watchers

CI integration tests for projects Athena,AthSimulation are cancelled because of compilation error(s)

CI Result FAILURE (hash b9cd621d)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 1, warnings 0
AthSimulation: number of compilation errors 1, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 62267]

CI integration tests for projects Athena,AthSimulation are cancelled because of compilation error(s)

CI Result FAILURE (hash c1e18108)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 1, warnings 0
AthSimulation: number of compilation errors 1, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 62268]

removed review-pending-level-1 label

added review-user-action-required label

added 33 commits

• c1e18108...f01404ff - 30 commits from branch atlas:master
• d0a6128d - Merge remote-tracking branch 'upstream/master' into use_hepmc_functions_for_simulations
• 0098d75c - Comments from John
• 8f3730fc - Comments from John

Compare with previous version

resolved all threads

Hi @jchapman , I've added comments.

This merge request affects 17 packages:

• Generators/GenAnalysisTools/TruthHelper
• Generators/GeneratorFilters
• Generators/TruthUtils
• PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis
• PhysicsAnalysis/D3PDMaker/TruthD3PDMaker
• PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth
• Reconstruction/Jet/JetSimTools
• Reconstruction/egamma/EgammaPhysValMonitoring
• Simulation/G4Atlas/G4AtlasTests
• Simulation/G4Utilities/TrackWriteFastSim
• Simulation/Tools/HitAnalysis
• Simulation/Tools/McEventCollectionFilter
• Tracking/TrkValidation/TrkValAlgs
• Tracking/TrkVertexFitter/TrkVertexSeedFinderTools
• Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim
• Trigger/TrigT1/TrigT1NSWSimTools

Affected files list will not be printed in this case

Adding @zmarshal ,@jcatmore ,@calpigia ,@serodrig ,@thompson ,@amorley ,@jchapman ,@goetz as watchers

added review-pending-level-1 label and removed review-user-action-required label

There were multiple CI triggers for this MR and commit. The system ignored duplicates but the GitLab pipeline status may incorrectly show the job as failed. Once the remaining job finished running, the CI results will be posted as usual.

added 1 commit

• b144abe4 - Add the misssing header

Compare with previous version

This merge request affects 17 packages:

• Generators/GenAnalysisTools/TruthHelper
• Generators/GeneratorFilters
• Generators/TruthUtils
• PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis
• PhysicsAnalysis/D3PDMaker/TruthD3PDMaker
• PhysicsAnalysis/D3PDMaker/egammaD3PDAnalysis
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth
• Reconstruction/Jet/JetSimTools
• Reconstruction/egamma/EgammaPhysValMonitoring
• Simulation/G4Atlas/G4AtlasTests
• Simulation/G4Utilities/TrackWriteFastSim
• Simulation/Tools/HitAnalysis
• Simulation/Tools/McEventCollectionFilter
• Tracking/TrkValidation/TrkValAlgs
• Tracking/TrkVertexFitter/TrkVertexSeedFinderTools
• Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim
• Trigger/TrigT1/TrigT1NSWSimTools

Affected files list will not be printed in this case

Adding @zmarshal ,@jcatmore ,@calpigia ,@serodrig ,@thompson ,@amorley ,@jchapman ,@goetz as watchers

CI integration tests for projects Athena,AthSimulation are cancelled because of compilation error(s)

CI Result FAILURE (hash 8f3730fc)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 1, warnings 0
AthSimulation: number of compilation errors 1, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 62396]

CI Result SUCCESS (hash b144abe4)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 62400]

added review-approved label and removed review-pending-level-1 label

Looks good to me. Approved. (L1)

Hi @gouighri and @gmarchio,

Are you happy with this from the analysis side? It's blocking other clean-up for the HepMC3 migration, so we'd like to get it merged today if possible.

Cheers,

John

Hi @jchapman,

my shift week starts tomorrow at 5 pm, before I am busy - I think @gouighri can review and sign off this MR from AR side

Cheers Giovanni

added analysis-review-approved label and removed analysis-review-required label

Many thanks @gouighri.

merged

mentioned in commit 5862564f

added sweep:ignore label