diff --git a/Event/xAOD/xAODTruthCnv/src/RedoTruthLinksAlg.cxx b/Event/xAOD/xAODTruthCnv/src/RedoTruthLinksAlg.cxx
index a6bdb3ba190839a1047ae4549d294d420ea68d04..a128cc5c62b24d9e947c929fd7a6aa0e3405c0ac 100644
--- a/Event/xAOD/xAODTruthCnv/src/RedoTruthLinksAlg.cxx
+++ b/Event/xAOD/xAODTruthCnv/src/RedoTruthLinksAlg.cxx
@@ -62,7 +62,6 @@ namespace xAODMaker {
continue;
}
// Create link between HepMC and xAOD truth
- //truthLinkVec->push_back(new xAODTruthParticleLink(HepMcParticleLink((*par)->barcode(), evt->eventNumber()), par));
/// @todo AB: Truth particle links should only be made to the signal event... hence the 0. Right?
truthLinkVec->push_back(new xAODTruthParticleLink(HepMcParticleLink((*par)->barcode(), 0, EBC_MAINEVCOLL, HepMcParticleLink::IS_POSITION), par));
}
diff --git a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
index 36d2fdf9b5518270aa9fac8501565c4215342256..03abab199ac6320814151d9d32050e9d0ed43b25 100644
--- a/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
+++ b/Event/xAOD/xAODTruthCnv/src/xAODTruthCnvAlg.cxx
@@ -181,9 +181,6 @@ namespace xAODMaker {
xAOD::TruthEvent* xTruthEvent = new xAOD::TruthEvent();
xAOD::TruthPileupEvent* xTruthPileupEvent = new xAOD::TruthPileupEvent();
- /// @todo Drop or re-enable these? Signal process can be set to DSID... preferably not to the gen-name code
- //xTruthEvent->setSignalProcessId(genEvt->signal_process_id());
- //xTruthEvent->setEventNumber(genEvt->event_number());
if (isSignalProcess) {
xTruthEventContainer->push_back( xTruthEvent );
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/src/ALFA_ODHit.cxx b/ForwardDetectors/ALFA/ALFA_SimEv/src/ALFA_ODHit.cxx
index 9da62947af78df530538b4f9b10016b1b795a05e..e8fecbeac5cc5d04a1c9fb6ff6598993dc0c1dd8 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/src/ALFA_ODHit.cxx
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/src/ALFA_ODHit.cxx
@@ -51,5 +51,4 @@ ALFA_ODHit::~ALFA_ODHit() {}
int ALFA_ODHit::GetTrackID() const
{
return 22;
-// return m_partLink.barcode();
}
diff --git a/Generators/EvtGen_i/src/EvtDecay.cxx b/Generators/EvtGen_i/src/EvtDecay.cxx
index 73938f34402a96d7ab479aeb4f38f12d1363b23d..5d40740f8b5c534763c7d9acbe66b8f97b4c03f4 100644
--- a/Generators/EvtGen_i/src/EvtDecay.cxx
+++ b/Generators/EvtGen_i/src/EvtDecay.cxx
@@ -418,7 +418,6 @@ double EvtCLHepRandom::random() {
void EvtDecay::MeVToGeV (HepMC::GenEvent* evt) {
for ( HepMC::GenEvent::particle_iterator p = evt->particles_begin(); p != evt->particles_end(); ++p ) {
-// std::cout << " PDG, BAR " << (*p)->pdg_id() << " " << (*p)->barcode() << std::endl;
HepMC::FourVector newMomentum(0.,0.,0.,0.);
newMomentum.setPx( (*p)->momentum().px() / 1000. );
newMomentum.setPy( (*p)->momentum().py() / 1000. );
diff --git a/Generators/GenInterfaces/CMakeLists.txt b/Generators/GenInterfaces/CMakeLists.txt
index d37350aaf381e8e25bbc9c2ce285592dee5d6b4b..01a1961f64cd36466aed0aadb52180326fff2a89 100644
--- a/Generators/GenInterfaces/CMakeLists.txt
+++ b/Generators/GenInterfaces/CMakeLists.txt
@@ -8,7 +8,6 @@ atlas_depends_on_subdirs(
GaudiKernel )
# External dependencies:
-find_package( HepMC )
# Component(s) in the package:
atlas_add_library( GenInterfacesLib
diff --git a/Generators/QGSJet_i/src/QGSJet.cxx b/Generators/QGSJet_i/src/QGSJet.cxx
index 34786c4bde28a6c342f7181e1864d0c84d668aff..e6699de5866bb5ffba80189e99b3e011ac52f198 100644
--- a/Generators/QGSJet_i/src/QGSJet.cxx
+++ b/Generators/QGSJet_i/src/QGSJet.cxx
@@ -320,8 +320,6 @@ StatusCode QGSJet::fillEvt( HepMC::GenEvent* evt )
evt->set_beam_particles(beams[0], beams[1]);
- //an integer ID uniquely specifying the signal process (i.e. MSUB in Pythia)
- // std::cout<<"obecny sig_proc_id " << evt->signal_process_id() << std::endl;
int sig_id = -1;
switch (int(c2evt_.typevt))
{
diff --git a/Generators/Rivet_i/src/Rivet_i.cxx b/Generators/Rivet_i/src/Rivet_i.cxx
index 6ed1c192a44be24a55d73875ae203a98547be361..515e1fd366bba95ce9ded7327cff950e44c16980 100644
--- a/Generators/Rivet_i/src/Rivet_i.cxx
+++ b/Generators/Rivet_i/src/Rivet_i.cxx
@@ -24,10 +24,7 @@
#include "Rivet/Analysis.hh"
#include "Rivet/Tools/RivetYODA.hh"
-//#include "TH1D.h"
-//#include "TGraphAsymmErrors.h"
-//#include "YODA/ROOTCnv.h"
#include <cstdlib>
#include <memory>
@@ -40,7 +37,6 @@ using namespace std;
Rivet_i::Rivet_i(const std::string& name, ISvcLocator* pSvcLocator) :
AthAlgorithm(name, pSvcLocator),
- //m_histSvc("THistSvc", name),
m_analysisHandler(0),
m_init(false)
{
@@ -58,8 +54,6 @@ Rivet_i::Rivet_i(const std::string& name, ISvcLocator* pSvcLocator) :
declareProperty("DoRootHistos", m_doRootHistos=false);
declareProperty("SkipWeights", m_skipweights=false);
declareProperty("WeightCap", m_weightcap=-1.0);
- // Service handles
- //declareProperty("THistSvc", m_histSvc);
}
string getenv_str(const string& key) {
@@ -72,11 +66,6 @@ StatusCode Rivet_i::initialize() {
ATH_MSG_DEBUG("Rivet_i initializing");
ATH_MSG_INFO("Using Rivet version " << Rivet::version());
- // Get histo service
- //if (m_doRootHistos && m_histSvc.retrieve().isFailure()) {
- // ATH_MSG_FATAL("Failed to retrieve service " << m_histSvc);
- // return StatusCode::FAILURE;
- //}
// Set RIVET_ANALYSIS_PATH based on alg setup
@@ -224,49 +213,7 @@ StatusCode Rivet_i::finalize() {
// Call Rivet finalize
m_analysisHandler->finalize();
- // Convert YODA-->ROOT
- /*if (m_doRootHistos) {
- for (const Rivet::AnalysisObjectPtr ao : m_analysisHandler->getData()) {
- // Normalize path name to be usable by ROOT
- string path = string(ao->path());
- std::replace(path.begin(), path.end(), '-', '_');
- const string basename = ao->path().substr(ao->path().rfind("/")+1); // There should always be >= 1 slash
-
- // Convert YODA histos to heap-allocated ROOT objects and register
- /// @todo Convert Counter... as what?
- if (ao->type() == "Histo1D") {
- TH1* h = (TH1*) YODA::toTH1D(*dynamic_pointer_cast<YODA::Histo1D>(ao)).Clone(basename.c_str());
- CHECK(m_histSvc->regHist(m_stream + path, h));
- ATH_MSG_INFO("TH1D " + path + " created from YODA::Histo1D");
- } else if (ao->type() == "Histo2D") {
- TH2* h = (TH2*) YODA::toTH2D(*dynamic_pointer_cast<YODA::Histo2D>(ao)).Clone(basename.c_str());
- CHECK(m_histSvc->regHist(m_stream + path, h));
- ATH_MSG_INFO("TH2 " + path + " created from YODA::Histo2D");
- // } else if (ao->type() == "Profile2D") {
- // TProfile2D* h = (TProfile2D*) YODA::toTProfile2D(*boost::dynamic_pointer_cast<YODA::Profile2D>(ao)).Clone(basename.c_str());
- // CHECK(m_histSvc->regHist(m_stream + path, h));
- // ATH_MSG_INFO("TProfile2D " + path + " created from YODA::Profile2D");
- } else if (ao->type() == "Profile1D") {
- TH1* h = (TH1*) YODA::toTProfile(*dynamic_pointer_cast<YODA::Profile1D>(ao)).Clone(basename.c_str());
- CHECK(m_histSvc->regHist(m_stream + path, h));
- ATH_MSG_INFO("TProfile " + path + " created from YODA::Profile1D");
- // } else if (ao->type() == "Scatter1D") {
- // TGraph* g = (TGraph*) YODA::toTGraph(*boost::dynamic_pointer_cast<YODA::Scatter1D>(ao)).Clone(basename.c_str());
- // CHECK(m_histSvc->regGraph(m_stream + path, g));
- // ATH_MSG_INFO("TGraph " + path + " created from YODA::Scatter2D");
- } else if (ao->type() == "Scatter2D") {
- TGraph* g = (TGraph*) YODA::toTGraph(*dynamic_pointer_cast<YODA::Scatter2D>(ao)).Clone(basename.c_str());
- CHECK(m_histSvc->regGraph(m_stream + path, g));
- ATH_MSG_INFO("TGraph " + path + " created from YODA::Scatter2D");
- // } else if (ao->type() == "Scatter3D") {
- // TGraph* g = (TGraph*) YODA::toTGraph(*boost::dynamic_pointer_cast<YODA::Scatter3D>(ao)).Clone(basename.c_str());
- // CHECK(m_histSvc->regGraph(m_stream + path, g));
- // ATH_MSG_INFO("TGraph " + path + " created from YODA::Scatter2D");
- } else {
- ATH_MSG_WARNING("Couldn't convert YODA histo " + path + " to ROOT: unsupported data type " + ao->type());
- }
- }
- }*/
+
// Write out YODA file (add .yoda suffix if missing)
if (m_file.find(".yoda") == string::npos) m_file += ".yoda";
diff --git a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
index b6a8cc65f23aa47a4c98954c772a81c3590c8433..c4965904212d5a6e05efb570a4f65cac28c72278 100755
--- a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
@@ -2091,7 +2091,6 @@ void MC_init_particle_simul_state(MCdo_simul_state& do_simul_state,const MCparti
void MC_recursive_remove_out_particles(MCdo_simul_state& do_simul_state,HepMC::GenVertex* ver,FastShowerCellBuilderTool::flag_simul_sate simul_state)
{
if(ver) {
- // if(do_simul_state[ver->barcode()]<=0) return;
do_simul_state[ver->barcode()]=simul_state;
for(HepMC::GenVertex::particles_out_const_iterator pout=ver->particles_out_const_begin();pout!=ver->particles_out_const_end();++pout) {
const HepMC::GenParticle* par=*pout;
@@ -2106,7 +2105,6 @@ void MC_recursive_remove_in_particles(MCdo_simul_state& do_simul_state,HepMC::Ge
{
if(ver) {
if(do_simul_state[ver->barcode()]==simul_state) {
- //log << MSG::DEBUG<<"ver: bc="<<ver->barcode()<<" : loop in MC_recursive_remove_in_particles, returning"<<endmsg;
return;
}
do_simul_state[ver->barcode()]=simul_state;
@@ -2119,72 +2117,6 @@ void MC_recursive_remove_in_particles(MCdo_simul_state& do_simul_state,HepMC::Ge
}
}
-/*
- void print_MC_info(MCdo_simul_state& do_simul_state,const MCparticleCollection& particles,MsgStream& log)
- {
- log << MSG::VERBOSE <<"print_MC_info: begin"<< endmsg;
- MCparticleCollectionCIter ip;
- for(ip=particles.begin();ip<particles.end();++ip){
- const HepMC::GenParticle* par=*ip;
-
- if(log.level()<=MSG::DEBUG) {
- std::string reason="---";
- if(do_simul_state[par->barcode()]<=0) {
- if(do_simul_state[par->barcode()]==FastShowerCellBuilderTool::out_of_ID) reason="-ID";
- if(do_simul_state[par->barcode()]==FastShowerCellBuilderTool::non_EM_vertex) reason="-EM";
- if(do_simul_state[par->barcode()]==FastShowerCellBuilderTool::heavy_ion) reason="-HI";
- if(do_simul_state[par->barcode()]==FastShowerCellBuilderTool::pdg_id_unkown) reason="-PI";
- if(do_simul_state[par->barcode()]==FastShowerCellBuilderTool::invisibleArray) reason="-IA";
- if(do_simul_state[par->barcode()]==FastShowerCellBuilderTool::invisibleTruthHelper) reason="-IT";
- if(do_simul_state[par->barcode()]==FastShowerCellBuilderTool::mother_particle) reason="-MO";
- if(do_simul_state[par->barcode()]==FastShowerCellBuilderTool::v14_truth_brems) reason="-BR";
- if(do_simul_state[par->barcode()]==FastShowerCellBuilderTool::v14_truth_conv) reason="-CO";
- } else {
- reason="+OK";
- }
- log << MSG::DEBUG<<reason;
-
- log <<": "<<"bc="<<par->barcode()<<" id="<<par->pdg_id()<<" stat="<<par->status()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi();
- HepMC::GenVertex* inver =par->production_vertex();
- HepMC::GenVertex* outver =par->end_vertex();
- if(inver) {
- double inr=inver->position().perp();
- double inz=inver->position().z();
- log<<" ; r="<<inr<<" z="<<inz<<" phi="<<inver->position().phi()<<" ; ";
- bool sep=false;
- for(HepMC::GenVertex::particles_in_const_iterator pin=inver->particles_in_const_begin();pin!=inver->particles_in_const_end();++pin) {
- const HepMC::GenParticle* invpar=*pin;
- if(invpar) {
- if(sep) log<<",";
- log<<invpar->barcode();
- if(do_simul_state[invpar->barcode()]<=0) log<<"-";
- else log<<"+";
- sep=true;
- }
- }
- }
- log<<"->"<<par->barcode();
- if(outver) {
- log<<"->";
- bool sep=false;
- for(HepMC::GenVertex::particles_out_const_iterator pout=outver->particles_out_const_begin();pout!=outver->particles_out_const_end();++pout) {
- const HepMC::GenParticle* outpar=*pout;
- if(outpar) {
- if(sep) log<<",";
- log<<outpar->barcode();
- if(do_simul_state[outpar->barcode()]<=0) log<<"-";
- else log<<"+";
- sep=true;
- }
- }
- }
- log<<endmsg;
- }
- }
-
- log << MSG::VERBOSE <<"print_MC_info: end"<< endmsg;
- }
-*/
void FastShowerCellBuilderTool::MC_remove_out_of_ID(MCdo_simul_state& do_simul_state,const MCparticleCollection& particles) const
{
@@ -2384,13 +2316,11 @@ FastShowerCellBuilderTool::process (CaloCellContainer* theCellContainer,
for(unsigned int i=0;i<m_invisibles.size();++i) {
if(abs(par->pdg_id())==m_invisibles[i]) {
do_simul_state[par->barcode()]=invisibleArray;
- //log << MSG::DEBUG <<"INVISIBLE by ARRAY: id="<<par->pdg_id()<<" stat="<<par->status()<<" bc="<<par->barcode()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<endmsg;
break;
}
if(m_invisibles[i]==0) {
if(MC::isNonInteracting(par)) {
do_simul_state[par->barcode()]=invisibleTruthHelper;
- //log << MSG::DEBUG <<"INVISIBLE by TruthHelper: id="<<par->pdg_id()<<" stat="<<par->status()<<" bc="<<par->barcode()<<" pt="<<par->momentum().perp()<<" eta="<<par->momentum().eta()<<" phi="<<par->momentum().phi()<<endmsg;
break;
}
}