diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx
index 7724afc457b6f758ca52daadfc808ede3c2f9b41..c8bccb7b3615ffa1eb01df11af38db5ce83bbe94 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 0ccd831d3080d74ca98db65355472ec8d78c5b3f..627410c4b3f6d4c38855e0b5af38997e12233e3f 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 bf89d2b30d2697615615957071b71905390e765b..e9d6acaaf5f6760137daea28c860bb557b0c241c 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 8491d51f7352f01b0493b3380cb2a6f557522724..18947748a8e8e97b8c4bb49ad2ec1dc9a89b9d6b 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 abdd3d58fc9df72d882b47fdb4b0663709087ba2..bb5841ee3c51d44b08ed7b205e6e8ac8bc1058fd 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 3c5c0c688df04497bbdb6fe739d8e3bd699830c2..b4549b81033509b4dbe20fc23ae2ca4fca212a87 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 6b9fc34749350c3c0864240ee4c29e5c83c49125..863889c04b45d3125951cc7ce5e0fdc80877a93e 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 8f28bbda5258b3a8e0aeaadbbe6d0ebcad3652b8..b6a8cc65f23aa47a4c98954c772a81c3590c8433 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 cfb394ec728265a70ce47fdf85aa82314074e0cd..6b528e41476cbdf3feb3c612a9aa81394edc75e1 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 c2af5a196298db4bc2ec0a9a71450078b7d4ccb3..fc46eb2f3e5c0c12d4afeca610c2fe3c361fe8a5 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 598d7a8f8615c045e0939d75b0d3b79fcd6a0d84..3631bf7cb7adc14fcbf0d663c0ef440ec4088733 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 ff11b4d75c34e228ea274cda068bf84cb93cd3b2..c55c287f5a97c29bbfb1fd521d8fb1bac1b82226 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).