From fae2272c76c604800d5ce8325e96f2ecc280d309 Mon Sep 17 00:00:00 2001
From: Andrii Verbytskyi <andrii.verbytskyi@mpp.mpg.de>
Date: Sat, 7 Jan 2023 15:08:49 +0100
Subject: [PATCH] Reduce the usage of barcodes
---
.../src/MuonDecayTruthTrajectoryBuilder.cxx | 4 +--
.../MuonTruthAlgs/src/MuonTrackTruthTool.cxx | 2 +-
.../McParticleTools/src/EtaPtFilterTool.cxx | 2 +-
.../src/GenAodValidationTool.cxx | 10 +++---
.../McParticleTools/src/McVtxFilterTool.cxx | 10 +++---
.../McParticleTools/src/PileupFilterTool.cxx | 17 +++++-----
.../ISF_Services/src/InputConverter.cxx | 34 +++++++++----------
7 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/MuonDecayTruthTrajectoryBuilder.cxx b/MuonSpectrometer/MuonTruthAlgs/src/MuonDecayTruthTrajectoryBuilder.cxx
index 01db6b070ca..45ed1298f7b 100644
--- a/MuonSpectrometer/MuonTruthAlgs/src/MuonDecayTruthTrajectoryBuilder.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/MuonDecayTruthTrajectoryBuilder.cxx
@@ -40,7 +40,7 @@ namespace Muon {
// copy the outer half to result
while (!tmp.empty()) {
- ATH_MSG_DEBUG(" Adding daughter: barcode " << HepMC::barcode(current) << " PDG id " << current->pdg_id());
+ ATH_MSG_DEBUG(" Adding daughter: " << current);
result->push_back(tmp.top());
tmp.pop();
}
@@ -50,7 +50,7 @@ namespace Muon {
// Now continue towards the interaction point
while ((next = getMother(current))) {
- ATH_MSG_DEBUG(" Adding mother: barcode " << HepMC::barcode(current) << " PDG id " << current->pdg_id());
+ ATH_MSG_DEBUG(" Adding mother: " << current);
result->push_back(current = next);
}
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx b/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx
index 03bfc4fa5f9..79b4d6940db 100644
--- a/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx
@@ -687,7 +687,7 @@ namespace Muon {
if (!pit) continue;
if (HepMC::barcode(pit) == barcodeIn || foundBC) {
foundBC = true;
- ATH_MSG_DEBUG("getMother() : pdg = " << pit->pdg_id() << " barcode = " << HepMC::barcode(pit));
+ ATH_MSG_DEBUG("getMother() : " << pit );
if (pit->pdg_id() != pdgFinal) { // the first case a track had a different flavour
#ifdef HEPMC3
return pit.scptr();
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
index 0c62b608a96..357c17f63ae 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
@@ -183,7 +183,7 @@ StatusCode EtaPtFilterTool::buildGenEvent( const HepMC::GenEvent* in, HepMC::Gen
if ( addVertex( vtx, out, vmap, pmap, isSignalVertex ).isFailure() )
{
- ATH_MSG_WARNING("Could not add vertex [" << HepMC::barcode(vtx) << "]");
+ ATH_MSG_WARNING("Could not add vertex " << vtx );
}
} //> end loop over vertices
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
index 6810306a0bf..aad2c69c907 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
@@ -242,14 +242,14 @@ GenAodValidationTool::executeTool( const HepMC::GenEvent* refMcEvts,
if ( !checkVtx ) {
ATH_MSG_WARNING
("Output GenEvent is missing the selected HardScattering Vtx !!"
- << " (" << HepMC::barcode(vtx) << ")");
+ << " (" << vtx << ")");
} else {
(*m_outFile) << "---------" << std::endl;
HepMC::Print::line(*m_outFile,checkVtx);
if ( !compareVtx( vtx, checkVtx ) ) {
ATH_MSG_WARNING("Selected HardScattering vertices are NOT the same !!"
<< " at Event [" << evtNbr << "]"
- << " refVtx = " << HepMC::barcode(vtx));
+ << " refVtx = " << vtx);
}
}
}
@@ -262,14 +262,14 @@ GenAodValidationTool::executeTool( const HepMC::GenEvent* refMcEvts,
HepMC::ConstGenVertexPtr refVtx = HepMC::barcode_to_vertex(refMcEvts,HepMC::barcode(checkVtx));
if (!refVtx) {
ATH_MSG_WARNING("In Event [" << evtNbr
- << "]: got null ref-vertex (barcode: "
- << HepMC::barcode(checkVtx) << ")");
+ << "]: got null ref-vertex ( "
+ << checkVtx << ")");
continue;
}
if ( !compareVtx( refVtx, checkVtx ) ) {
ATH_MSG_WARNING("In Event [" << evtNbr
<< "]: vertices are not the SAME ("
- << HepMC::barcode(refVtx) << ")");
+ << refVtx << ")");
std::stringstream refVtxStr;
HepMC::Print::line(refVtxStr,refVtx);
std::stringstream checkVtxStr;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
index 284a8633499..a693aa0e9e6 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
@@ -229,6 +229,7 @@ McVtxFilterTool::filterMcEventCollection( const McEventCollection* mcColl,
ATH_MSG_VERBOSE("Doing vtx: " << vtxBC);
int i = 0;
+ bool added = false;
for( DataVector<McVtxFilter>::const_iterator filter = m_filters.begin(); filter != m_filters.end(); ++filter,++i ) {
ATH_MSG_VERBOSE("Processing with filter[" << i << "]...");
if ( (*filter)->isAccepted( dcyVtx ) ) {
@@ -237,7 +238,8 @@ McVtxFilterTool::filterMcEventCollection( const McEventCollection* mcColl,
/// Check if this vertex has already been recorded
/// in the new GenEvent
- if ( HepMC::barcode_to_vertex(evt,vtxBC) ) {
+ if ( !added && HepMC::barcode_to_vertex(evt,vtxBC) ) {
+ added = true;
//
// nothing to do
//
@@ -335,9 +337,9 @@ void McVtxFilterTool::addVertex( const HepMC::ConstGenVertexPtr& srcVtx,
if ( !daughter ) {
if ( !keepParticle( vtxType, child ) ) {
// only include selected particles via the "ParticlesToKeep" property
- ATH_MSG_VERBOSE("Skipping outgoing particle id|bc: ["
+ ATH_MSG_VERBOSE("Skipping outgoing particle id|particle: ["
<< child->pdg_id() << "|"
- << HepMC::barcode(child) << "]");
+ << child << "]");
} else {
daughter = HepMC::newGenParticlePtr();
// set the daughter's production vertex to our new vertex
@@ -474,7 +476,7 @@ bool McVtxFilterTool::keepParticle( const VtxType::Flag vtxType,
<< "In keepParticle: Don't know anything about this VtxType ["
<< vtxType << "] !!"
<< endmsg
- << "We'll keep this particle [bc= " << HepMC::barcode(part)
+ << "We'll keep this particle [ " << part
<< "] but : Check your jobOption !!"
<< endmsg;
return true;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.cxx
index 2c0733d10a3..3d78f0fc7d1 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/PileupFilterTool.cxx
@@ -270,7 +270,7 @@ StatusCode PileupFilterTool::shapeGenEvent( McEventCollection* genAod )
++itrBc ) {
//AV: We modify the event!
HepMC::GenParticlePtr p = HepMC::barcode_to_particle((HepMC::GenEvent*)(*evt),*itrBc);
- ATH_MSG_DEBUG("[pdg,bc]= " << p->pdg_id() << ", " << HepMC::barcode( p));
+ ATH_MSG_DEBUG("[pdg,particle]= " << p->pdg_id() << ", " << p);
if ( m_barcodes.find(HepMC::barcode(p)) == m_barcodes.end() ) {
going_out.push_back(p); // list of useless particles
HepMC::GenVertexPtr pvtx = p->production_vertex();
@@ -280,8 +280,7 @@ StatusCode PileupFilterTool::shapeGenEvent( McEventCollection* genAod )
if ( msgLvl(MSG::DEBUG) ) {
msg(MSG::DEBUG)
<< "Removing ["
- << p->pdg_id() << ", "
- <<HepMC::barcode( p) << "]"
+ <<p << "]"
<< "\tprod/endVtx: " << pvtx
<< "/" << evtx
<< endmsg;
@@ -435,15 +434,15 @@ StatusCode PileupFilterTool::reconnectParticles( const McEventCollection* in,
continue;
}
if ( rebuildLinks( evt, outEvt, itrPart ).isFailure() ) {
- ATH_MSG_WARNING("Could not rebuild links for this particle [pdgId,bc]= "
+ ATH_MSG_WARNING("Could not rebuild links for this particle [pdgId,particle]= "
<< itrPart->pdg_id()
- << ", " << HepMC::barcode(itrPart));
+ << ", " << itrPart);
} else if ( msgLvl(MSG::VERBOSE) ) {
msg(MSG::VERBOSE)
<< "==========================================================="
<< endmsg
<< "Production vertex for particle "
- << HepMC::barcode(itrPart) << " : ";
+ << itrPart << " : ";
if ( itrPart->production_vertex() ) {
std::stringstream prodVtx("");
HepMC::Print::line(prodVtx,itrPart->production_vertex());
@@ -455,7 +454,7 @@ StatusCode PileupFilterTool::reconnectParticles( const McEventCollection* in,
}
msg(MSG::VERBOSE) << "Decay vertex for particle "
- << HepMC::barcode(itrPart) << " : ";
+ << itrPart << " : ";
if ( itrPart->end_vertex() ) {
std::stringstream dcyVtx("");
HepMC::Print::line(dcyVtx,itrPart->end_vertex());
@@ -587,8 +586,8 @@ StatusCode PileupFilterTool::rebuildLinks( const HepMC::GenEvent * mcEvt,
// so we skip it
if ( msgLvl(MSG::VERBOSE) ) {
msg(MSG::VERBOSE)
- << "found a particle [bc,pdgId]= "
- << HepMC::barcode(itrPart) << ", "
+ << "found a particle = "
+ << itrPart << ", "
<< "but its production vertex has incoming particles !"
<< endmsg;
continue;
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
index 08db70d7392..3258c23e197 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
@@ -560,30 +560,30 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(HepMC::GenParticleP
double tau2=dist3D.mag2()*(1/beta2-1)/Gaudi::Units::c_light/Gaudi::Units::c_light;
ATH_MSG_VERBOSE("lifetime tau(beta)="<<std::sqrt(tau2)<<" tau="<<tau);
}
-
+ const int bcgenpart = HepMC::barcode(genpart);
if(m_quasiStableParticlesIncluded) {
ATH_MSG_VERBOSE( "Detected primary particle with end vertex." );
ATH_MSG_VERBOSE( "Will add the primary particle set on." );
ATH_MSG_VERBOSE( "Primary Particle: " << genpart );
- ATH_MSG_VERBOSE( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out().size()<<" at position "<<genpart->end_vertex() );
+ ATH_MSG_VERBOSE( "Number of daughters of "<<bcgenpart<<": " << genpart->end_vertex()->particles_out().size()<<" at position "<<genpart->end_vertex() );
}
else {
ATH_MSG_WARNING( "Detected primary particle with end vertex." );
ATH_MSG_WARNING( "Will add the primary particle set on." );
ATH_MSG_WARNING( "Primary Particle: " << genpart );
- ATH_MSG_WARNING( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out().size()<<" at position "<<genpart->end_vertex() );
+ ATH_MSG_WARNING( "Number of daughters of "<<bcgenpart<<": " << genpart->end_vertex()->particles_out().size()<<" at position "<<genpart->end_vertex() );
}
// Add all necessary daughter particles
for ( auto daughter: genpart->end_vertex()->particles_out() ) {
if(m_quasiStableParticlesIncluded) {
- ATH_MSG_VERBOSE ( "Attempting to add daughter particle of "<<HepMC::barcode(genpart)<<": " << daughter );
+ ATH_MSG_VERBOSE ( "Attempting to add daughter particle of "<<bcgenpart<<": " << daughter );
}
else {
- ATH_MSG_WARNING ( "Attempting to add daughter particle of "<<HepMC::barcode(genpart)<<": " << daughter );
+ ATH_MSG_WARNING ( "Attempting to add daughter particle of "<<bcgenpart<<": " << daughter );
}
G4PrimaryParticle *daughterG4Particle = this->getG4PrimaryParticle( daughter );
if(!daughterG4Particle) {
- ATH_MSG_ERROR("Bailing out of loop over daughters of particle with barcode: "<<HepMC::barcode(genpart) <<
+ ATH_MSG_ERROR("Bailing out of loop over daughters of particle with barcode: "<<bcgenpart <<
" due to errors - will not return G4Particle.");
return nullptr;
}
@@ -646,18 +646,18 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(HepMC::GenParticle&
double tau2=dist3D.mag2()*(1/beta2-1)/Gaudi::Units::c_light/Gaudi::Units::c_light;
ATH_MSG_VERBOSE("lifetime tau(beta)="<<std::sqrt(tau2)<<" tau="<<tau);
}
-
+ const int bcgenpart = genpart.barcode();
if(m_quasiStableParticlesIncluded) {
ATH_MSG_VERBOSE( "Detected primary particle with end vertex." );
ATH_MSG_VERBOSE( "Will add the primary particle set on." );
ATH_MSG_VERBOSE( "Primary Particle: " << genpart );
- ATH_MSG_VERBOSE( "Number of daughters of "<<genpart.barcode()<<": " << genpart.end_vertex()->particles_out_size()<<" at position "<<genpart.end_vertex());
+ ATH_MSG_VERBOSE( "Number of daughters of "<<bcgenpart<<": " << genpart.end_vertex()->particles_out_size()<<" at position "<<genpart.end_vertex());
}
else {
ATH_MSG_WARNING( "Detected primary particle with end vertex." );
ATH_MSG_WARNING( "Will add the primary particle set on." );
ATH_MSG_WARNING( "Primary Particle: " << genpart );
- ATH_MSG_WARNING( "Number of daughters of "<<genpart.barcode()<<": " << genpart.end_vertex()->particles_out_size()<<" at position "<<genpart.end_vertex() );
+ ATH_MSG_WARNING( "Number of daughters of "<<bcgenpart<<": " << genpart.end_vertex()->particles_out_size()<<" at position "<<genpart.end_vertex() );
}
// Add all necessary daughter particles
for ( auto daughterIter=genpart.end_vertex()->particles_out_const_begin();
@@ -789,16 +789,16 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(ISF::ISFParticle& i
ATH_MSG_VERBOSE( "gammaVertex="<<dist4Dgamma<<" gammamom="<<fourmomgamma<<" gamma(beta)="<<1/std::sqrt(1-beta2)<<" lifetime tau(beta)="<<std::sqrt(tau2)<<" lifetime tau="<<tau);
}
-
+ const int bcgenpart = HepMC::barcode(genpart);
if(m_quasiStableParticlesIncluded) {
ATH_MSG_VERBOSE( "Detected primary particle with end vertex." );
ATH_MSG_VERBOSE( "Will add the primary particle set on." );
ATH_MSG_VERBOSE( "ISF Particle: " << isp );
ATH_MSG_VERBOSE( "Primary Particle: " << genpart );
#ifdef HEPMC3
- ATH_MSG_VERBOSE( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out().size() << " at position "<< genpart->end_vertex() );
+ ATH_MSG_VERBOSE( "Number of daughters of "<<bcgenpart<<": " << genpart->end_vertex()->particles_out().size() << " at position "<< genpart->end_vertex() );
#else
- ATH_MSG_VERBOSE( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out_size() << " at position "<< genpart->end_vertex() );
+ ATH_MSG_VERBOSE( "Number of daughters of "<<bcgenpart<<": " << genpart->end_vertex()->particles_out_size() << " at position "<< genpart->end_vertex() );
#endif
}
else {
@@ -809,18 +809,18 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(ISF::ISFParticle& i
ATH_MSG_WARNING( "ISF Particle: " << isp );
ATH_MSG_WARNING( "Primary Particle: " << genpart );
#ifdef HEPMC3
- ATH_MSG_VERBOSE( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out().size() );
+ ATH_MSG_VERBOSE( "Number of daughters of "<<bcgenpart<<": " << genpart->end_vertex()->particles_out().size() );
#else
- ATH_MSG_WARNING( "Number of daughters of "<<HepMC::barcode(genpart)<<": " << genpart->end_vertex()->particles_out_size() );
+ ATH_MSG_WARNING( "Number of daughters of "<<bcgenpart<<": " << genpart->end_vertex()->particles_out_size() );
#endif
}
// Add all necessary daughter particles
for ( auto daughter: *(genpart->end_vertex())) {
if(m_quasiStableParticlesIncluded) {
- ATH_MSG_VERBOSE ( "Attempting to add daughter particle of "<<HepMC::barcode(genpart)<<": " << daughter );
+ ATH_MSG_VERBOSE ( "Attempting to add daughter particle of "<<bcgenpart<<": " << daughter );
}
else {
- ATH_MSG_WARNING ( "Attempting to add daughter particle of "<<HepMC::barcode(genpart)<<": " << daughter );
+ ATH_MSG_WARNING ( "Attempting to add daughter particle of "<<bcgenpart<<": " << daughter );
}
#ifdef HEPMC3
G4PrimaryParticle *daughterG4Particle = this->getG4PrimaryParticle( daughter );
@@ -828,7 +828,7 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(ISF::ISFParticle& i
G4PrimaryParticle *daughterG4Particle = this->getG4PrimaryParticle( *daughter );
#endif
if(!daughterG4Particle) {
- ATH_MSG_ERROR("Bailing out of loop over daughters of particle with barcode: "<<HepMC::barcode(genpart) <<
+ ATH_MSG_ERROR("Bailing out of loop over daughters of particle with barcode: "<<bcgenpart <<
" due to errors - will not return G4Particle.");
return nullptr;
}
--
GitLab