Skip to content

Porting DerivationFrameworkMCTruth to release 22: sweep of source code

James Catmore requested to merge jcatmore/athena:master-fixDAODTruth-part2 into master

This big MR is a manual sweep of the source code in DerivationFrameworkMCTruth to master. It is a pre-requisite for producing DAOD_PHYS and any other DAOD containing "TRUTH3"-like truth in master. As things stand none of these changes will have an effect on any applications in master, as the relevant job options have not been prepared.

Some of the files in this package evolved independently in release 21 and 22 so some adjustments have been made by hand. The following changes have been applied:

Swept directly from release 21.2: DerivationFrameworkMCTruth/DecayGraphHelper.h DerivationFrameworkMCTruth/TruthClassificationDecorator.h DerivationFrameworkMCTruth/TruthD2Decorator.h DerivationFrameworkMCTruth/TruthDecayCollectionMaker.h DerivationFrameworkMCTruth/TruthDressingTool.h DerivationFrameworkMCTruth/TruthIsolationTool.h DerivationFrameworkMCTruth/TruthPVCollectionMaker.h DerivationFrameworkMCTruth/TruthQGDecorationTool.h src/CollectionMakerHelpers.cxx src/CollectionMakerHelpers.h src/HadronOriginClassifier.cxx src/HadronOriginDecorator.cxx src/HardScatterCollectionMaker.cxx src/HardScatterCollectionMaker.h src/TruthBornLeptonCollectionMaker.cxx src/TruthBornLeptonCollectionMaker.h src/TruthClassificationDecorator.cxx src/TruthCollectionMaker.cxx src/TruthD2Decorator.cxx src/TruthDecayCollectionMaker.cxx src/TruthDressingTool.cxx src/TruthIsolationTool.cxx src/TruthLinkRepointTool.cxx src/TruthLinkRepointTool.h src/TruthNavigationDecorator.cxx src/TruthNavigationDecorator.h src/TruthPVCollectionMaker.cxx src/TruthQGDecorationTool.cxx

Version in 21.2 merged into version in master: DerivationFrameworkMCTruth/MenuTruthThinning.h DerivationFrameworkMCTruth/TruthCollectionMaker.h src/MenuTruthThinning.cxx

Version in master left alone as no evolution in 21.2 since last sweep: CompactHardTruth GenericTruthThinning HardTruthThinning

Omitted from sweep due to dependencies that will need to be addressed in further MRs: GenFilterTool TruthEDDecorator TruthMetaDataWriter

Edited by James Catmore

Merge request reports