diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/ALFA_GloRec.cxx b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/ALFA_GloRec.cxx
index b7f1c0a7b10aeeae3bc75b380cb6ff79794da3a9..2dac1d0c7d653f08cbe0539d757bc0f007f093d7 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/ALFA_GloRec.cxx
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/src/ALFA_GloRec.cxx
@@ -358,7 +358,6 @@ StatusCode ALFA_GloRec::Truth_info(){
py = (**begGenItr).momentum().py();
pz = (**begGenItr).momentum().pz();
HepMC::GenVertex * l_prodvert = (**begGenItr).production_vertex();
- //HepMC::GenVertex * l_endvert = (**begGenItr).end_vertex();
x = l_prodvert->position().x();
y = l_prodvert->position().y();
z = l_prodvert->position().z();
diff --git a/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx b/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx
index 86eb414fb0a2f73de4159e83eacc41873ef98c24..518052385c539deea5f10af19288224ace6cb2a4 100644
--- a/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx
+++ b/Generators/EvtGen_i/src/EvtInclusiveDecay.cxx
@@ -257,7 +257,6 @@ StatusCode EvtInclusiveDecay::execute() {
// Store the number of decay attempts in event weights std::map, only if repeated decays enabled
if(m_maxNRepeatedDecays > 1)
hepMC->weights()["nEvtGenDecayAttempts"] = loopCounter;
- //hepMC->weights().write();
// Print HepMC in tree format if desired (after finishing all EvtGen decays)
if (m_printHepMCAfterEvtGen) {
msg(MSG::INFO) << "Printing HepMC record at " << hepMC << " AFTER running EvtGen:" << endmsg;
diff --git a/Generators/FlowAfterburner/src/CheckFlow.cxx b/Generators/FlowAfterburner/src/CheckFlow.cxx
index a526ef14b3c057c64dbf571c15a1a98f22e5c47f..16aa3b937fd8b8f9d7431bd98c0fd91170d3df0c 100644
--- a/Generators/FlowAfterburner/src/CheckFlow.cxx
+++ b/Generators/FlowAfterburner/src/CheckFlow.cxx
@@ -161,9 +161,6 @@ StatusCode CheckFlow::initialize(){
}
StatusCode CheckFlow::execute() {
- // HepMC::IO_PDG_ParticleDataTable pdg_io("PDGTABLE");
- // static HepMC::ParticleDataTable *pp = NULL;
- // if (pp == NULL) pp = pdg_io.read_particle_data_table();
msg(MSG::INFO) << ">>> CheckFlow from execute" << endmsg;
//
diff --git a/Generators/GeneratorObjects/test/HepMcParticleLink_test.cxx b/Generators/GeneratorObjects/test/HepMcParticleLink_test.cxx
index f4b6714a07164791ee9b0223e692e0954311b829..9faf8cf0d3d017603b758c266391e59bd5cd76b3 100644
--- a/Generators/GeneratorObjects/test/HepMcParticleLink_test.cxx
+++ b/Generators/GeneratorObjects/test/HepMcParticleLink_test.cxx
@@ -53,7 +53,7 @@ namespace MCTesting {
}
};
- //cut-and-paste from HepMC/examples/example_BuildEventFromScratch.cxx
+ //cut-and-paste from HepMC/examples
HepMC::GenEvent* buildEvent() {
//
// In this example we will place the following event into HepMC "by hand"
@@ -69,19 +69,6 @@ namespace MCTesting {
// 7 !d! 1 1 5,5 -2.445 28.816 6.082 29.552 0.010
// 8 !u~! 1 -2 5,5 3.962 -49.498 -26.687 56.373 0.006
- // // first we construct a ParticleDataTable with all the particles we need
- // ParticleDataTable pdt("my particle data table");
- // // create a particle data entry for the proton and add it to pdt at the
- // // same time
- // pdt.insert( new ParticleData( "p+", 2212, +1, 0.938, -1, .5 ) );
- // pdt.insert( new ParticleData( "d", 1, -2./3., 0, -1, .5 ) );
- // pdt.insert( new ParticleData( "u~", -2, -1./3., 0, -1, .5 ) );
- // pdt.insert( new ParticleData( "W-", -24, -1, 80.396,
- // clifetime_from_width(2.06), 1 ) );
- // pdt.insert( new ParticleData( "gamma", 22, 0, 0, -1, 1 ) );
-
- // // print out the GenParticle Data to the screen
- // // pdt.print();
// First create the event container, with Signal Process 20, event number 1
HepMC::GenEvent* evt = new HepMC::GenEvent( 20, 1 );
diff --git a/Generators/HepMCAnalysis_i/HepMCAnalysis_i/HepMCAnalysis.h b/Generators/HepMCAnalysis_i/HepMCAnalysis_i/HepMCAnalysis.h
index 0cffce4a21afe23558dae9e40b46d3846a97f9ba..114515b787949cb8713f62e18312383ce1f8349f 100644
--- a/Generators/HepMCAnalysis_i/HepMCAnalysis_i/HepMCAnalysis.h
+++ b/Generators/HepMCAnalysis_i/HepMCAnalysis_i/HepMCAnalysis.h
@@ -42,9 +42,6 @@ class HepMCAnalysis
/// Destructor:
virtual ~HepMCAnalysis();
- // Assignment operator:
- //HepMCAnalysis &operator=(const HepMCAnalysis &alg);
-
// Athena algorithm's Hooks
virtual StatusCode initialize();
virtual StatusCode execute();
diff --git a/Generators/Pythia8B_i/src/Pythia8B_i.cxx b/Generators/Pythia8B_i/src/Pythia8B_i.cxx
index 82e28cedf9a3a6e5383d28dc0adf1e0742168946..4a35810a68d8e93e92b89cfc67224e2eaebc0b33 100644
--- a/Generators/Pythia8B_i/src/Pythia8B_i.cxx
+++ b/Generators/Pythia8B_i/src/Pythia8B_i.cxx
@@ -376,7 +376,6 @@ StatusCode Pythia8B_i::fillEvt(HepMC::GenEvent *evt){
m_BEventBuffer.erase(m_BEventBuffer.begin());
m_internalEventNumbers.erase(m_internalEventNumbers.begin());
- //HepMC::GenEvent *evtCopy = new HepMC::GenEvent(*evt);
return StatusCode::SUCCESS;
}
diff --git a/Generators/TruthIO/src/PrintMC.cxx b/Generators/TruthIO/src/PrintMC.cxx
index f210ffe1617aa4d2f8bafaf5b3fa2e05ac8ddd74..de6fd98857b180271580fb00a3f91d576fdaf01b 100644
--- a/Generators/TruthIO/src/PrintMC.cxx
+++ b/Generators/TruthIO/src/PrintMC.cxx
@@ -84,10 +84,6 @@ StatusCode PrintMC::execute() {
// Printout header
ATH_MSG_INFO(">>> PrintMC from execute");
- //std::cout << "Next event in the bag" << std::endl;
- // int g_id = evt->signal_process_id();
- // GeneratorName_print(g_id);
- // std::cout << std::endl;
// VERTEX format
/// @todo Isn't this if (m_VerboseOutput... redundant?
@@ -126,12 +122,6 @@ StatusCode PrintMC::execute() {
<< std::endl;
}
- // Random State
- // std::cout << " RndmState(" << evt->random_states().size() << ")=";
- //for ( std::vector<long int>::const_iterator rs
- // = evt->random_states().begin();
- // rs != evt->random_states().end(); rs++ ) { std::cout << *rs << " "; }
- //std::cout << "\n";
// Weights
std::cout << " Weights(" << evt->weights().size() << ")=";
@@ -205,8 +195,6 @@ StatusCode PrintMC::execute() {
ATH_MSG_DEBUG("PID " << abs(p_pdg_id) << " is not in particle data table");
} else {
const double p_charge = ap->charge() * (p_pdg_id < 0 ? -1 : 1); // assuming that charged leptons are in the PDT...
- /// @todo Only do this for hadrons? Or only if there is no generated_mass entry? Commenting out for now...
- // p_mass = ap->mass().value();
// Build particle name string
sname = ap->name();
if (p_charge < 0) {
@@ -242,7 +230,6 @@ StatusCode PrintMC::execute() {
/// @todo Is there no better way to detect unspecified masses than == 0? Final state photons *should* be 0
if (p_mass == 0 && (p_stat == 2 || (p_stat != 1 && p_pdg_id != 22))) {
p_mass = (*p)->momentum().m();
- //p_mass = sqrt(p_pe*p_pe - p_px*p_px - p_py*p_py - p_pz*p_pz);
}
const char* p_name = sname.c_str() ;
@@ -256,18 +243,6 @@ StatusCode PrintMC::execute() {
}
}
-
- // while ( !evt->vertices_empty() ) {
- // HepMC::GenVertex* vtx = ( evt->m_vertex_barcodes.begin() )->second;
- // int bcode = ( evt->m_vertex_barcodes.begin() )->first;
- // std::cout << "vtx= "<< vtx << " bc1=" << vtx->barcode() << " bc2=" << bcode << std::endl;
- // std::cout << "evt= "<< evt << " pev=" << vtx->parent_event() << std::endl;
- // evt->m_vertex_barcodes.erase( evt->m_vertex_barcodes.begin() );
- // delete vtx;
- // }
- // evt->clear();
- // drawLine(std::cout);
-
}
}
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
index f81504f8783e80378d1036d2e1aa9469b8c2740b..e6692d79ed50bb09caf3d9d3f36778710523dfb6 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
@@ -334,7 +334,6 @@ StatusCode SingleTrackValidation::execute() {
Point3D<double> origin(theParticle->production_vertex()->point3d().x(),
theParticle->production_vertex()->point3d().y(),
theParticle->production_vertex()->point3d().z());
- //HepMC::GenVertex *decayVertex = theParticle->end_vertex();
double charge = theParticle->pdg_id() > 0 ? particleData->charge() : - particleData->charge();
// Put Eta and Phi into the Ntuple
m_c->phi = theParticle->momentum().phi();
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/IFilter.h b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/IFilter.h
index 5bf8385aa78fb9a2a3787f02a8db28710ff8e5c2..e7c053e1810e98ad9f1ac4f467ec426b402f2f66 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/IFilter.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/IFilter.h
@@ -18,8 +18,6 @@
// STL includes
-// HepMC / CLHEP includes
-
// Gaudi includes
// AnalysisUtils includes
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/PdgIdFilter.h b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/PdgIdFilter.h
index 07831ea19f92026463780dfbd0c5d8f8ba50fec1..ee76fd992012d8925228899de248597e9dc83ced 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/PdgIdFilter.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/AnalysisUtils/PdgIdFilter.h
@@ -20,8 +20,6 @@
// STL includes
#include <list>
-// HepMC / CLHEP includes
-
// Gaudi includes
#include "AthenaKernel/getMessageSvc.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx
index 905fd47861976ea5520d8a6a70cb905f9d1c6c07..61c749e6e0be37d068c37450d483d51725210c21 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx
@@ -15,10 +15,6 @@
#include "ParticleJetTools/JetQuarkLabel.h"
#include "ParticleJetTools/HadronUtils.h"
-//#include "GeneratorObjects/McEventCollection.h"
-//#include "HepMC/GenEvent.h"
-//#include "HepMC/GenVertex.h"
-//#include "HepMC/GenParticle.h"
#include <algorithm>
// new
@@ -121,7 +117,6 @@ bool JetQuarkLabel::matchJet(const xAOD::Jet& myJet,
const xAOD::TruthEvent* GenEvent = *itEvt;
std::vector<ElementLink<xAOD::TruthParticleContainer> >::const_iterator ELpitr = GenEvent->truthParticleLinks().begin();
std::vector<ElementLink<xAOD::TruthParticleContainer> >::const_iterator pitrE = GenEvent->truthParticleLinks().end();
- //HepMC::GenEvent::particle_const_iterator pitr = GenEvent->particles_begin();
for (; ELpitr != pitrE; ++ELpitr) {
ElementLink<xAOD::TruthParticleContainer> pitr = (*ELpitr);
if(!pitr.isValid() || !(*pitr)) {
@@ -147,30 +142,12 @@ bool JetQuarkLabel::matchJet(const xAOD::Jet& myJet,
<< " eta= " <<part_momentum_lv.Eta()
<< " phi= " <<part_momentum_lv.Phi()
<< " dR= " <<part_momentum_lv.DeltaR(jet_hlv));
-/* if ((*pitr)->prodVtx() != NULL) {
- HepMC::GenVertex::particle_iterator firstParent =
- (*pitr)->prodVtx()->particles_begin(HepMC::ancestors);
- HepMC::GenVertex::particle_iterator endParent =
- (*pitr)->prodVtx()->particles_end(HepMC::ancestors);
- HepMC::GenVertex::particle_iterator thisParent = firstParent;
- for(; thisParent != endParent; ++thisParent){
- if (HadronClass::HeavyHadron((*thisParent)->pdg_id()))
- fromHadron = true;
- ATH_MSG_VERBOSE("In the parent loop "<< (*thisParent)->pdg_id() << " " << fromHadron);
- if (fromHadron) break;
- }
- }*/
// do not label by quark before FSR
bool afterFSR = true;
if ((*pitr)->hasDecayVtx()) {
std::vector<ElementLink<xAOD::TruthParticleContainer> >::const_iterator firstChild = (*pitr)->decayVtx()->outgoingParticleLinks().begin();
std::vector<ElementLink<xAOD::TruthParticleContainer> >::const_iterator endChild = (*pitr)->decayVtx()->outgoingParticleLinks().begin();
std::vector<ElementLink<xAOD::TruthParticleContainer> >::const_iterator thisChild = firstChild;
- //HepMC::GenVertex::particle_iterator firstChild =
- //(*pitr)->end_vertex()->particles_begin(HepMC::children);
- //HepMC::GenVertex::particle_iterator endChild =
- //(*pitr)->end_vertex()->particles_end(HepMC::children);
- //HepMC::GenVertex::particle_iterator thisChild = firstChild;
for(; thisChild != endChild; ++thisChild){
if(!thisChild->isValid() || !(**thisChild)) {
// Allow for possibility that truth content has been thinned.
@@ -228,106 +205,6 @@ bool JetQuarkLabel::matchJet(const xAOD::Jet& myJet,
ATH_MSG_WARNING("A b labelled jet without a labelling particle ? Should not exist");
return true;
}
- //HepMC::GenParticle *theB = LabellingEvent->barcode_to_particle( barcb );
- /* if (theB) {
- ATH_MSG_VERBOSE(
- " bquark px = " << theB->momentum().px()
- << " py = " << theB->momentum().py()
- << " pz = " << theB->momentum().pz() );
- if (theB->hasDecayVertex()) {
- double deltaRbBmin = 9999;
- int barB = -1;
- std::vector<ElementLink<xAOD::TruthParticleContainer> >::const_iterator firstChild = theB->decayVertex()->outgoingParticles().begin();
- std::vector<ElementLink<xAOD::TruthParticleContainer> >::const_iterator endChild = theB->decayVertex()->outgoingParticles().begin();
- std::vector<ElementLink<xAOD::TruthParticleContainer> >::const_iterator ELthisChild = firstChild
- //HepMC::GenVertex::particle_iterator firstChild =
- //theB->end_vertex()->particles_begin(HepMC::descendants);
- //HepMC::GenVertex::particle_iterator endChild =
- //theB->end_vertex()->particles_end(HepMC::descendants);
- //HepMC::GenVertex::particle_iterator thisChild = firstChild;
- for(; thisChild != endChild; ++thisChild){
- ElementLink<xAOD::TruthParticleContainer> thisChild = (*ELthisChild);
- int pdg = (*thisChild)->pdgId();
- short typeH = HadronClass::type(pdg).first;
- short typeP = HadronClass::type(pdg).second;
- if ( typeP == 5 && ( (typeH == 1 && (abs(pdg)%10) == 2) || (typeH == 0 && (abs(pdg)%10) == 1) ) ) {
- CLHEP::HepLorentzVector theB_momentum_lv(theB->momentum().px(),
- theB->momentum().py(),
- theB->momentum().pz(),
- theB->momentum().e());
- CLHEP::HepLorentzVector child_momentum_lv((*thisChild)->momentum().px(),
- (*thisChild)->momentum().py(),
- (*thisChild)->momentum().pz(),
- (*thisChild)->momentum().e());
-
-
- double deltaRbB = theB_momentum_lv.deltaR(child_momentum_lv);
- ATH_MSG_VERBOSE("b quark child " << pdg << " barcode = " << (*thisChild)->barcode());
- if (deltaRbB < deltaRbBmin) {
- if ((*thisChild)->hasDecayVtx()) {
- if (info) {
- info->BDecVtx[0] = (*thisChild)->decayVtx()->position().x();
- info->BDecVtx[1] = (*thisChild)->decayVtx()->position().y();
- info->BDecVtx[2] = (*thisChild)->decayVtx()->position().z();
- info->Bpdg = pdg;
- }
- std::vector<ElementLink<xAOD::TruthParticleContainer> >::const_iterator goodChildEL = (*thisChild)->decayVertex()->outgoingParticles().begin();
- std::vector<ElementLink<xAOD::TruthParticleContainer> >::const_iterator goodChildE = (*thisChild)->decayVertex()->outgoingParticles().begin();
- //HepMC::GenVertex::particle_iterator goodChild = (*thisChild)->end_vertex()->particles_begin(HepMC::children);
- //HepMC::GenVertex::particle_iterator goodChildE = (*thisChild)->end_vertex()->particles_end(HepMC::children);
- for(; goodChild != goodChildE; ++goodChild){
- ElementLink<xAOD::TruthParticleContainer> goodChild = (*goodChildEL);
- if (abs((*goodChild)->pdgId()) == 5) {
- ATH_MSG_VERBOSE("Decay vertex corrupted !");
- if ((*goodChild)->hasDecayVtx()) {
- HepMC::GenVertex::particle_iterator goodbChild = (*goodChild)->end_vertex()->particles_begin(HepMC::children);
- while (abs((*goodbChild)->pdg_id()) <= 4) {
- if ((*goodbChild)->end_vertex()) {
- goodbChild = (*goodbChild)->end_vertex()->particles_begin(HepMC::children);
- } else {
- break;
- }
- }
- if ((*goodbChild)->end_vertex()) {
- if (info) {
- info->BDecVtx[0] = (*goodbChild)->end_vertex()->position().x();
- info->BDecVtx[1] = (*goodbChild)->end_vertex()->position().y();
- info->BDecVtx[2] = (*goodbChild)->end_vertex()->position().z();
- ATH_MSG_VERBOSE( "Trying to recover pdg Good Child = " << (*goodbChild)->pdg_id()
- << " Decay vertex " << info->BDecVtx[0] << " " << info->BDecVtx[1] << " " << info->BDecVtx[2] );
- }
- break;
- }
- }
- }
- }
- }
- deltaRbBmin = deltaRbB;
- barB = (*thisChild)->barcode();
- }
- }
- }
- if (msgLvl(MSG::VERBOSE)) {
- HepMC::GenParticle *theBHad = LabellingEvent->barcode_to_particle( barB );
- if (theBHad) {
- ATH_MSG_VERBOSE("The nearest B hadron for a b-labelled jet ");
- ATH_MSG_VERBOSE("barc = " << barB << " DR = " << deltaRbBmin);
- ATH_MSG_VERBOSE(
- " px = " << theBHad->momentum().px()
- << " py = " << theBHad->momentum().py()
- << " pz = " << theBHad->momentum().pz() );
- if (info) {
- ATH_MSG_VERBOSE(
- " vx = " << info->BDecVtx[0]
- << " vy = " << info->BDecVtx[1]
- << " vz = " << info->BDecVtx[2] );
- }
- }
- }
- }
- }*/
-
- //
return true;
} else if (deltaRC < m_deltaRCut) {
if (info) {
diff --git a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/AfpTruthInfoFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/AfpTruthInfoFillerTool.cxx
index 394683c481e1e90d63a219381ea866693af450de..bb9edc9c12af3c28b8359d53bdd721fadaf6311d 100644
--- a/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/AfpTruthInfoFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/ForwardDetectorsD3PDMaker/src/AfpTruthInfoFillerTool.cxx
@@ -131,25 +131,19 @@ namespace D3PD {
HepMC::GenParticle* pi1=0;
HepMC::GenParticle* pi2=0;
- //HepMC::GenParticle* p1=0;
HepMC::GenParticle* p2=0;
int pint = 0;
int pcount = 0;
LogStream << MSG::DEBUG << " just before " << endmsg;
- //HepMC::GenParticle* beam_p1 = (**mcTruBeg).beam_particle_1;
HepMC::GenParticle* beam_p1 = (**mcTruBeg).beam_particles().first;
- //HepMC::GenParticle* beam_p2 = (**mcTruBeg).beam_particle_2;
HepMC::GenParticle* beam_p2 = (**mcTruBeg).beam_particles().second;
LogStream << MSG::DEBUG << " beam1 pointer " << beam_p1 << endmsg;
LogStream << MSG::DEBUG << " beam2 pointer " << beam_p2 << endmsg;
LogStream << MSG::DEBUG << " just after " << endmsg;
-
- //double beam1_energy = beam_p1->momentum().e();
- //double beam2_energy = beam_p2->momentum().e();
-
+
double beam1_energy = 0.; //MeV
double beam2_energy = 0.; //MeV
diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/VrtSecInclusive/VrtSecInclusive.h b/Reconstruction/VKalVrt/VrtSecInclusive/VrtSecInclusive/VrtSecInclusive.h
index 214866bea28b220388f64485cf8c641916cb6ca4..2335a58180a51843f6c99adb4ee3f5816c02bad5 100755
--- a/Reconstruction/VKalVrt/VrtSecInclusive/VrtSecInclusive/VrtSecInclusive.h
+++ b/Reconstruction/VKalVrt/VrtSecInclusive/VrtSecInclusive/VrtSecInclusive.h
@@ -347,7 +347,6 @@ namespace VKalVrtAthena {
StatusCode getNewTruthInfo();
//
- //HepMC::GenParticle *getTrkGenParticle(const xAOD::TrackParticle*, double& matchProb);
const xAOD::TruthParticle *getTrkGenParticle(const xAOD::TrackParticle* /*, double& matchProb*/) const;
diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/src/AANT_Tools.cxx b/Reconstruction/VKalVrt/VrtSecInclusive/src/AANT_Tools.cxx
index a7e2d916803dc2979908d24a3ee34f6114c78eb0..af6ae3921e6f4f85fe0976f2102fb2ea957d4bc2 100644
--- a/Reconstruction/VKalVrt/VrtSecInclusive/src/AANT_Tools.cxx
+++ b/Reconstruction/VKalVrt/VrtSecInclusive/src/AANT_Tools.cxx
@@ -349,7 +349,6 @@ namespace VKalVrtAthena {
int barcode = 0;
if(m_doTruth)
{
- //HepMC::GenParticle* aTemp_truth = getTrkGenParticle(trk, matchProb);
const xAOD::TruthParticle* aTemp_truth = getTrkGenParticle( trk );
if( aTemp_truth )
{
diff --git a/Reconstruction/VKalVrt/VrtSecInclusive/src/TruthAlgs.cxx b/Reconstruction/VKalVrt/VrtSecInclusive/src/TruthAlgs.cxx
index 636fa7ecd1345a461a95784f0645ef15e7fd6144..0e013974c27fcad7f649a38a15c3d8fa42d4d0d9 100644
--- a/Reconstruction/VKalVrt/VrtSecInclusive/src/TruthAlgs.cxx
+++ b/Reconstruction/VKalVrt/VrtSecInclusive/src/TruthAlgs.cxx
@@ -163,7 +163,6 @@ namespace VKalVrtAthena {
if( abspid==1000022 ) vtxHasLifetime=19; // neutralino
- //HepMC::FourVector iVec = ( *inP)->momentum();
HepMC::FourVector iVec;// = ( *inP)->p4();
iVec.setX( inP->px() );
iVec.setY( inP->py() );
@@ -223,9 +222,6 @@ namespace VKalVrtAthena {
double length=m_TruthTrkLen;
if ( iPart==nOutgoing )
{
- //endv_barcode = endv->barcode();
-
- //HepMC::FourVector end = endv->position();
HepMC::FourVector end;
end.setX( vtx->x() );
end.setY( vtx->y() );
diff --git a/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx b/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
index a347b35927361d84384578b5d43b6d7b5c915ad6..2e7968c4911b79852a3bdcbd4b4ac30a33756de8 100644
--- a/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
+++ b/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
@@ -161,10 +161,6 @@ StatusCode McEventCollectionFilter::ReduceMCEventCollection(){
//......copy GenEvent to the new one and remove all vertex
HepMC::GenEvent* evt=new HepMC::GenEvent(*genEvt);
- //to set geantino vertex as a truth primary vertex
- //HepMC::GenVertex* pmvx=*(evt->vertices_begin());
- //HepMC::FourVector pmvxpos=pmvx->position();
- //genVertex->set_position(pmvxpos);
//to set geantino vertex as a truth primary vertex
HepMC::GenVertex* hScatVx = genEvt->barcode_to_vertex(-3);
diff --git a/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx b/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
index 5abdc945a74aaf70da17e20293edda70f83c912d..79cdb786f11449a22071de1cd65df17705211b7c 100755
--- a/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
+++ b/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
@@ -90,20 +90,6 @@ FakeLvl1RoIfromKine::FakeLvl1RoIfromKine(const std::string& name, const std::str
declareProperty( "FakeJetRoiLabel", m_jetRoiLabel ="JET20");
declareProperty( "FakeTauRoiLabel", m_tauRoiLabel ="HA10");
- // HepMC::IO_PDG_ParticleDataTable pdg_io("PDGTABLE");
- //pdg_io.fill_particle_data_table(&m_particleDataTable);
- //m_particleDataTable.make_antiparticles_from_particles();
- //if (m_particleDataTable.empty()) {
- // m_log << MSG::WARNING << "failed to find PDG table" << std::endl;
- //}
-
- // HepMC::IO_PDG_ParticleDataTable pdg_io("PDGTABLE");
- //pdg_io.fill_particle_data_table(&m_particleDataTable);
- //m_particleDataTable.make_antiparticles_from_particles();
- //if (m_particleDataTable.empty()) {
- // m_log << MSG::WARNING << "failed to find PDG table" << std::endl;
- //}
-
}
// DESTRUCTOR: