Commit 19b8ce18 authored by Jochen Meyer's avatar Jochen Meyer Committed by Graeme Stewart
Browse files

msg svc updates (MuonTruthAlgs-02-12-14)

	* endreq -> endmsg
	* Tagging as MuonTruthAlgs-02-12-14
parent bfea7ce2
......@@ -171,7 +171,7 @@ StatusCode DetailedMuonPatternTruthBuilder::initialize() {
ATH_MSG_INFO("Retrieved TruthTrajectory building tool " << m_truthTrajBuilder);
}
if (m_idHelperTool.retrieve().isFailure()) {
msg(MSG::FATAL) << "Could not get " << m_idHelperTool.type() << endreq;
msg(MSG::FATAL) << "Could not get " << m_idHelperTool.type() << endmsg;
return StatusCode::FAILURE;
}
if(!detStore()->retrieve(m_idHelper, "AtlasID").isSuccess()) {
......@@ -180,11 +180,11 @@ StatusCode DetailedMuonPatternTruthBuilder::initialize() {
}
if (m_mdtCreator.retrieve().isFailure()) {
msg(MSG::FATAL) << "Could not get " << m_mdtCreator.type() << endreq;
msg(MSG::FATAL) << "Could not get " << m_mdtCreator.type() << endmsg;
return StatusCode::FAILURE;
}
if (m_muonClusterCreator.retrieve().isFailure()) {
msg(MSG::FATAL) << "Could not get " << m_muonClusterCreator.type() << endreq;
msg(MSG::FATAL) << "Could not get " << m_muonClusterCreator.type() << endmsg;
return StatusCode::FAILURE;
}
......@@ -249,7 +249,7 @@ buildDetailedMuonPatternTruth(DetailedMuonPatternTruthCollection *output,
// TODO: Reinsert the following code once I understand the compile-time error
// msg(interesting ? MSG::DEBUG : MSG::VERBOSE)
// <<"out: trk="<<i->first.index()<<" => "<<i->second<<endreq;
// <<"out: trk="<<i->first.index()<<" => "<<i->second<<endmsg;
if(interesting) {
const TruthTrajectory& t = i->second.trajectory();
......@@ -257,7 +257,7 @@ buildDetailedMuonPatternTruth(DetailedMuonPatternTruthCollection *output,
for(unsigned k=0; k<t.size(); ++k) {
msg(MSG::VERBOSE)<<*t[k]<<"\n";
}
msg(MSG::VERBOSE)<<"\n"<<endreq;
msg(MSG::VERBOSE)<<"\n"<<endmsg;
}
}
}
......@@ -318,7 +318,7 @@ buildDetailedTrackTruth(std::vector<DetailedTrackTruth> *output,
// TODO: Reinsert the following code once I understand the compile-time error
// msg(interesting ? MSG::DEBUG : MSG::VERBOSE)
// <<"out: trk="<<i->first.index()<<" => "<<i->second<<endreq;
// <<"out: trk="<<i->first.index()<<" => "<<i->second<<endmsg;
if(interesting) {
const TruthTrajectory& t = i.trajectory();
......@@ -326,7 +326,7 @@ buildDetailedTrackTruth(std::vector<DetailedTrackTruth> *output,
for(unsigned k=0; k<t.size(); ++k) {
msg(MSG::VERBOSE)<<*t[k]<<"\n";
}
msg(MSG::VERBOSE)<<"\n"<<endreq;
msg(MSG::VERBOSE)<<"\n"<<endmsg;
}
}
......@@ -431,7 +431,7 @@ void DetailedMuonPatternTruthBuilder::addTrack(DetailedMuonPatternTruthCollectio
for(std::map<HepMcParticleLink,SubDetPRDs>::const_iterator i=pairStat.begin(); i!=pairStat.end(); i++) {
msg(MSG::VERBOSE)<<i->first<<",";
}
msg(MSG::VERBOSE)<<endreq;
msg(MSG::VERBOSE)<<endmsg;
}
//----------------------------------------------------------------
......@@ -928,7 +928,7 @@ void DetailedMuonPatternTruthBuilder::addDetailedTrackTruth(std::vector<Detailed
for(std::map<HepMcParticleLink,SubDetPRDs>::const_iterator i=pairStat.begin(); i!=pairStat.end(); i++) {
msg(MSG::VERBOSE)<<i->first<<",";
}
msg(MSG::VERBOSE)<<endreq;
msg(MSG::VERBOSE)<<endmsg;
}
//----------------------------------------------------------------
......@@ -1099,7 +1099,7 @@ buildDetailedTrackTruthFromSegments(std::vector<DetailedSegmentTruth> *output,
// TODO: Reinsert the following code once I understand the compile-time error
// msg(interesting ? MSG::DEBUG : MSG::VERBOSE)
// <<"out: trk="<<i->first.index()<<" => "<<i->second<<endreq;
// <<"out: trk="<<i->first.index()<<" => "<<i->second<<endmsg;
if(interesting) {
const TruthTrajectory& t = i.trajectory();
......@@ -1107,7 +1107,7 @@ buildDetailedTrackTruthFromSegments(std::vector<DetailedSegmentTruth> *output,
for(unsigned k=0; k<t.size(); ++k) {
msg(MSG::VERBOSE)<<*t[k]<<"\n";
}
msg(MSG::VERBOSE)<<"\n"<<endreq;
msg(MSG::VERBOSE)<<"\n"<<endmsg;
}
}
......@@ -1177,7 +1177,7 @@ void DetailedMuonPatternTruthBuilder::addDetailedTrackTruthFromSegment(std::vect
for(std::map<HepMcParticleLink,SubDetPRDs>::const_iterator i=pairStat.begin(); i!=pairStat.end(); i++) {
msg(MSG::VERBOSE)<<i->first<<",";
}
msg(MSG::VERBOSE)<<endreq;
msg(MSG::VERBOSE)<<endmsg;
}
//----------------------------------------------------------------
......
......@@ -78,7 +78,7 @@ namespace Muon {
if( par.production_vertex() ) msg(MSG::DEBUG) << " vertices prod: r " << par.production_vertex()->point3d().perp()
<< " z " << par.production_vertex()->point3d().z();
if( par.end_vertex() ) msg(MSG::DEBUG) << " end: r " << par.end_vertex()->point3d().perp() << " z " << par.end_vertex()->point3d().z();
msg(MSG::DEBUG) << endreq;
msg(MSG::DEBUG) << endmsg;
}
}
}
......@@ -90,13 +90,13 @@ namespace Muon {
{
const HepMC::GenParticle *mother(0), *daughter(0);
if( vtx && msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << " new vertex: nparticles in " << vtx->particles_in_size() << endreq;
if( vtx && msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << " new vertex: nparticles in " << vtx->particles_in_size() << endmsg;
// only truth vertices with 1 incoming particle
if(vtx && (vtx->particles_in_size() == 1)) {
mother = *vtx->particles_in_const_begin();
if( mother && msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << " new mother: " << mother->pdg_id() << " status " << mother->status() << " particles out " << vtx->particles_out_size() << endreq;
if( mother && msgLvl(MSG::DEBUG) ) msg(MSG::DEBUG) << " new mother: " << mother->pdg_id() << " status " << mother->status() << " particles out " << vtx->particles_out_size() << endmsg;
// Allow status code 1 and 2. E.g. a pion that produced a long track can decay outside of InDet and have status==2.
if( mother && (mother->status() < 3) ) {
unsigned int nDecayMuons = 0;
......@@ -112,7 +112,7 @@ namespace Muon {
if( par.production_vertex() ) msg(MSG::DEBUG) << " vertices prod: r " << par.production_vertex()->point3d().perp()
<< " z " << par.production_vertex()->point3d().z();
if( par.end_vertex() ) msg(MSG::DEBUG) << " end: r " << par.end_vertex()->point3d().perp() << " z " << par.end_vertex()->point3d().z();
msg(MSG::DEBUG) << endreq;
msg(MSG::DEBUG) << endmsg;
}
if(candidate->pdg_id() == mother->pdg_id()) {
......@@ -130,7 +130,7 @@ namespace Muon {
++nDecayMuons;
passed_cuts = candidate;
} else { // temp addition for debugging
msg(MSG::DEBUG) << " Neither muon nor identical pdgId " << endreq;
msg(MSG::DEBUG) << " Neither muon nor identical pdgId " << endmsg;
passed_cuts = candidate;
}
}
......
......@@ -69,7 +69,7 @@ StatusCode MuonDetailedTrackTruthMaker::initialize()
for(std::vector<std::string>::const_iterator ikey = m_trackCollectionNames.begin(); ikey != m_trackCollectionNames.end(); ikey++,++ikeyt) {
msg(MSG::INFO) << " " << *ikey << " " << *ikeyt;
}
msg(MSG::INFO) << endreq;
msg(MSG::INFO) << endmsg;
//----------------
return StatusCode::SUCCESS;
......
......@@ -76,7 +76,7 @@ namespace Muon {
for( auto pdg : m_pdgsToBeConsidered.value() ) m_selectedPdgs.insert(pdg);
msg(MSG::DEBUG) << " PDG codes used for matching";
for( auto val : m_selectedPdgs ) msg(MSG::DEBUG) << " " << val;
msg(MSG::DEBUG) << endreq;
msg(MSG::DEBUG) << endmsg;
}
return StatusCode::SUCCESS;
}
......@@ -222,7 +222,7 @@ namespace Muon {
msg(MSG::VERBOSE) << " vertex: r " << truthTrajectory->front()->production_vertex()->point3d().perp()
<< " z " << truthTrajectory->front()->production_vertex()->point3d().z();
}
msg(MSG::VERBOSE) << endreq;
msg(MSG::VERBOSE) << endmsg;
}
// now collect all barcodes beloning to this TruthTrajectory
......@@ -237,7 +237,7 @@ namespace Muon {
if( (*pit)->production_vertex() ) msg(MSG::VERBOSE) << " vertex: r " << (*pit)->production_vertex()->point3d().perp()
<< " z " << (*pit)->production_vertex()->point3d().z();
msg(MSG::VERBOSE) << endreq;
msg(MSG::VERBOSE) << endmsg;
// sanity check
if( m_barcodeMap.count(code) ) ATH_MSG_VERBOSE(" pre-existing barcode " << code);
}
......@@ -305,7 +305,7 @@ namespace Muon {
if( m_doSummary || msgLvl(MSG::DEBUG) ){
msg(MSG::INFO) << " summarizing truth tree: number of particles " << m_truthTree.size() << endreq;
msg(MSG::INFO) << " summarizing truth tree: number of particles " << m_truthTree.size() << endmsg;
TruthTreeIt it = m_truthTree.begin();
TruthTreeIt it_end = m_truthTree.end();
for( ;it!=it_end;++it ){
......@@ -322,7 +322,7 @@ namespace Muon {
if( !it->second.mmHits.empty() ) msg(MSG::INFO) << " mm " << it->second.mmHits.size();
if( it->second.mdtHits.empty() && it->second.rpcHits.empty() && it->second.tgcHits.empty() &&
it->second.cscHits.empty() && it->second.stgcHits.empty() && it->second.mmHits.empty() ) msg(MSG::INFO) <<" no hits ";
msg(MSG::INFO) << endreq;
msg(MSG::INFO) << endmsg;
}
}
......@@ -412,7 +412,7 @@ namespace Muon {
if( msgLvl(MSG::VERBOSE) ){
msg(MSG::VERBOSE) << MSG::VERBOSE << " adding hit " << m_idHelperTool->toString(id) << " barcode " << barcode;
if( barcode != barcodeIn ) msg(MSG::VERBOSE) << " hit barcode " << barcodeIn;
msg(MSG::VERBOSE) << endreq;
msg(MSG::VERBOSE) << endmsg;
}
}
}
......@@ -458,7 +458,7 @@ namespace Muon {
if( msgLvl(MSG::VERBOSE) ){
msg(MSG::VERBOSE) << " adding hit " << m_idHelperTool->toString(id) << " barcode " << barcode;
if( barcode != barcodeIn ) msg(MSG::VERBOSE) << " hit barcode " << barcodeIn;
msg(MSG::VERBOSE) << endreq;
msg(MSG::VERBOSE) << endmsg;
}
eit->second.cscHits.insert(*it);
}
......
......@@ -664,7 +664,7 @@ namespace Muon {
}
}
if( nphiLayers > 0 ){
msg(MSG::VERBOSE) << endreq << " Phi chambers ";
msg(MSG::VERBOSE) << endmsg << " Phi chambers ";
for( int index = 0; index < static_cast<int>(nphiHitsPerChamberLayer.size()) ; ++index ) {
if( nphiHitsPerChamberLayer[index] > 0 ) msg(MSG::VERBOSE) << " " << Muon::MuonStationIndex::phiName(static_cast<Muon::MuonStationIndex::PhiIndex>(index))
<< " hits " << nphiHitsPerChamberLayer[index];
......@@ -672,13 +672,13 @@ namespace Muon {
}
if( ntrigEtaLayers > 0 ){
msg(MSG::VERBOSE) << endreq << " Trigger Eta ";
msg(MSG::VERBOSE) << endmsg << " Trigger Eta ";
for( int index = 0; index < static_cast<int>(ntrigEtaHitsPerChamberLayer.size()) ; ++index ) {
if( ntrigEtaHitsPerChamberLayer[index] > 0 ) msg(MSG::VERBOSE) << " " << Muon::MuonStationIndex::phiName(static_cast<Muon::MuonStationIndex::PhiIndex>(index))
<< " hits " << ntrigEtaHitsPerChamberLayer[index];
}
}
msg(MSG::VERBOSE) << endreq;
msg(MSG::VERBOSE) << endmsg;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment