From 01c40eaa56bc1f70b8a0a629da5a844d5cf1febb Mon Sep 17 00:00:00 2001
From: Andrii Verbytskyi <andrii.verbytskyi@cern.ch>
Date: Mon, 27 Apr 2020 18:20:51 +0000
Subject: [PATCH] Removed more outdated commented code related to HepMC
---
.../src/IDStandardPerformance.cxx | 5 -----
.../MuonTruthAlgs/src/MuonTrackTruthTool.cxx | 1 -
.../EventUtils/src/ParticleCombinerTool.cxx | 1 +
.../src/AlfaTruthInfoFillerTool.cxx | 5 -----
.../src/SiHitTruthAssociationTool.cxx | 3 ---
.../src/OldSpclMcFilterTool.cxx | 2 --
.../METReconstruction/Root/METTruthTool.cxx | 19 -------------------
.../src/FastShowerCellBuilderTool.cxx | 1 -
.../src/DNNCaloSimSvc.cxx | 3 ---
.../src/FastCaloSimV2Tool.cxx | 3 ---
.../Associator_TruthMatch.h | 4 ----
.../src/TrackCollHandle_TruthTracks.cxx | 2 --
12 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx
index 7724afc457b..c8bccb7b361 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx
@@ -2474,15 +2474,10 @@ IDStandardPerformance::MakeTrackPlots(const DataVector<Trk::Track>* trks,
// Do not fill track performance plots for Geant particles, but they will be included in fake rate calculation
if(barcode<MAXBARCODE && barcode !=0){
- //if (barcode>MAXBARCODE || barcode == 0) continue;
if ( HMPL.isValid())
{
const HepMC::GenParticle *genparptr = HMPL.cptr();
- //float barcode = HMPL.barcode();
- //int pdgCode = genparptr->pdg_id();
-
- //if(abs(pdgCode) == 211) isPion = true;
if (genparptr) {
if (m_selHardScatter && genparptr->parent_event()->event_number()!=genEventNumberPrimary) {
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx b/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx
index 0ccd831d308..627410c4b3f 100644
--- a/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/MuonTrackTruthTool.cxx
@@ -328,7 +328,6 @@ namespace Muon {
std::vector<MuonSimData::Deposit>::const_iterator dit = it->second.getdeposits().begin();
std::vector<MuonSimData::Deposit>::const_iterator dit_end = it->second.getdeposits().end();
for( ;dit!=dit_end;++dit ){
- // int barcodeIn = manipulateBarCode(dit->first.barcode());
int barcodeIn = dit->first.barcode();
std::map<int,int>::iterator bit = m_barcodeMap.find(barcodeIn);
if( bit == m_barcodeMap.end() ){
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.cxx
index bf89d2b30d2..e9d6acaaf5f 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.cxx
@@ -899,3 +899,4 @@ bool ParticleCombinerTool::shareSameConstituents( const xAOD::CompositeParticle*
}
+
diff --git a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/AlfaTruthInfoFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/AlfaTruthInfoFillerTool.cxx
index 8491d51f735..18947748a8e 100644
--- a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/AlfaTruthInfoFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/AlfaTruthInfoFillerTool.cxx
@@ -224,11 +224,6 @@ namespace D3PD {
//double py = (*child)->momentum().py();
double pz = (*child)->momentum().pz();
- //LogStream << MSG::DEBUG << "particle barcode = " << (*child)->barcode() << endmsg;
- //LogStream << MSG::DEBUG << "particle pdg = " << (*child)->pdg_id() << endmsg;
- //LogStream << MSG::DEBUG << "particle status = " << (*child)->status() << endmsg;
- //LogStream << MSG::DEBUG << " * px = " << px << ", py = " << py << ", pz =" << pz << endmsg;
- //LogStream << MSG::DEBUG << " " << endmsg;
//if ((*child == genEvt->beam_particles().first) || (*child == genEvt->beam_particles().second))
//{
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitTruthAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitTruthAssociationTool.cxx
index abdd3d58fc9..bb5841ee3c5 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitTruthAssociationTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/src/SiHitTruthAssociationTool.cxx
@@ -48,7 +48,6 @@
const HepMC::GenParticle* SiHitTruthAssociationTool::get (const SiHit& sihit){
const HepMcParticleLink& mcLink = sihit.particleLink();
const HepMC::GenParticle* genPart= mcLink.cptr();
- //if(genPart){
std::cout<< "Identifier: "<< sihit.identify();
if(genPart){
std::cout<<" genPart.barcode: " << genPart->barcode() << " type " << genPart->pdg_id() << " status " << genPart->status();
@@ -58,9 +57,7 @@ const HepMC::GenParticle* genPart= mcLink.cptr();
}
std::cout<< std::endl;
- //<<" genPart.barcode: " << (genPart?genPart->barcode():-999)<< std::endl;
- //}
return genPart;
}
}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.cxx
index 3c5c0c688df..b4549b81033 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/OldSpclMcFilterTool.cxx
@@ -563,8 +563,6 @@ StatusCode OldSpclMcFilterTool::rebuildLinks( const HepMC::GenEvent * mcEvt,
itrPart != endPart;
++itrPart ) {
- //bcChildPart.push_back( (*itrPart)->barcode() );
-
// because the vertices are traversed in POST ORDER !!
// (quoting GenVertex::vertex_iterator)
bcChildPart.push_front( (*itrPart)->barcode() );
diff --git a/Reconstruction/MET/METReconstruction/Root/METTruthTool.cxx b/Reconstruction/MET/METReconstruction/Root/METTruthTool.cxx
index 6b9fc347493..863889c04b4 100644
--- a/Reconstruction/MET/METReconstruction/Root/METTruthTool.cxx
+++ b/Reconstruction/MET/METReconstruction/Root/METTruthTool.cxx
@@ -252,23 +252,4 @@ namespace met {
return StatusCode::SUCCESS;
}
- ///////////////////////////////////////////////////////////////////
- // Const methods:
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Non-const methods:
- ///////////////////////////////////////////////////////////////////
-
- // // TEMPORARILY recopy some helper from TruthHelper and GeneratorUtils packages
- // // *** via JetSimTools ***
- // // We'll have to use this package when they work properly with xAOD.
-
- // inline bool isStable(const xAOD::TruthParticle* p) {
- // if (p->barcode() >= 200000) return false; // This particle is from G4
- // if (p->pdgId() == 21 && p->p4().E() == 0) return false; //< Workaround for a gen bug?
- // return ((p->status() % 1000 == 1) || //< Fully stable, even if marked that way by G4
- // (p->status() % 1000 == 2 && p->decayVtx() != NULL && p->decayVtx()->barcode() < -200000)); //< Gen-stable with G4 decay
- // /// @todo Add a no-descendants-from-G4 check?
- // }
}
diff --git a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
index 8f28bbda525..b6a8cc65f23 100755
--- a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
@@ -1363,7 +1363,6 @@ FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCellContainer,
// Process Muon info from Fatras
//////////////////////////////
if(abs(pdgid)==13) {
- // std::pair<BarcodeEnergyDepositMap::iterator,BarcodeEnergyDepositMap::iterator> range=MuonEnergyMap->equal_range(part->barcode());
p.fcal_tot=0;
for(int i=CaloCell_ID_FCS::FirstSample;i<CaloCell_ID_FCS::MaxSample;++i) {
p.E_layer[i]=0;
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/DNNCaloSimSvc.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/DNNCaloSimSvc.cxx
index cfb394ec728..6b528e41476 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/DNNCaloSimSvc.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/DNNCaloSimSvc.cxx
@@ -383,9 +383,6 @@ StatusCode ISF::DNNCaloSimSvc::fillNetworkInputs(const ISF::ISFParticle& isfp, N
Amg::Vector3D particle_position = isfp.position();
Amg::Vector3D particle_direction(isfp.momentum().x(),isfp.momentum().y(),isfp.momentum().z());
- //int barcode=isfp.barcode(); // isfp barcode, eta and phi: in case we need them
- // float eta_isfp = particle_position.eta();
- // float phi_isfp = particle_position.phi();
TFCSTruthState truth(isfp.momentum().x(),isfp.momentum().y(),isfp.momentum().z(),sqrt(isfp.momentum().mag2()+pow(isfp.mass(),2)),isfp.pdgCode());
truth.set_vertex(particle_position[Amg::x], particle_position[Amg::y], particle_position[Amg::z]);
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2Tool.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2Tool.cxx
index c2af5a19629..fc46eb2f3e5 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2Tool.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimV2Tool.cxx
@@ -170,9 +170,6 @@ StatusCode ISF::FastCaloSimV2Tool::simulate(const ISF::ISFParticle& isfp, ISFPar
secondaries = *someSecondaries;
}
- //int barcode=isfp.barcode(); // isfp barcode, eta and phi: in case we need them
- // float eta_isfp = particle_position.eta();
- // float phi_isfp = particle_position.phi();
//Don't simulate particles with total energy below 10 MeV
if(isfp.ekin() < 10) {
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h
index 598d7a8f861..3631bf7cb7a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h
@@ -61,10 +61,6 @@ public:
for (unsigned int j = 0; j < testTracks.size(); j++) {
- // if(testTracks[j]->match_barcode()!=-1){
- // std::cout << "ref barcode" << refTracks[i]->barcode() << std::endl;
- // std::cout << "test barcode " << testTracks[j]->match_barcode() << std::endl;
- // }
if ( distance( refTracks[i], testTracks[j] ) < 1. ) {
// std::cout<<"MATCHED"<<std::endl;
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollHandle_TruthTracks.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollHandle_TruthTracks.cxx
index ff11b4d75c3..c55c287f5a9 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollHandle_TruthTracks.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollHandle_TruthTracks.cxx
@@ -445,8 +445,6 @@ bool TrackCollHandle_TruthTracks::load()
itGenPart->second = 0;
}
-// if (!itHitList->first.isNonUniqueSecondary()) continue;//FIXME
-// if (!itHitList->first.actualBarCode()==0) continue;//FIXME
m_d->possiblyUpdateGUI();
if (m_d->fixMomentumInfoInSimHits(p,itHitList->second))//Provide guesses for momentum in simhits that needs them (and deletes the rest).
--
GitLab