From 4d09a1d1ae60c9b0f4a17e1c3daef889671f04e2 Mon Sep 17 00:00:00 2001
From: Andrii Verbytskyi <andrii.verbytskyi@cern.ch>
Date: Wed, 24 May 2023 17:38:23 +0200
Subject: [PATCH] Consolidate TruthUtils: move the content of PIDHelpers into
HepMCHelpers.h
Consolidate TruthUtils: move the content of PIDHelpers into HepMCHelpers.h
---
.../Root/CompositeParticle_v1.cxx | 2 +-
.../xAOD/xAODTruth/Root/TruthParticle_v1.cxx | 2 +-
Generators/EvgenProdTools/src/TestHepMC.cxx | 2 +-
.../GeneratorFilters/src/BSignalFilter.cxx | 2 +-
Generators/GeneratorFilters/src/HTFilter.cxx | 2 +-
.../GeneratorFilters/src/MissingEtFilter.cxx | 2 +-
.../src/ParentTwoChildrenFilter.cxx | 2 +-
.../src/SoftLeptonInJetFilter.cxx | 2 +-
.../src/xAODBSignalFilter.cxx | 2 +-
.../GeneratorFilters/src/xAODHTFilter.cxx | 2 +-
.../GeneratorFilters/src/xAODMETFilter.cxx | 2 +-
.../src/xAODParentTwoChildrenFilter.cxx | 2 +-
.../src/xAODTruthParticleSlimmerMET.cxx | 2 +-
.../TruthUtils/TruthUtils/HepMCHelpers.h | 24 +++++++++++++-
Generators/TruthUtils/TruthUtils/PIDHelpers.h | 32 -------------------
.../Root/CopyBosonTopLabelTruthParticles.cxx | 2 +-
.../Root/CopyFlavorLabelTruthParticles.cxx | 2 +-
.../Root/CopyTruthJetParticles.cxx | 2 +-
.../Root/CopyTruthParticles.cxx | 2 +-
.../Root/CopyTruthPartons.cxx | 2 +-
.../Root/ParticleJetLabelCommon.cxx | 2 +-
.../src/TruthLeptonNearbyAssociationTool.cxx | 2 +-
.../src/TruthCategoriesDecorator.cxx | 2 +-
.../src/TruthCollectionMaker.cxx | 3 --
.../src/TruthIsolationTool.cxx | 2 +-
.../MCTruthClassifier/MCTruthClassifier.h | 2 +-
.../Root/DiTauTruthMatchingTool.cxx | 2 +-
.../TauAnalysisTools/Root/HelperFunctions.cxx | 2 +-
.../Root/TauTruthMatchingTool.cxx | 2 +-
.../xAOD/TopParticleLevel/Root/TruthTools.cxx | 2 +-
.../src/GenParticleSimWhiteList.cxx | 2 +-
.../src/KeepChildrenTruthStrategy.cxx | 4 +--
32 files changed, 53 insertions(+), 66 deletions(-)
delete mode 100644 Generators/TruthUtils/TruthUtils/PIDHelpers.h
diff --git a/Event/xAOD/xAODParticleEvent/Root/CompositeParticle_v1.cxx b/Event/xAOD/xAODParticleEvent/Root/CompositeParticle_v1.cxx
index ddde0fde446a..44ed1c3fcc82 100644
--- a/Event/xAOD/xAODParticleEvent/Root/CompositeParticle_v1.cxx
+++ b/Event/xAOD/xAODParticleEvent/Root/CompositeParticle_v1.cxx
@@ -8,7 +8,7 @@
#include <cmath> /* remainder and M_PI */
// Event Kernel include
-#include "TruthUtils/PIDHelpers.h" // for MC::PID::isElectron(...) and others
+#include "TruthUtils/HepMCHelpers.h" // for MC::PID::isElectron(...) and others
// EDM include(s):
#include "xAODCore/AuxStoreAccessorMacros.h"
diff --git a/Event/xAOD/xAODTruth/Root/TruthParticle_v1.cxx b/Event/xAOD/xAODTruth/Root/TruthParticle_v1.cxx
index 6ed90359af5a..425e0ec9cb0b 100644
--- a/Event/xAOD/xAODTruth/Root/TruthParticle_v1.cxx
+++ b/Event/xAOD/xAODTruth/Root/TruthParticle_v1.cxx
@@ -12,7 +12,7 @@
#include <stdexcept>
// Utility include(s):
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "TruthUtils/MagicNumbers.h"
// xAOD include(s):
diff --git a/Generators/EvgenProdTools/src/TestHepMC.cxx b/Generators/EvgenProdTools/src/TestHepMC.cxx
index bc3a624541df..3374e22f8287 100644
--- a/Generators/EvgenProdTools/src/TestHepMC.cxx
+++ b/Generators/EvgenProdTools/src/TestHepMC.cxx
@@ -5,7 +5,7 @@
#include "EvgenProdTools/TestHepMC.h"
#include "GaudiKernel/DataSvc.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "TruthUtils/HepMCHelpers.h"
#include "PathResolver/PathResolver.h"
diff --git a/Generators/GeneratorFilters/src/BSignalFilter.cxx b/Generators/GeneratorFilters/src/BSignalFilter.cxx
index 3ad5ca696e01..ee9140f8728f 100644
--- a/Generators/GeneratorFilters/src/BSignalFilter.cxx
+++ b/Generators/GeneratorFilters/src/BSignalFilter.cxx
@@ -23,7 +23,7 @@
// -----------------------------------------------------------------------------------------------
#include "GeneratorFilters/BSignalFilter.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "CLHEP/Vector/LorentzVector.h"
#include <sstream>
diff --git a/Generators/GeneratorFilters/src/HTFilter.cxx b/Generators/GeneratorFilters/src/HTFilter.cxx
index bc3b854f75df..008da802af61 100644
--- a/Generators/GeneratorFilters/src/HTFilter.cxx
+++ b/Generators/GeneratorFilters/src/HTFilter.cxx
@@ -16,7 +16,7 @@
#include "StoreGate/StoreGateSvc.h"
// Other classes used by this class
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "AtlasHepMC/GenEvent.h"
// #include "GeneratorObjects/McEventCollection.h"
#include "TruthUtils/HepMCHelpers.h"
diff --git a/Generators/GeneratorFilters/src/MissingEtFilter.cxx b/Generators/GeneratorFilters/src/MissingEtFilter.cxx
index ebbe0075d424..a1c9a0fe7507 100644
--- a/Generators/GeneratorFilters/src/MissingEtFilter.cxx
+++ b/Generators/GeneratorFilters/src/MissingEtFilter.cxx
@@ -4,7 +4,7 @@
#include "GeneratorFilters/MissingEtFilter.h"
#include "TruthUtils/HepMCHelpers.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
MissingEtFilter::MissingEtFilter(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/Generators/GeneratorFilters/src/ParentTwoChildrenFilter.cxx b/Generators/GeneratorFilters/src/ParentTwoChildrenFilter.cxx
index 9ad66b6a2f82..cea16b052f92 100644
--- a/Generators/GeneratorFilters/src/ParentTwoChildrenFilter.cxx
+++ b/Generators/GeneratorFilters/src/ParentTwoChildrenFilter.cxx
@@ -3,7 +3,7 @@
*/
#include "GeneratorFilters/ParentTwoChildrenFilter.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
ParentTwoChildrenFilter::ParentTwoChildrenFilter(const std::string& name, ISvcLocator* pSvcLocator)
: GenFilter(name,pSvcLocator)
diff --git a/Generators/GeneratorFilters/src/SoftLeptonInJetFilter.cxx b/Generators/GeneratorFilters/src/SoftLeptonInJetFilter.cxx
index 7ec981c9fa24..d233531ebd60 100644
--- a/Generators/GeneratorFilters/src/SoftLeptonInJetFilter.cxx
+++ b/Generators/GeneratorFilters/src/SoftLeptonInJetFilter.cxx
@@ -3,7 +3,7 @@
*/
#include "GeneratorFilters/SoftLeptonInJetFilter.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
SoftLeptonInJetFilter::SoftLeptonInJetFilter(const std::string& name, ISvcLocator* pSvcLocator)
: GenFilter(name,pSvcLocator)
diff --git a/Generators/GeneratorFilters/src/xAODBSignalFilter.cxx b/Generators/GeneratorFilters/src/xAODBSignalFilter.cxx
index 7b5bb7724de5..169fd39afd65 100644
--- a/Generators/GeneratorFilters/src/xAODBSignalFilter.cxx
+++ b/Generators/GeneratorFilters/src/xAODBSignalFilter.cxx
@@ -23,7 +23,7 @@
// -----------------------------------------------------------------------------------------------
#include "GeneratorFilters/xAODBSignalFilter.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "CLHEP/Vector/LorentzVector.h"
#include <sstream>
diff --git a/Generators/GeneratorFilters/src/xAODHTFilter.cxx b/Generators/GeneratorFilters/src/xAODHTFilter.cxx
index df7de2dafbbb..1c63b005c05d 100644
--- a/Generators/GeneratorFilters/src/xAODHTFilter.cxx
+++ b/Generators/GeneratorFilters/src/xAODHTFilter.cxx
@@ -16,7 +16,7 @@
#include "StoreGate/StoreGateSvc.h"
// Other classes used by this class
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "AtlasHepMC/GenEvent.h"
// #include "GeneratorObjects/McEventCollection.h"
#include "TruthUtils/HepMCHelpers.h"
diff --git a/Generators/GeneratorFilters/src/xAODMETFilter.cxx b/Generators/GeneratorFilters/src/xAODMETFilter.cxx
index 9f23f7c6360b..7f39f5d68c67 100644
--- a/Generators/GeneratorFilters/src/xAODMETFilter.cxx
+++ b/Generators/GeneratorFilters/src/xAODMETFilter.cxx
@@ -3,7 +3,7 @@
*/
#include "GeneratorFilters/xAODMETFilter.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
xAODMETFilter::xAODMETFilter(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/Generators/GeneratorFilters/src/xAODParentTwoChildrenFilter.cxx b/Generators/GeneratorFilters/src/xAODParentTwoChildrenFilter.cxx
index 295719de8bb2..ae70bb34df63 100644
--- a/Generators/GeneratorFilters/src/xAODParentTwoChildrenFilter.cxx
+++ b/Generators/GeneratorFilters/src/xAODParentTwoChildrenFilter.cxx
@@ -3,7 +3,7 @@
*/
#include "GeneratorFilters/xAODParentTwoChildrenFilter.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "CxxUtils/BasicTypes.h"
#include "xAODTruth/TruthVertexContainer.h"
diff --git a/Generators/GeneratorFilters/src/xAODTruthParticleSlimmerMET.cxx b/Generators/GeneratorFilters/src/xAODTruthParticleSlimmerMET.cxx
index 4f6d953e91fe..49cfb9db8acf 100644
--- a/Generators/GeneratorFilters/src/xAODTruthParticleSlimmerMET.cxx
+++ b/Generators/GeneratorFilters/src/xAODTruthParticleSlimmerMET.cxx
@@ -16,7 +16,7 @@
#include "xAODTruth/TruthParticleAuxContainer.h"
#include "TruthUtils/HepMCHelpers.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "GeneratorFilters/xAODTruthParticleSlimmerMET.h"
diff --git a/Generators/TruthUtils/TruthUtils/HepMCHelpers.h b/Generators/TruthUtils/TruthUtils/HepMCHelpers.h
index 0b07a0f88a0c..2cd8aea69bf4 100644
--- a/Generators/TruthUtils/TruthUtils/HepMCHelpers.h
+++ b/Generators/TruthUtils/TruthUtils/HepMCHelpers.h
@@ -8,7 +8,28 @@
/// Provides the HepMC tools from the external MCUtils header package,
/// ATLAS-specific HepMC functions not suitable for MCUtils.
-#include "TruthUtils/PIDHelpers.h"
+#include "MCUtils/PIDUtils.h"
+namespace MC {
+
+ // Use the MCUtils and HEPUtils functions as if they were defined in the ATLAS MC and MC::PID namespaces
+ using namespace MCUtils;
+ using namespace HEPUtils;
+
+
+ /// @brief Identify if the particle with given PDG ID would not interact with the detector, i.e. not a neutrino or WIMP
+ inline bool isNonInteracting(int pid) {
+ return !(PID::isStrongInteracting(pid) || PID::isEMInteracting(pid));
+ }
+
+ /// @brief Identify if the particle with given PDG ID would produce ID tracks but not shower in the detector if stable
+ inline bool isChargedNonShowering(int pid) {
+ if (PID::isMuon(pid)) return true;
+ if (PID::isSUSY(pid)) return true; //(meta)stable charginos, R-hadrons etc
+ return false;
+ }
+
+}
+#if !defined(XAOD_STANDALONE)
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenVertex.h"
@@ -172,3 +193,4 @@ namespace MC {
}
#endif
+#endif
diff --git a/Generators/TruthUtils/TruthUtils/PIDHelpers.h b/Generators/TruthUtils/TruthUtils/PIDHelpers.h
deleted file mode 100644
index 12fad324d789..000000000000
--- a/Generators/TruthUtils/TruthUtils/PIDHelpers.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef TRUTHUTILS_PIDHELPERS_H
-#define TRUTHUTILS_PIDHELPERS_H
-/// @file
-///
-/// PID-only functions with no HepMC dependence, both from MCUtils and ATLAS-specific.
-
-#include "MCUtils/PIDUtils.h"
-
-namespace MC {
-
- // Use the MCUtils and HEPUtils functions as if they were defined in the ATLAS MC and MC::PID namespaces
- using namespace MCUtils;
- using namespace HEPUtils;
-
-
- /// @brief Identify if the particle with given PDG ID would not interact with the detector, i.e. not a neutrino or WIMP
- inline bool isNonInteracting(int pid) {
- return !(PID::isStrongInteracting(pid) || PID::isEMInteracting(pid));
- }
-
- /// @brief Identify if the particle with given PDG ID would produce ID tracks but not shower in the detector if stable
- inline bool isChargedNonShowering(int pid) {
- if (PID::isMuon(pid)) return true;
- if (PID::isSUSY(pid)) return true; //(meta)stable charginos, R-hadrons etc
- return false;
- }
-
-}
-#endif
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyBosonTopLabelTruthParticles.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyBosonTopLabelTruthParticles.cxx
index 1284edf38765..d538b18e5a89 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyBosonTopLabelTruthParticles.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyBosonTopLabelTruthParticles.cxx
@@ -7,7 +7,7 @@
#include "xAODTruth/TruthParticleAuxContainer.h"
#include "xAODTruth/TruthEventContainer.h"
#include "AthContainers/ConstDataVector.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
using namespace std;
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyFlavorLabelTruthParticles.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyFlavorLabelTruthParticles.cxx
index 688aa256d5ef..1939ad9558a9 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyFlavorLabelTruthParticles.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyFlavorLabelTruthParticles.cxx
@@ -7,7 +7,7 @@
#include "xAODTruth/TruthParticleAuxContainer.h"
#include "xAODTruth/TruthEventContainer.h"
#include "AthContainers/ConstDataVector.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
using namespace std;
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthJetParticles.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthJetParticles.cxx
index 84ac64c1a725..f8546cb7cb1c 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthJetParticles.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthJetParticles.cxx
@@ -5,7 +5,7 @@
#include "ParticleJetTools/CopyTruthJetParticles.h"
#include "MCTruthClassifier/MCTruthClassifier.h"
#include "xAODTruth/TruthVertex.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "TruthUtils/MagicNumbers.h"
#include "xAODTruth/TruthParticleContainer.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthParticles.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthParticles.cxx
index 9f23ba616dba..c3598f1abe4b 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthParticles.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthParticles.cxx
@@ -4,7 +4,7 @@
#include "ParticleJetTools/CopyTruthParticles.h"
#include <memory>
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "AsgMessaging/Check.h"
#include "AsgDataHandles/ReadHandle.h"
#include "AsgDataHandles/WriteHandle.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthPartons.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthPartons.cxx
index c87cf453d169..5d63614bc376 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthPartons.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/CopyTruthPartons.cxx
@@ -4,7 +4,7 @@
#include "ParticleJetTools/CopyTruthPartons.h"
#include "xAODTruth/TruthParticleContainer.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
using namespace std;
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetLabelCommon.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetLabelCommon.cxx
index 7c49db4b18f6..dedd3568babe 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetLabelCommon.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/ParticleJetLabelCommon.cxx
@@ -4,7 +4,7 @@
#include "ParticleJetTools/ParticleJetLabelCommon.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
// private internal functions
namespace {
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.cxx
index 803ac50d76a4..1efcccc477b4 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/src/TruthLeptonNearbyAssociationTool.cxx
@@ -14,7 +14,7 @@
#include "GeneratorObjects/McEventCollection.h"
#include "AtlasHepMC/GenParticle.h"
#include "McParticleEvent/TruthParticle.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include <iostream>
#include <cmath>
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/TruthCategoriesDecorator.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/TruthCategoriesDecorator.cxx
index f6c528f89925..96403a758c09 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/TruthCategoriesDecorator.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/src/TruthCategoriesDecorator.cxx
@@ -12,7 +12,7 @@
#include <TEnv.h>
#include <TLorentzVector.h>
#include <TString.h>
-#include <TruthUtils/PIDHelpers.h>
+#include <TruthUtils/HepMCHelpers.h>
#include <xAODJet/JetContainer.h>
#include <xAODTruth/TruthParticleContainer.h>
#include <xAODTruth/TruthVertex.h>
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthCollectionMaker.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthCollectionMaker.cxx
index d64dbf5fd28c..332181fea5a2 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthCollectionMaker.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthCollectionMaker.cxx
@@ -26,9 +26,6 @@
DerivationFramework::TruthCollectionMaker::TruthCollectionMaker(const std::string& t,
const std::string& n,
const IInterface* p)
-//m_do_compress = true: removes particles with the same pdgId in a decay chain (but keeps first and last)
-//m_do_sherpa = true: checks if there are truth W bosons in the current record. If not, tries to combine W daughters to create one.
-//Disclaimer: m_do_sherpa currently only works for W+jets. It will not work for Z+jets for dibosons (coming soon).
: ExpressionParserUser<AthAlgTool>(t,n,p)
, m_ntotpart(0)
, m_npasspart(0)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthIsolationTool.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthIsolationTool.cxx
index 9692c9ec87df..429677a9c10f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthIsolationTool.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthIsolationTool.cxx
@@ -9,7 +9,7 @@
#include "DerivationFrameworkMCTruth/TruthIsolationTool.h"
#include "HepPID/ParticleIDMethods.hh"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include <vector>
#include <string>
#include <algorithm>
diff --git a/PhysicsAnalysis/MCTruthClassifier/MCTruthClassifier/MCTruthClassifier.h b/PhysicsAnalysis/MCTruthClassifier/MCTruthClassifier/MCTruthClassifier.h
index 627fdd80a2be..a36b33e87b2f 100644
--- a/PhysicsAnalysis/MCTruthClassifier/MCTruthClassifier/MCTruthClassifier.h
+++ b/PhysicsAnalysis/MCTruthClassifier/MCTruthClassifier/MCTruthClassifier.h
@@ -20,7 +20,7 @@ CREATED: Sep 2007
#include "xAODTruth/TruthParticleContainer.h"
#include "xAODTruth/TruthVertex.h"
// For making PID selections easier
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "TruthUtils/MagicNumbers.h"
#ifndef XAOD_ANALYSIS
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/DiTauTruthMatchingTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/DiTauTruthMatchingTool.cxx
index 01d5ce73f57d..9ee17426e3da 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/DiTauTruthMatchingTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/DiTauTruthMatchingTool.cxx
@@ -12,7 +12,7 @@
// Core include(s):
#include "AthLinks/ElementLink.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
// EDM include(s):
#include "xAODEgamma/ElectronContainer.h"
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx
index 54479eb03c30..236cb5e46772 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx
@@ -6,7 +6,7 @@
// local include(s)
#include "TauAnalysisTools/HelperFunctions.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include "TF1.h"
#ifdef ASGTOOL_ATHENA
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauTruthMatchingTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauTruthMatchingTool.cxx
index b6add6077f96..5468f0b7c34a 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauTruthMatchingTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauTruthMatchingTool.cxx
@@ -8,7 +8,7 @@
// Core include(s):
#include "AthLinks/ElementLink.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
// EDM include(s):
#include "xAODTau/TauxAODHelpers.h"
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopParticleLevel/Root/TruthTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopParticleLevel/Root/TruthTools.cxx
index e49795a7177c..e524b6c8b952 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopParticleLevel/Root/TruthTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopParticleLevel/Root/TruthTools.cxx
@@ -15,7 +15,7 @@
#include "xAODTruth/xAODTruthHelpers.h"
#include "xAODTruth/TruthParticleContainer.h"
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
#include <list>
#include <string>
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.cxx
index e094c30d6c97..cace70a26845 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/GenParticleSimWhiteList.cxx
@@ -10,7 +10,7 @@
#include "AtlasHepMC/GenVertex.h"
// Helper function
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
// For finding that file
#include "PathResolver/PathResolver.h"
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/KeepChildrenTruthStrategy.cxx b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/KeepChildrenTruthStrategy.cxx
index 4d0476713ec4..82e08ac1f2d9 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/KeepChildrenTruthStrategy.cxx
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/src/KeepChildrenTruthStrategy.cxx
@@ -14,7 +14,7 @@
#include "ISF_Event/ISFParticle.h"
// For BSM helper
-#include "TruthUtils/PIDHelpers.h"
+#include "TruthUtils/HepMCHelpers.h"
/** Constructor **/
@@ -113,4 +113,4 @@ bool ISF::KeepChildrenTruthStrategy::appliesToRegion(unsigned short) const
{
// This applies to all regions, since it is only a modifier
return true;
-}
\ No newline at end of file
+}
--
GitLab