From d0c88e6a81764dbd443a246aa3be47eaa4ca67c6 Mon Sep 17 00:00:00 2001
From: Andrii Verbytskyi <andrii.verbytskyi@cern.ch>
Date: Thu, 7 Jan 2021 19:41:19 +0000
Subject: [PATCH] Hepmc3 nightly fixes 05012021 part 1
---
.../InDetRecStatistics/src/InDetRecStatisticsAlg.cxx | 12 +++++-------
.../src/TruthParticleFilterTool.cxx | 3 ++-
.../McParticleTools/src/EtaPtFilterTool.h | 9 ---------
.../McParticleTools/src/GenAodValidationTool.h | 7 -------
.../McParticleTools/src/McVtxFilterTool.cxx | 3 ---
.../McParticleTools/src/McVtxFilterTool.h | 7 -------
.../McParticleTools/src/OldSpclMcFilterTool.h | 6 ------
.../McParticleTools/src/PileupFilterTool.h | 9 ---------
.../MCTruthSimAlgs/src/MergeMcEventCollTool.cxx | 4 ++++
9 files changed, 11 insertions(+), 49 deletions(-)
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx b/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx
index 4664cb5e275e..897604bbb9c7 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/src/InDetRecStatisticsAlg.cxx
@@ -566,7 +566,7 @@ void InDet::InDetRecStatisticsAlg::selectRecSignal(const TrackCollection* RecCol
if(trackpara->size() > 0){
const Trk::TrackParameters* para = trackpara->front();
if (para){
- if (para->pT() > m_minPt && fabs(para->eta()) < m_maxEta) {
+ if (para->pT() > m_minPt && std::abs(para->eta()) < m_maxEta) {
RecSignal.push_back(*it);
}
}
@@ -615,8 +615,7 @@ selectGenSignal (const McEventCollection* SimTracks,
for (auto particle: *genEvent)
{
// require stable particle from generation or simulation\ s
- if ((particle->status()%1000) != 1 )
- continue;
+ if ((particle->status()%1000) != 1 ) continue;
int pdgCode = particle->pdg_id();
const HepPDT::ParticleData* pd = m_particleDataTable->particle(std::abs(pdgCode));
if (!pd) {
@@ -627,10 +626,9 @@ selectGenSignal (const McEventCollection* SimTracks,
continue;
}
float charge = pd->charge();
- if (fabs(charge)<0.5)
- continue;
- if (fabs(particle->momentum().perp()) > m_minPt &&
- fabs(particle->momentum().pseudoRapidity()) < m_maxEta ) {
+ if (std::abs(charge)<0.5) continue;
+ if (std::abs(particle->momentum().perp()) > m_minPt &&
+ std::abs(particle->momentum().pseudoRapidity()) < m_maxEta ) {
std::pair<HepMC::GenParticlePtr,int> thisPair(particle,ievt);
GenSignal.push_back(thisPair);
}
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/TruthParticleFilterTool.cxx b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/TruthParticleFilterTool.cxx
index fe4b9a19ad3b..224d03194116 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/TruthParticleFilterTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/src/TruthParticleFilterTool.cxx
@@ -230,7 +230,8 @@ TruthParticleFilterTool::isAccepted (const HepMC::GenParticle* p)
if(m_writeAllLeptons && (pdg_id>10 && pdg_id<19)) // Include 4th generation...
ok = true;
- if ((m_writeBSMProducts || m_writeBosonProducts || m_writeTopAndDecays) && p->production_vertex()){ // Either way we have to go through parents
+ if ((m_writeBSMProducts || m_writeBosonProducts || m_writeTopAndDecays) && p->production_vertex()){
+ // Either way we have to go through parents
HepMC::GenVertex::particle_iterator itrParent = p->production_vertex()->particles_begin(HepMC::parents);
HepMC::GenVertex::particle_iterator endParent = p->production_vertex()->particles_end(HepMC::parents);
for(;itrParent!=endParent; ++itrParent){
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
index be8b8014c56e..e730a92f69d9 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
@@ -61,9 +61,6 @@ class EtaPtFilterTool : public TruthParticleFilterBaseTool
/// Destructor:
virtual ~EtaPtFilterTool();
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
// Non-const methods:
@@ -203,11 +200,5 @@ class EtaPtFilterTool : public TruthParticleFilterBaseTool
};
-/// I/O operators
-//////////////////////
-
-///////////////////////////////////////////////////////////////////
-/// Inline methods:
-///////////////////////////////////////////////////////////////////
#endif //> MCPARTICLETOOLS_ETAPTFILTERTOOL_H
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.h
index 449d7cda11a5..fa43814175fe 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.h
@@ -159,11 +159,4 @@ class GenAodValidationTool : public TruthParticleValidationBaseTool
};
-/// I/O operators
-//////////////////////
-
-///////////////////////////////////////////////////////////////////
-/// Inline methods:
-///////////////////////////////////////////////////////////////////
-
#endif //> MCPARTICLETOOLS_GENAODVALIDATIONTOOL_H
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
index e2bf7c526d14..aab88291ee34 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
@@ -312,9 +312,6 @@ McVtxFilterTool::filterMcEventCollection( const McEventCollection* mcColl,
return;
}
-///////////////////////////////////////////////////////////////////
-/// Protected methods:
-///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
/// Const methods:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h
index 723d05233208..74cde900e000 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h
@@ -214,11 +214,4 @@ class McVtxFilterTool : virtual public IMcVtxFilterTool,
LongArrayProperty m_particles;
};
-/// I/O operators
-//////////////////////
-
-///////////////////////////////////////////////////////////////////
-/// Inline methods:
-///////////////////////////////////////////////////////////////////
-
#endif //> MCPARTICLETOOLS_MCVTXFILTERTOOL_H
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h
index 47e9accee9c5..c982870ab975 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.h
@@ -144,12 +144,6 @@ class OldSpclMcFilterTool : public TruthParticleFilterBaseTool
};
-// I/O operators
-//////////////////////
-
-///////////////////////////////////////////////////////////////////
-// Inline methods:
-///////////////////////////////////////////////////////////////////
#endif //> MCPARTICLETOOLS_OLDSPCLMCFILTERTOOL_H
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h
index 07bb7c5333ad..fc7dea6bf78d 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.h
@@ -45,9 +45,6 @@ class PileupFilterTool : public TruthParticleFilterBaseTool
/// Destructor:
virtual ~PileupFilterTool();
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
// Non-const methods:
@@ -147,12 +144,6 @@ class PileupFilterTool : public TruthParticleFilterBaseTool
};
-// I/O operators
-//////////////////////
-
-///////////////////////////////////////////////////////////////////
-// Inline methods:
-///////////////////////////////////////////////////////////////////
#endif //> MCPARTICLETOOLS_PILEUPFILTERTOOL_H
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx
index 869d1f28f861..961d28a0ab1c 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.cxx
@@ -312,7 +312,11 @@ void MergeMcEventCollTool::printDetailsOfMergedMcEventCollection() const {
const int signal_process_id(HepMC::signal_process_id((*outputEventItr))), event_number((*outputEventItr)->event_number()), separator_hack(HepMC::mpi((*outputEventItr)));
const IndexKey key(makekey(signal_process_id,event_number,separator_hack));
const PileUpBackgroundMap::const_iterator event(m_backgroundClassificationMap.find(key));
+#ifdef HEPMC3
+ ATH_MSG_INFO ( "GenEvent #"<<event_number<<", signal_process_id="<<signal_process_id<<", category="<<event->second<<", number of Vertices="<<(*outputEventItr)->vertices().size() );
+#else
ATH_MSG_INFO ( "GenEvent #"<<event_number<<", signal_process_id="<<signal_process_id<<", category="<<event->second<<", number of Vertices="<<(*outputEventItr)->vertices_size() );
+#endif
++outputEventItr;
}
ATH_MSG_INFO ( "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" );
--
GitLab