From efe24fc593834d85f0f84587d28e8f0f40f9f157 Mon Sep 17 00:00:00 2001
From: Andrii Verbytskyi <averbyts@cern.ch>
Date: Thu, 23 Apr 2020 22:24:23 +0200
Subject: [PATCH] Removing useless and wrong comments before non-existing HepMC
includes
---
.../AthExThinning/AthExThinning/AthExDecay.h | 1 -
.../AthExThinning/AthExThinning/AthExElephantino.h | 1 -
.../AthExThinning/AthExThinning/AthExParticles.h | 2 --
.../AthExThinning/AthExThinning/CreateData.h | 1 -
.../AthExThinning/AthExThinning/ReadThinnedData.h | 1 -
.../AthExThinning/AthExThinning/WriteThinnedData.h | 1 -
.../AthExThinning/src/AthExDecayCnv_p1.h | 1 -
.../AthExThinning/src/AthExElephantinoCnv_p1.h | 1 -
.../AthExThinning/src/AthExFatObjectCnv_p1.h | 1 -
.../AthExThinning/src/AthExParticlesCnv_p1.h | 1 -
Control/AthenaKernel/AthenaKernel/IValgrindSvc.h | 1 -
.../PerfMonKernel/ICallGraphBuilderSvc.h | 1 -
.../PerfMonTests/src/PerfMonTestBasicAlg.h | 1 -
.../PerfMonTests/src/PerfMonTestErroneousAlg.h | 1 -
.../PerfMonTests/src/PerfMonTestLeakyAlg.h | 1 -
.../PerfMonTests/src/PerfMonTestMallocAlg.h | 1 -
.../PerfMonTests/src/PerfMonTestManyLeaksAlg.h | 1 -
.../PerfMonTests/src/PerfMonTestNoopAlg.h | 1 -
Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h | 1 -
.../AtlasSealCLHEP/AtlasSealCLHEPDict.h | 12 +-----------
.../EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h | 1 -
Event/EventCommonAlgs/src/I4MomDumper.h | 1 -
.../EventCommonTPCnv/HepLorentzVectorCnv_p1.h | 2 +-
.../EventCommonTPCnv/HepLorentzVector_p1.h | 2 --
.../EventCommonTPCnv/INav4MomAssocsCnv_p1.h | 1 -
.../EventCommonTPCnv/INav4MomAssocsCnv_p2.h | 1 -
.../EventCommonTPCnv/INav4MomAssocsCnv_p3.h | 1 -
.../EventCommonTPCnv/INav4MomAssocs_p1.h | 1 -
.../EventCommonTPCnv/INav4MomAssocs_p2.h | 1 -
.../EventCommonTPCnv/P4EEtaPhiMCnv_p1.h | 1 -
.../EventCommonTPCnv/P4EEtaPhiMCnv_p2.h | 1 -
.../EventCommonTPCnv/P4EEtaPhiMFloat_p2.h | 1 -
.../EventCommonTPCnv/P4EEtaPhiM_p1.h | 1 -
.../EventCommonTPCnv/P4IPtCotThPhiMCnv_p1.h | 1 -
.../EventCommonTPCnv/P4IPtCotThPhiM_p1.h | 1 -
.../EventCommonTPCnv/P4ImplEEtaPhiMCnv_p1.h | 1 -
.../EventCommonTPCnv/P4ImplEEtaPhiMCnv_p2.h | 1 -
.../EventCommonTPCnv/P4ImplIPtCotThPhiMCnv_p1.h | 1 -
.../EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p1.h | 1 -
.../EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p2.h | 1 -
.../EventCommonTPCnv/P4ImplPxPyPzECnv_p1.h | 1 -
.../EventCommonTPCnv/P4PtEtaPhiMCnv_p1.h | 1 -
.../EventCommonTPCnv/P4PtEtaPhiMCnv_p2.h | 1 -
.../EventCommonTPCnv/P4PtEtaPhiMFloat_p2.h | 1 -
.../EventCommonTPCnv/P4PtEtaPhiM_p1.h | 1 -
.../EventCommonTPCnv/P4PxPyPzECnv_p1.h | 1 -
.../EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzE_p1.h | 1 -
Event/FourMom/FourMom/Lib/P4BasePxPyPzE.h | 2 +-
Event/FourMom/FourMom/Lib/P4ImplPxPyPzE.h | 2 +-
Event/NavFourMom/NavFourMom/I4MomentumContainer.h | 1 -
Event/NavFourMom/NavFourMom/Nav4MomWrapper.h | 2 +-
.../AFP_SiClusterTools/IAFPSiClusterAlgTool.h | 1 -
.../AFP_SiClusterTools/IAFPSiClusterTool.h | 1 -
.../GeneratorObjectsTPCnv/GenVertex_p1.h | 1 -
.../GeneratorObjectsTPCnv/GenVertex_p2.h | 2 --
.../GeneratorObjectsTPCnv/GenVertex_p3.h | 1 -
.../GeneratorObjectsTPCnv/GenVertex_p4.h | 1 -
.../GeneratorObjectsTPCnv/GenVertex_p5.h | 1 -
.../GeneratorObjectsTPCnv/McEventCollectionCnv_p1.h | 2 --
.../GeneratorObjectsTPCnv/McEventCollectionCnv_p3.h | 1 -
.../GeneratorObjectsTPCnv/McEventCollectionCnv_p4.h | 1 -
.../GeneratorObjectsTPCnv/McEventCollectionCnv_p5.h | 1 -
Generators/Pythia8B_i/src/Pythia8B_i.cxx | 2 --
.../CSC_Digitization/src/CscDigitizationTool.cxx | 2 --
.../AnalysisAssociation/AssocFilter.h | 1 -
.../AnalysisAssociation/IAssocFilter.h | 1 -
.../AnalysisExamples/src/ReadTruthParticles.h | 2 --
.../AnalysisExamples/src/WriteTruthParticles.h | 2 --
.../AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h | 2 --
.../AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h | 1 -
.../AnalysisUtils/AnalysisUtils/CategoryIdFilter.h | 1 -
.../PATCore/PATCore/IAthHistogramTool.h | 2 --
.../ParticleEvent/ParticleEvent/Lib/Base.h | 2 --
.../INav4MomToTrackParticleAssocsCnv_p1.h | 2 --
.../ParticleEventTPCnv/TrackParticleAssocsCnv_p1.h | 2 --
.../AssociationComps/src/AssocBuilder.h | 2 --
.../AssociationComps/src/AssocDumper.h | 1 -
.../AssociationComps/src/DeltaROverlapTool.h | 2 --
.../AssociationComps/src/OverlapBaseTool.h | 2 --
.../D3PDMaker/InDetD3PDMaker/src/SiHitFillerTool.cxx | 9 ++-------
.../src/TRTUncompressedHitFillerTool.cxx | 4 ----
.../McParticleAlgs/src/GenEventAsciiReader.cxx | 2 --
.../McParticleAlgs/src/GenEventAsciiReader.h | 2 --
.../McParticleAlgs/src/GenEventAsciiWriter.cxx | 2 --
.../McParticleAlgs/src/GenEventAsciiWriter.h | 2 --
.../McParticleAlgs/src/GenEventTupleWriter.cxx | 2 --
.../McParticleAlgs/src/GenEventTupleWriter.h | 2 --
.../McParticleAlgs/src/McAodTupleWriter.cxx | 2 --
.../McParticleAlgs/src/McAodTupleWriter.h | 2 --
.../McParticleAlgs/src/McAodValidationAlg.h | 2 --
.../McParticleAlgs/src/TruthParticleBuilder.h | 2 --
.../McParticleEvent/TruthParticleNavigation.h | 2 --
.../McParticleEvent/src/TruthEtIsolations.cxx | 2 +-
.../McParticleEvent/src/TruthParticle.cxx | 2 +-
.../McParticleEventTPCnv/src/McEtIsolVisitor.h | 2 --
.../src/RootTruthParticleCnvTool.cxx | 1 -
.../McParticleKernel/McParticleKernel/IIOHepMcTool.h | 2 --
.../McParticleKernel/McParticleKernel/IIOMcAodTool.h | 2 --
.../McParticleKernel/IMcVtxFilterTool.h | 2 --
.../McParticleKernel/ITruthParticleCnvTool.h | 2 --
.../McParticleKernel/ITruthParticleFilterTool.h | 2 --
.../McParticleKernel/ITruthParticleValidationTool.h | 2 --
.../McParticleKernel/ITruthParticleVisitor.h | 2 --
.../McParticleTools/src/EtaPtFilterTool.cxx | 2 +-
.../McParticleTools/src/EtaPtFilterTool.h | 2 --
.../McParticleTools/src/HepMcFloatWriterTool.cxx | 1 -
.../McParticleTools/src/HepMcTupleWriterTool.cxx | 2 +-
.../McParticleTools/src/NoopFilterTool.cxx | 1 -
.../McParticleTools/src/NoopFilterTool.h | 2 --
.../McParticleTools/src/OldSpclMcFilterTool.h | 2 --
.../McParticleTools/src/PileupFilterTool.h | 2 --
.../McParticleTools/src/SpclMcValidationTool.cxx | 1 -
.../src/TruthParticleFilterBaseTool.h | 1 -
.../src/TruthParticleValidationBaseTool.cxx | 1 -
.../McParticleTools/src/VtxBasedFilterTool.h | 1 -
.../McParticleUtils/McParticleUtils/McUtils.h | 2 --
.../TruthParticleID/McParticleUtils/src/McUtils.cxx | 1 -
.../CaloClusterMatching/ICaloClusterMatchingTool.h | 2 --
.../MCTruthSimAlgs/src/NewMergeMcEventCollTool.cxx | 5 -----
.../src/SimpleMergeMcEventCollTool.cxx | 5 -----
.../IBphysTrigDiMuDecoratorTool.h | 2 --
121 files changed, 11 insertions(+), 190 deletions(-)
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h
index e4d8b0e5e6b..23d4ba221e8 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
#include "AthenaKernel/CLASS_DEF.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h
index b5980d77385..2e22a908c6e 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h
@@ -17,7 +17,6 @@
// STL includes
#include <vector>
-// HepMC / CLHEP includes
#include "AthenaKernel/CLASS_DEF.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h
index 0110ff06d38..5a877430c13 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h
@@ -13,8 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// Gaudi includes
#include "AthContainers/DataVector.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/CreateData.h b/Control/AthenaExamples/AthExThinning/AthExThinning/CreateData.h
index aa440a721d0..09ea1925efd 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/CreateData.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/CreateData.h
@@ -21,7 +21,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/ReadThinnedData.h b/Control/AthenaExamples/AthExThinning/AthExThinning/ReadThinnedData.h
index e6268cc5457..9254884c841 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/ReadThinnedData.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/ReadThinnedData.h
@@ -22,7 +22,6 @@
#include <string>
#include <vector>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/WriteThinnedData.h b/Control/AthenaExamples/AthExThinning/AthExThinning/WriteThinnedData.h
index 3b314f440c8..13e25d1783d 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/WriteThinnedData.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/WriteThinnedData.h
@@ -30,7 +30,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
// FrameWork includes
#include "GaudiKernel/ServiceHandle.h"
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv_p1.h b/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv_p1.h
index a35479755d9..3fa80e501fb 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv_p1.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExDecayCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv_p1.h b/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv_p1.h
index 96ed7d7ecb0..bfbc74f5822 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv_p1.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExElephantinoCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv_p1.h b/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv_p1.h
index 68e948d75af..55d2240621c 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv_p1.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExFatObjectCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv_p1.h b/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv_p1.h
index e8470826c00..8970ee3b35b 100644
--- a/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv_p1.h
+++ b/Control/AthenaExamples/AthExThinning/src/AthExParticlesCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h b/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h
index 9ca6b90996f..484e63c02ed 100644
--- a/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h
+++ b/Control/AthenaKernel/AthenaKernel/IValgrindSvc.h
@@ -10,7 +10,6 @@
// STL includes
#include <iosfwd>
-// HepMC / CLHEP includes
// FrameWork includes
#include "GaudiKernel/IService.h"
diff --git a/Control/PerformanceMonitoring/PerfMonKernel/PerfMonKernel/ICallGraphBuilderSvc.h b/Control/PerformanceMonitoring/PerfMonKernel/PerfMonKernel/ICallGraphBuilderSvc.h
index 61305473bbf..9ee010e7b47 100755
--- a/Control/PerformanceMonitoring/PerfMonKernel/PerfMonKernel/ICallGraphBuilderSvc.h
+++ b/Control/PerformanceMonitoring/PerfMonKernel/PerfMonKernel/ICallGraphBuilderSvc.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// FrameWork includes
#include "GaudiKernel/IInterface.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.h
index 6240868e1af..74e93fee1bf 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.h
@@ -16,7 +16,6 @@
#include <vector>
#include <utility> // for std::pair
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.h
index 04356bfbafd..f899fbd4b01 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.h
@@ -16,7 +16,6 @@
#include <list>
#include <vector>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.h
index 85fe476e6ca..6e16112d889 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.h
@@ -16,7 +16,6 @@
#include <list>
#include <vector>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.h
index b7802ddc211..7e26754a09a 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.h
@@ -14,7 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.h
index 607356de6e4..594552f5c1c 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.h
@@ -16,7 +16,6 @@
#include <list>
#include <vector>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.h b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.h
index e045fa6545a..5971e1b56b2 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.h
@@ -14,7 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h b/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h
index 6ca8008517e..b432c3a3d71 100644
--- a/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h
+++ b/Control/SGMon/SGAudSvc/SGAudSvc/SGAudSvc.h
@@ -18,7 +18,6 @@
#include <set>
#include <fstream>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthService.h"
diff --git a/Database/AtlasSealCLHEP/AtlasSealCLHEP/AtlasSealCLHEPDict.h b/Database/AtlasSealCLHEP/AtlasSealCLHEP/AtlasSealCLHEPDict.h
index 947e6e1ca66..b581eca9bf9 100755
--- a/Database/AtlasSealCLHEP/AtlasSealCLHEP/AtlasSealCLHEPDict.h
+++ b/Database/AtlasSealCLHEP/AtlasSealCLHEP/AtlasSealCLHEPDict.h
@@ -18,17 +18,7 @@
#include "AtlasSealCLHEP/CLHEP_Random.h"
#include "AtlasSealCLHEP/CLHEP_Geometry.h"
#include "AtlasSealCLHEP/CLHEP_Matrix.h"
-// #include " AtlasSealCLHEP/CLHEP_Vector.h "
-// #include " AtlasSealCLHEP/CLHEP_Random.h "
-// #include " AtlasSealCLHEP/CLHEP_Geometry.h "
-// #include " AtlasSealCLHEP/CLHEP_Matrix.h "
-// #include " AtlasSealCLHEPDict/CLHEP_Vector.h "
-// #include " AtlasSealCLHEPDict/CLHEP_Random.h "
-// #include " AtlasSealCLHEPDict/CLHEP_Geometry.h "
-// #include " AtlasSealCLHEPDict/CLHEP_Matrix.h "
-// #include " AtlasSealCLHEPDict/CLHEP_HepMC.h "
-// #include " AtlasSealCLHEPDict/CLHEP_HepPDT.h "
-// #include " AtlasSealCLHEPDict/CLHEP_GenericFunctions.h "
+
#include "AtlasSealCLHEP/OldCLHEP.h"
#include "AtlasSealCLHEP/OldCLHEPStreamers.h"
diff --git a/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h b/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
index b3ac2d7e817..e19986c430e 100755
--- a/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
+++ b/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
@@ -15,7 +15,6 @@
#include <string>
#include <iosfwd>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Event/EventCommonAlgs/src/I4MomDumper.h b/Event/EventCommonAlgs/src/I4MomDumper.h
index 093e3b4258c..8043507d0f4 100644
--- a/Event/EventCommonAlgs/src/I4MomDumper.h
+++ b/Event/EventCommonAlgs/src/I4MomDumper.h
@@ -15,7 +15,6 @@
#include <string>
#include <iosfwd>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVectorCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVectorCnv_p1.h
index f2e30ff393d..848001301c3 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVectorCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVectorCnv_p1.h
@@ -13,7 +13,7 @@
// STL includes
-// HepMC / CLHEP includes
+// CLHEP includes
#include "CLHEP/Vector/LorentzVector.h"
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVector_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVector_p1.h
index 7df1e0a3d45..2593d8e38ec 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVector_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/HepLorentzVector_p1.h
@@ -13,8 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// Gaudi includes
// Forward declaration
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p1.h
index 43a8be9e8f2..e8a010caae4 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p2.h
index 4ea58ed1a3c..fd124832a72 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p2.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p3.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p3.h
index 135e2a593ea..70e3e6835cf 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p3.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocsCnv_p3.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p1.h
index c26ff79da9d..8e79c0b007f 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p1.h
@@ -16,7 +16,6 @@
#include <vector>
#include <utility>
-// HepMC / CLHEP includes
// Forward declaration
class INav4MomAssocsCnv_p1;
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p2.h
index 46daeef55e0..4e6a0ade2e0 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/INav4MomAssocs_p2.h
@@ -21,7 +21,6 @@
#include "DataModelAthenaPool/ElementLink_p2.h"
#include "DataModelAthenaPool/ElementLinkContNames_p2.h"
-// HepMC / CLHEP includes
// Forward declaration
class INav4MomAssocsCnv_p2;
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p1.h
index 429c5b1d578..55f9726bc9f 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p2.h
index 7eff516ce80..4014a5c97e2 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMCnv_p2.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMFloat_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMFloat_p2.h
index a7cfd5e5505..4761627cf47 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMFloat_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiMFloat_p2.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiM_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiM_p1.h
index 65735a01ab4..62fbc6d45c6 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiM_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4EEtaPhiM_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiMCnv_p1.h
index 457c2cc5d9c..8ee370f4476 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiMCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiM_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiM_p1.h
index 197dc809add..7e5bdace725 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiM_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4IPtCotThPhiM_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p1.h
index 9e570310722..0d6bc558fd4 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p2.h
index 179aeacd5a2..8c134d4bdd7 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplEEtaPhiMCnv_p2.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplIPtCotThPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplIPtCotThPhiMCnv_p1.h
index 0cf9c0e1552..5a5757c0988 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplIPtCotThPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplIPtCotThPhiMCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p1.h
index de0ebb7a58d..db7b7a528a2 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p2.h
index f035cd730a3..b21b8c100c0 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPtEtaPhiMCnv_p2.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPxPyPzECnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPxPyPzECnv_p1.h
index e798983d6d9..3862a69b1b3 100644
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPxPyPzECnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4ImplPxPyPzECnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p1.h
index a5c473bef1f..534ee0ead4f 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p2.h
index 4122a5eff5b..3b9cae22981 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMCnv_p2.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMFloat_p2.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMFloat_p2.h
index 43c806d5e1d..cc418244ffc 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMFloat_p2.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiMFloat_p2.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiM_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiM_p1.h
index 17eeb527646..8aaf8f116ad 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiM_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PtEtaPhiM_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzECnv_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzECnv_p1.h
index b390cceaf99..c7f0d4063a8 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzECnv_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzECnv_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzE_p1.h b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzE_p1.h
index cd7059960ec..c6a6ca4edc0 100755
--- a/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzE_p1.h
+++ b/Event/EventCommonTPCnv/EventCommonTPCnv/P4PxPyPzE_p1.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Event/FourMom/FourMom/Lib/P4BasePxPyPzE.h b/Event/FourMom/FourMom/Lib/P4BasePxPyPzE.h
index 7c6ffc1b0a3..59f426f4b11 100755
--- a/Event/FourMom/FourMom/Lib/P4BasePxPyPzE.h
+++ b/Event/FourMom/FourMom/Lib/P4BasePxPyPzE.h
@@ -18,7 +18,7 @@
#include <ostream>
#include <iomanip>
-// HepMC / CLHEP includes
+// CLHEP includes
#include "CLHEP/Vector/LorentzVector.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/Event/FourMom/FourMom/Lib/P4ImplPxPyPzE.h b/Event/FourMom/FourMom/Lib/P4ImplPxPyPzE.h
index 9d729ff2c1d..8a872443dff 100755
--- a/Event/FourMom/FourMom/Lib/P4ImplPxPyPzE.h
+++ b/Event/FourMom/FourMom/Lib/P4ImplPxPyPzE.h
@@ -13,7 +13,7 @@
// STL includes
-// HepMC / CLHEP includes
+// CLHEP includes
#include "CLHEP/Vector/LorentzVector.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/Event/NavFourMom/NavFourMom/I4MomentumContainer.h b/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
index 0277588caff..e87553b03b7 100644
--- a/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
+++ b/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
@@ -13,7 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
// Framework includes
#include "AthenaKernel/CLASS_DEF.h"
diff --git a/Event/NavFourMom/NavFourMom/Nav4MomWrapper.h b/Event/NavFourMom/NavFourMom/Nav4MomWrapper.h
index b9833242cfd..95038605556 100644
--- a/Event/NavFourMom/NavFourMom/Nav4MomWrapper.h
+++ b/Event/NavFourMom/NavFourMom/Nav4MomWrapper.h
@@ -13,7 +13,7 @@
// STL includes
-// HepMC / CLHEP includes
+// CLHEP includes
#include "CLHEP/Vector/LorentzVector.h"
// Gaudi includes
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterAlgTool.h b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterAlgTool.h
index 205464adc53..da943a5b610 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterAlgTool.h
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterAlgTool.h
@@ -17,7 +17,6 @@
// STL includes
#include <list>
-// HepMC / CLHEP includes
// FrameWork includes
#include "GaudiKernel/IAlgTool.h"
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterTool.h b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterTool.h
index e0eabe20fe2..84cf243458c 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterTool.h
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/AFP_SiClusterTools/IAFPSiClusterTool.h
@@ -14,7 +14,6 @@
// STL includes
-// HepMC / CLHEP includes
// FrameWork includes
#include "GaudiKernel/IAlgTool.h"
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p1.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p1.h
index 99ec50234ff..d7c4c6899f7 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p1.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p1.h
@@ -14,7 +14,6 @@
// STL includes
#include <vector>
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p2.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p2.h
index 5d70c92a04c..c2c7c6713f8 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p2.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p2.h
@@ -14,8 +14,6 @@
// STL includes
#include <vector>
-// HepMC / CLHEP includes
-
// Gaudi includes
// Forward declaration
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p3.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p3.h
index c25ab5e3df1..164e9b8ad65 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p3.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p3.h
@@ -14,7 +14,6 @@
// STL includes
#include <vector>
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p4.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p4.h
index eb6827b3c78..ea58e1a1f34 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p4.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p4.h
@@ -14,7 +14,6 @@
// STL includes
#include <vector>
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p5.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p5.h
index 9de537d9b16..7a1a37cf4aa 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p5.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/GenVertex_p5.h
@@ -14,7 +14,6 @@
// STL includes
#include <vector>
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p1.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p1.h
index 473957d7818..eeb07ca5201 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p1.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p1.h
@@ -12,8 +12,6 @@
#define GENERATOROBJECTSTPCNV_MCEVENTCOLLECTIONCNV_P1_H
// STL includes
-
-// HepMC / CLHEP includes
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wkeyword-macro"
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p3.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p3.h
index d286f8a0a02..884eef9f735 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p3.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p3.h
@@ -14,7 +14,6 @@
// STL includes
#include <unordered_map>
-// HepMC / CLHEP includes
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wkeyword-macro"
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p4.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p4.h
index c8f96383057..18d1b96ae80 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p4.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p4.h
@@ -14,7 +14,6 @@
// STL includes
#include <unordered_map>
-// HepMC / CLHEP includes
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wkeyword-macro"
diff --git a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p5.h b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p5.h
index cad48a5b7c3..c7c9372fa22 100755
--- a/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p5.h
+++ b/Generators/GeneratorObjectsTPCnv/GeneratorObjectsTPCnv/McEventCollectionCnv_p5.h
@@ -14,7 +14,6 @@
// STL includes
#include <unordered_map>
-// HepMC / CLHEP includes
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wkeyword-macro"
diff --git a/Generators/Pythia8B_i/src/Pythia8B_i.cxx b/Generators/Pythia8B_i/src/Pythia8B_i.cxx
index 4a35810a68d..8104add9e99 100644
--- a/Generators/Pythia8B_i/src/Pythia8B_i.cxx
+++ b/Generators/Pythia8B_i/src/Pythia8B_i.cxx
@@ -357,8 +357,6 @@ StatusCode Pythia8B_i::fillEvt(HepMC::GenEvent *evt){
evt->set_event_number(*(m_internalEventNumbers.begin()));
m_pythiaToHepMC.fill_next_event(pyev, evt, 1);
- // fill the pdf information
- //m_pythiaToHepMC.put_pdf_info(evt, m_pythia, false);
// set the randomseeds
if(useRndmGenSvc() && Pythia8B_i::p_AtRndmGenSvc)
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
index 5ba699e2e36..364d4f1fa5d 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
@@ -178,8 +178,6 @@ StatusCode CscDigitizationTool::CoreDigitization(CscDigitContainer* cscDigits,Cs
TimedHitPtr<CSCSimHit> phit(*i++);
const CSCSimHit& hit(*phit);
- // const HepMcParticleLink McLink = HepMcParticleLink(phit->trackNumber(),phit.eventId());
- // const HepMC::GenParticle* genPart = McLink.cptr(); // some times empty pointer returned
ATH_MSG_DEBUG(hit.print());
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/AssocFilter.h b/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/AssocFilter.h
index e1bc98798b3..29deb456b8f 100755
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/AssocFilter.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/AssocFilter.h
@@ -20,7 +20,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
#include "AthenaKernel/getMessageSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/IAssocFilter.h b/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/IAssocFilter.h
index 16c6db6d7b7..3f287f61dfa 100755
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/IAssocFilter.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisAssociation/AnalysisAssociation/IAssocFilter.h
@@ -20,7 +20,6 @@
// STL includes
-// HepMC / CLHEP includes
// Gaudi includes
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.h b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.h
index 5809b8ecfad..ea1ecff5738 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/ReadTruthParticles.h
@@ -25,8 +25,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.h b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.h
index 8d51fcca922..d672f4a2480 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.h
@@ -14,8 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h
index 98d9876183b..e04cb8af9af 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h
@@ -15,8 +15,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h
index 33fcf821647..7f5f1cc4b97 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h
@@ -16,7 +16,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/CategoryIdFilter.h b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/CategoryIdFilter.h
index 4004e4f0863..395869f943d 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/CategoryIdFilter.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/CategoryIdFilter.h
@@ -21,7 +21,6 @@
// STL includes
-// HepMC / CLHEP includes
#include "HepPDT/ParticleData.hh"
// Gaudi includes
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthHistogramTool.h b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthHistogramTool.h
index f450bea8484..d7aaff38e37 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthHistogramTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAthHistogramTool.h
@@ -13,8 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "GaudiKernel/IAlgTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEvent/ParticleEvent/Lib/Base.h b/PhysicsAnalysis/AnalysisCommon/ParticleEvent/ParticleEvent/Lib/Base.h
index 0ab8b891566..0bb177d68b4 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEvent/ParticleEvent/Lib/Base.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEvent/ParticleEvent/Lib/Base.h
@@ -14,8 +14,6 @@
// STL includes
#include <iosfwd>
-// HepMC / CLHEP includes
-
// Gaudi includes
// EventKernel includes
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocsCnv_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocsCnv_p1.h
index f5c3f3189a5..0d75f516f5f 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocsCnv_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/INav4MomToTrackParticleAssocsCnv_p1.h
@@ -13,8 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// Gaudi includes
#include "AthLinks/ElementLink.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocsCnv_p1.h b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocsCnv_p1.h
index dd4be4cc48b..a23c46fd8e8 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocsCnv_p1.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv/ParticleEventTPCnv/TrackParticleAssocsCnv_p1.h
@@ -13,8 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// Gaudi includes
#include "AthLinks/ElementLink.h"
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
index 761a119220c..1f0c67e8a4b 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
@@ -14,8 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
index c9486470f51..68f10742883 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
@@ -15,7 +15,6 @@
#include <string>
#include <iosfwd>
-// HepMC / CLHEP includes
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
index be139191894..5c260ffb81b 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
@@ -13,8 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// AssociationUtils includes
#include "DeltaROverlapFilter.h"
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/OverlapBaseTool.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/OverlapBaseTool.h
index 140653d9d4f..dacaafb8c32 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/OverlapBaseTool.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/OverlapBaseTool.h
@@ -14,8 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitFillerTool.cxx
index 00662d50388..6aa5810ce1a 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitFillerTool.cxx
@@ -221,7 +221,6 @@ StatusCode SiHitFillerTool::fill (const SiHit& /*hit*/)
*m_energyLoss=1.0;
*m_meanTime=1.0;
*m_trackNumber=1.0;
- //const HepMcParticleLink & particleLink () const
*m_isPixel=1;
*m_isSCT=1;
*m_BarrelEndcap=1;
@@ -230,15 +229,11 @@ StatusCode SiHitFillerTool::fill (const SiHit& /*hit*/)
*m_PhiModule=1;
*m_Side=1;
- //const HepMcParticleLink& mcLink = hit.particleLink();
*m_truthbarcode2 = 1;
- //const HepMC::GenParticle* genPart= mcLink.cptr();
- //if(genPart){
+
*m_truthbarcode = -999;
- //}else{
- //*m_truthbarcode=-999;
- //}
+
return StatusCode::SUCCESS;
}
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TRTUncompressedHitFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TRTUncompressedHitFillerTool.cxx
index c350a51f390..56e557ef131 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TRTUncompressedHitFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/TRTUncompressedHitFillerTool.cxx
@@ -109,19 +109,15 @@ StatusCode D3PD::TRTUncompressedHitFillerTool::fill (const TRTUncompressedHit& /
*m_globalTime = 1.0;
// resolve global position
- //GeoTRTUncompressedHit ghit(hit);
- //const HepGeom::Point3D<double>& globalPos = ghit.getGlobalPosition();
*m_globalPosX = 1.0;
*m_globalPosY = 1.0;
*m_globalPosZ = 1.0;
*m_globalPosR = 1.0;
// particle barcode2 directly from TRTUncompressedHit
- //const HepMcParticleLink& mcLink = hit.particleLink();
*m_truthbarcode2 = -999;
// particle barcode from associated GenParticle
- //const HepMC::GenParticle* genPart = mcLink.cptr();
*m_truthbarcode = -999;
return StatusCode::SUCCESS;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.cxx
index 11e9f269c3c..de5ab92dfef 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.cxx
@@ -13,8 +13,6 @@
// FrameWork includes
-// HepMC includes
-
// McParticleKernel includes
#include "McParticleKernel/IIOHepMcTool.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.h
index 5a0e457108c..96dcb83d535 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiReader.h
@@ -14,8 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.cxx
index 8588a212f5e..8fe3182ed3f 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.cxx
@@ -13,8 +13,6 @@
// FrameWork includes
-// HepMC includes
-
// McParticleKernel includes
#include "McParticleKernel/IIOHepMcTool.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.h
index eda1181e69c..706e0bf63aa 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventAsciiWriter.h
@@ -14,8 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.cxx
index 12dbfaef54f..b9fe44995e0 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.cxx
@@ -13,8 +13,6 @@
// FrameWork includes
-// HepMC includes
-
// McParticleKernel includes
#include "McParticleKernel/IIOHepMcTool.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.h
index 7edb4f22089..b101bd0334c 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/GenEventTupleWriter.h
@@ -14,8 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.cxx
index 401ddffcd6a..2c63fd28b07 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.cxx
@@ -13,8 +13,6 @@
// FrameWork includes
-// HepMC includes
-
// McParticleKernel includes
#include "McParticleKernel/IIOMcAodTool.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.h
index c549b1e471b..31ddb42f9e4 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodTupleWriter.h
@@ -14,8 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.h
index 6799479726c..31e61137b6a 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.h
@@ -14,8 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
index 285438c5a3f..fac5893c80d 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
@@ -14,8 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleNavigation.h b/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleNavigation.h
index 23e5f01c118..e63b7c8b35e 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleNavigation.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/McParticleEvent/TruthParticleNavigation.h
@@ -13,8 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// Gaudi includes
// Navigation includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx
index e6681817dde..3a1e3cf3758 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthEtIsolations.cxx
@@ -15,7 +15,7 @@
#include <iomanip>
#include <stdexcept>
-// HepMC / CLHEP includes
+// CLHEP includes
#include "CLHEP/Units/SystemOfUnits.h"
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenEvent.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx
index d1a09ef0a76..a781df015e4 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEvent/src/TruthParticle.cxx
@@ -13,7 +13,7 @@
#include <sstream>
#include <string>
-// HepMC / CLHEP includes
+// HepMC includes
#include "AtlasHepMC/GenParticle.h"
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenVertex.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/McEtIsolVisitor.h b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/McEtIsolVisitor.h
index be42c389645..b37e9c99828 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/McEtIsolVisitor.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/McEtIsolVisitor.h
@@ -14,8 +14,6 @@
// STL includes
#include <stdexcept>
-// HepMC / CLHEP includes
-
// Gaudi includes
#include "GaudiKernel/MsgStream.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
index 2bd9a828b03..1d206868743 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
@@ -97,7 +97,6 @@ RootTruthParticleCnvTool::convert(const McEventCollection *mcCollection,
"TruthParticle is not wrapping the GenParticle : %d !!",
hepMcPart->barcode());
}
- //bcToMcPart[ hepMcPart->barcode() ] = mcPart;
HepMcParticleLink mcLink( hepMcPart->barcode(), genEventIndex );
bcToMcPart[ mcLink.compress() ] = mcPart;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOHepMcTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOHepMcTool.h
index a6cdcfe74f7..cf28e5fce48 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOHepMcTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOHepMcTool.h
@@ -12,8 +12,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOMcAodTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOMcAodTool.h
index 8852b1cb634..b101586f675 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOMcAodTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IIOMcAodTool.h
@@ -12,8 +12,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IMcVtxFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IMcVtxFilterTool.h
index b9d59ba94b6..865214ba71d 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IMcVtxFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/IMcVtxFilterTool.h
@@ -12,8 +12,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleCnvTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleCnvTool.h
index 8b758fb3992..d4c21570a21 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleCnvTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleCnvTool.h
@@ -21,8 +21,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleFilterTool.h
index 5431bb565cd..283b5bdc179 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleFilterTool.h
@@ -12,8 +12,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleValidationTool.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleValidationTool.h
index bc2b3a9530f..d764ee12843 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleValidationTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleValidationTool.h
@@ -24,8 +24,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/IProperty.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleVisitor.h b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleVisitor.h
index 3269e6845c2..ce44ecd8d92 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleVisitor.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleKernel/McParticleKernel/ITruthParticleVisitor.h
@@ -21,8 +21,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// Gaudi includes
// Forward declaration
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
index 65c5c85c949..f5afc0967de 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
@@ -14,7 +14,7 @@
// FrameWork includes
-// CLHEP/HepMC includes
+// CLHEP includes
#include "TruthHelper/IsGenerator.h"
#include "TruthHelper/IsGenStable.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
index 55f83f51d44..4a16c00d735 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
@@ -15,8 +15,6 @@
#include <string>
#include <map>
-// HepMC / CLHEP includes
-
// McParticleUtils includes
#include "McParticleUtils/McVtxFilter.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
index 693dfdcb11c..4aadf20744b 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
@@ -18,7 +18,6 @@
// FrameWork includes
-// CLHEP/HepMC includes
#include "GeneratorObjects/McEventCollection.h"
#include "HepPDT/ParticleDataTable.hh"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
index ddaba03d6e4..fd07363a58c 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
@@ -20,7 +20,7 @@
// ROOT includes
#include "TTree.h"
-// CLHEP/HepMC includes
+// CLHEP includes
#include "GeneratorObjects/McEventCollection.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
index 235c2a7db9f..3d68a1119fd 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
@@ -14,7 +14,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-// CLHEP/HepMC includes
#include "TruthHelper/IsGenStable.h"
#include "TruthHelper/IsGenInteracting.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.h
index 27c10eb322c..fc54cd23d33 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.h
@@ -14,8 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
-
// McParticleTools includes
#include "TruthParticleFilterBaseTool.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h
index 49810b68fa1..80d91b85fb6 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h
@@ -14,8 +14,6 @@
// STL includes
#include <set>
-// HepMC / CLHEP includes
-
// FrameWork includes
// McParticleTools includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h
index 8ad07feb652..c85af441404 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h
@@ -14,8 +14,6 @@
// STL includes
#include <set>
-// HepMC / CLHEP includes
-
// FrameWork includes
// McParticleTools includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx
index b1dac4acf4c..22aaea78e70 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/SpclMcValidationTool.cxx
@@ -13,7 +13,6 @@
// FrameWork includes
-// CLHEP/HepMC includes
#include "GeneratorObjects/McEventCollection.h"
// McParticleEvent includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleFilterBaseTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleFilterBaseTool.h
index cb6cb4108de..a288a56bde0 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleFilterBaseTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleFilterBaseTool.h
@@ -14,7 +14,6 @@
// STL includes
#include <string>
-// HepMC / CLHEP includes
#include "GeneratorObjects/McEventCollection.h"
// FrameWork includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleValidationBaseTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleValidationBaseTool.cxx
index b968eba8197..85ffeb93542 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleValidationBaseTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthParticleValidationBaseTool.cxx
@@ -13,7 +13,6 @@
// FrameWork includes
-// CLHEP/HepMC includes
#include "GeneratorObjects/McEventCollection.h"
// McParticleTools includes
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.h
index 811ce052b27..ee1cc9c0405 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/VtxBasedFilterTool.h
@@ -15,7 +15,6 @@
#include <string>
#include <map>
-// HepMC / CLHEP includes
// McParticleUtils includes
#include "McParticleUtils/McVtxFilter.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleUtils/McParticleUtils/McUtils.h b/PhysicsAnalysis/TruthParticleID/McParticleUtils/McParticleUtils/McUtils.h
index 0b31016b43e..66ab90b66fa 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleUtils/McParticleUtils/McUtils.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleUtils/McParticleUtils/McUtils.h
@@ -13,8 +13,6 @@
// STL includes
-// HepMC includes
-
// Forward declaration
namespace HepPDT { class ParticleDataTable; }
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McUtils.cxx b/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McUtils.cxx
index 7670d5a96fa..df558cdbecc 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McUtils.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleUtils/src/McUtils.cxx
@@ -21,7 +21,6 @@
#include "GaudiKernel/IPartPropSvc.h"
#include "GaudiKernel/ServiceHandle.h"
-// CLHEP/HepMC includes
#include "HepPDT/ParticleData.hh"
#include "HepPDT/ParticleDataTable.hh"
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/CaloClusterMatching/ICaloClusterMatchingTool.h b/Reconstruction/RecoTools/CaloClusterMatching/CaloClusterMatching/ICaloClusterMatchingTool.h
index 97a43d16044..e0871449ea8 100644
--- a/Reconstruction/RecoTools/CaloClusterMatching/CaloClusterMatching/ICaloClusterMatchingTool.h
+++ b/Reconstruction/RecoTools/CaloClusterMatching/CaloClusterMatching/ICaloClusterMatchingTool.h
@@ -13,8 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "AsgTools/IAsgTool.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.cxx b/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.cxx
index 5a4d8572866..ea06f0aa03c 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.cxx
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.cxx
@@ -155,11 +155,6 @@ void NewMergeMcEventCollTool::printDetailsOfMergedMcEventCollection(McEventColle
std::ofstream of(fname);
(*outputEventItr)->print(of); // verbose output
of.close();
- // HepMC::GenEvent& currentSignalEvent(**(outputEventItr));
- // currentSignalEvent.print();
- // ATH_MSG_INFO ( "Current signal_process_vertex: " );
- // if(0!=currentSignalEvent.signal_process_vertex()) currentSignalEvent.signal_process_vertex()->print();
- // else ATH_MSG_INFO ( "signal_process_vertex is NULL" );
++outputEventItr;
}
ATH_MSG_INFO ( "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" );
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.cxx b/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.cxx
index 285388c01cc..9bc8b15e63b 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.cxx
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.cxx
@@ -168,11 +168,6 @@ void SimpleMergeMcEventCollTool::printDetailsOfMergedMcEventCollection(McEventCo
std::ofstream of(fname);
(*outputEventItr)->print(of); // verbose output
of.close();
- // HepMC::GenEvent& currentSignalEvent(**(outputEventItr));
- // currentSignalEvent.print();
- // ATH_MSG_INFO ( "Current signal_process_vertex: " );
- // if(0!=currentSignalEvent.signal_process_vertex()) currentSignalEvent.signal_process_vertex()->print();
- // else ATH_MSG_INFO ( "signal_process_vertex is NULL" );
++outputEventItr;
}
ATH_MSG_INFO ( "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" );
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/IBphysTrigDiMuDecoratorTool.h b/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/IBphysTrigDiMuDecoratorTool.h
index a5959c9b12d..b282c5e15d7 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/IBphysTrigDiMuDecoratorTool.h
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/IBphysTrigDiMuDecoratorTool.h
@@ -13,8 +13,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// FrameWork includes
#include "GaudiKernel/IAlgTool.h"
--
GitLab