Commit 2bf86d6b authored by Jochen Meyer's avatar Jochen Meyer Committed by Graeme Stewart
Browse files

msg svc updates (MuonAlignGenTools-02-07-10)

	* endreq -> endmsg
	* Tagging as MuonAlignGenTools-02-07-10


Former-commit-id: bfea7ce2
parent ff2333da
......@@ -88,40 +88,40 @@ CommonGeometryManagerTool::~CommonGeometryManagerTool()
//_______________________________________________________________________
StatusCode CommonGeometryManagerTool::initialize()
{
msg(MSG::DEBUG) << "initialize() of CommonGeometryManagerTool" << endreq;
msg(MSG::DEBUG) << "initialize() of CommonGeometryManagerTool" << endmsg;
StatusCode sc=detStore()->retrieve(p_muonMgr);
if (sc.isFailure()) {
msg(MSG::FATAL)<<"Cannot retrieve MuonDetectorManager"<<endreq;
msg(MSG::FATAL)<<"Cannot retrieve MuonDetectorManager"<<endmsg;
return sc;
}
else msg(MSG::DEBUG)<<"retrieved MuonDetectorManager"<<endreq;
else msg(MSG::DEBUG)<<"retrieved MuonDetectorManager"<<endmsg;
if (m_idTool.retrieve().isSuccess())
msg(MSG::INFO) << "Retrieved " << m_idTool << endreq;
msg(MSG::INFO) << "Retrieved " << m_idTool << endmsg;
else{
msg(MSG::FATAL)<<"Could not get " << m_idTool <<endreq;
msg(MSG::FATAL)<<"Could not get " << m_idTool <<endmsg;
return StatusCode::FAILURE;
}
sc=service("RegionSelectionSvc", m_regionSvc);
if(!sc.isSuccess())
{
msg(MSG::FATAL) << "Could not get RegionSelectionSvc!" << endreq;
msg(MSG::FATAL) << "Could not get RegionSelectionSvc!" << endmsg;
return sc;
}
if (m_doModuleSelection){
msg(MSG::INFO) << "Region selection string: "
<< m_regionSvc->GetRegionSelection() << endreq;
<< m_regionSvc->GetRegionSelection() << endmsg;
}
// Print moduleSelection
if(m_doModuleSelection && m_moduleSelection.size()>0){
msg(MSG::INFO) << "The following modules will be selected (nModules="
<< m_moduleSelection.size() << "): " << endreq;
<< m_moduleSelection.size() << "): " << endmsg;
for(int i=0;i<(int)m_moduleSelection.size();i++){
msg(MSG::INFO) << " module: " << m_moduleSelection[i] << endreq;
msg(MSG::INFO) << " module: " << m_moduleSelection[i] << endmsg;
}
}
......@@ -131,7 +131,7 @@ StatusCode CommonGeometryManagerTool::initialize()
//________________________________________________________________________
StatusCode CommonGeometryManagerTool::finalize()
{
msg(MSG::DEBUG) << "finalize() of CommonGeometryManagerTool" << endreq;
msg(MSG::DEBUG) << "finalize() of CommonGeometryManagerTool" << endmsg;
return StatusCode::SUCCESS;
}
......
......@@ -81,7 +81,7 @@ CscGeometryManagerTool::~CscGeometryManagerTool()
//_______________________________________________________________________
StatusCode CscGeometryManagerTool::initialize()
{
msg(MSG::DEBUG) << "initialize() of CscGeometryManagerTool" << endreq;
msg(MSG::DEBUG) << "initialize() of CscGeometryManagerTool" << endmsg;
if (!CommonGeometryManagerTool::initialize().isSuccess()) {
ATH_MSG_FATAL("CommonGeometryManagerTool not initialized");
......@@ -94,7 +94,7 @@ StatusCode CscGeometryManagerTool::initialize()
//________________________________________________________________________
StatusCode CscGeometryManagerTool::finalize()
{
msg(MSG::DEBUG) << "finalize() of CscGeometryManagerTool" << endreq;
msg(MSG::DEBUG) << "finalize() of CscGeometryManagerTool" << endmsg;
if (!CommonGeometryManagerTool::finalize().isSuccess()) {
ATH_MSG_FATAL("CommonGeometryManagerTool finalize not successful");
......
......@@ -79,7 +79,7 @@ MdtGeometryManagerTool::~MdtGeometryManagerTool()
//_______________________________________________________________________
StatusCode MdtGeometryManagerTool::initialize()
{
msg(MSG::DEBUG) << "initialize() of MdtGeometryManagerTool" << endreq;
msg(MSG::DEBUG) << "initialize() of MdtGeometryManagerTool" << endmsg;
if (!CommonGeometryManagerTool::initialize().isSuccess()) {
ATH_MSG_FATAL("CommonGeometryManagerTool not initialized");
......@@ -92,7 +92,7 @@ StatusCode MdtGeometryManagerTool::initialize()
//________________________________________________________________________
StatusCode MdtGeometryManagerTool::finalize()
{
msg(MSG::DEBUG) << "finalize() of MdtGeometryManagerTool" << endreq;
msg(MSG::DEBUG) << "finalize() of MdtGeometryManagerTool" << endmsg;
if (!CommonGeometryManagerTool::finalize().isSuccess()) {
ATH_MSG_FATAL("CommonGeometryManagerTool finalize not successful");
......@@ -586,7 +586,7 @@ void MdtGeometryManagerTool::buildL23()
mod->setGlobalFrameToAlignFrameTransform(gf2af);
ATH_MSG_DEBUG("setting globalFrameToAlignFrame: "<<endreq
ATH_MSG_DEBUG("setting globalFrameToAlignFrame: "<<endmsg
<< gf2af[0][0]<<" "<< gf2af[0][1]<<" "<< gf2af[0][2]
<<" "<<gf2af[1][0]<<" "<< gf2af[1][1]<<" "<< gf2af[1][2]
<<" "<<gf2af[2][0]<<" "<< gf2af[2][1]<<" "<< gf2af[2][2]<<" ");
......
......@@ -54,7 +54,7 @@ namespace Muon {
//_______________________________________________________________________
StatusCode MuonAlignModuleTool::initialize()
{
msg(MSG::DEBUG) << "initialize() of MuonAlignModuleTool" << endreq;
msg(MSG::DEBUG) << "initialize() of MuonAlignModuleTool" << endmsg;
StatusCode sc = AlignModuleTool::initialize();
if (sc.isFailure()) {
......@@ -64,10 +64,10 @@ namespace Muon {
sc=detStore()->retrieve(p_muonMgr);
if (sc.isFailure()) {
msg(MSG::FATAL)<<"Cannot retrieve MuonDetectorManager"<<endreq;
msg(MSG::FATAL)<<"Cannot retrieve MuonDetectorManager"<<endmsg;
return sc;
}
else msg(MSG::DEBUG)<<"retrieved MuonDetectorManager"<<endreq;
else msg(MSG::DEBUG)<<"retrieved MuonDetectorManager"<<endmsg;
return StatusCode::SUCCESS;
}
......
......@@ -545,8 +545,8 @@ namespace Muon {
track.fitQuality()->clone());
ATH_MSG_DEBUG("created newTrack:");
ATH_MSG_DEBUG(m_printer->print(*newTrack)<<endreq<<
m_printer->printStations(*newTrack)<<endreq);//<<
ATH_MSG_DEBUG(m_printer->print(*newTrack)<<endmsg<<
m_printer->printStations(*newTrack)<<endmsg);//<<
return newTrack;
}
......
......@@ -1616,7 +1616,7 @@ namespace Muon {
muon = *part;
}
else{
ATH_MSG_DEBUG("More than one generated muon found." << endreq
ATH_MSG_DEBUG("More than one generated muon found." << endmsg
<< "Generated truth info will not be filled.");
muon = 0;
break;
......@@ -1646,7 +1646,7 @@ namespace Muon {
(*trackRecord)->GetEnergy());
m_truth_pt_msentrance = vec.perp();
}else{
ATH_MSG_DEBUG("More than one entry in trackRecordCollection found."<< endreq
ATH_MSG_DEBUG("More than one entry in trackRecordCollection found."<< endmsg
<< "Truth info at MS entrance will not be filled.");
}
}
......
......@@ -507,7 +507,7 @@ namespace Muon {
int itrack(0);
for ( ; it != it_end ; ++it,itrack++) {
ATH_MSG_DEBUG(endreq<<"track "<<itrack<<"/"<<tracks->size());
ATH_MSG_DEBUG("\ntrack "<<itrack<<"/"<<tracks->size());
const Trk::Track* origTrack=*it;
const Trk::Track* track=0;
......@@ -547,8 +547,8 @@ namespace Muon {
m_nProcessed++;
ATH_MSG_DEBUG("before removing hits: ");
ATH_MSG_DEBUG(m_printer->print(*origTrack)<<endreq<<
m_printer->printStations(*origTrack)<<endreq<<
ATH_MSG_DEBUG(m_printer->print(*origTrack)<<"\n"<<
m_printer->printStations(*origTrack)<<"\n"<<
m_printer->printMeasurements(*origTrack));
/*
......@@ -573,8 +573,8 @@ namespace Muon {
// refit track
const Trk::Track* oldTrack=track;
ATH_MSG_DEBUG("before calling refitForAlignment: ");
ATH_MSG_DEBUG(m_printer->print(*oldTrack)<<endreq<<
m_printer->printStations(*oldTrack)<<endreq<<
ATH_MSG_DEBUG(m_printer->print(*oldTrack)<<"\n"<<
m_printer->printStations(*oldTrack)<<"\n"<<
m_printer->printMeasurements(*oldTrack));
ATH_MSG_DEBUG("calling refitForAlignment");
......@@ -695,8 +695,8 @@ namespace Muon {
}
ATH_MSG_DEBUG("after refit and passing final selection: ");
ATH_MSG_DEBUG(m_printer->print(*alignTrack)<<endreq<<
m_printer->printStations(*alignTrack)<<endreq<<
ATH_MSG_DEBUG(m_printer->print(*alignTrack)<<"\n"<<
m_printer->printStations(*alignTrack)<<"\n"<<
m_printer->printMeasurements(*alignTrack));
......@@ -1405,8 +1405,8 @@ namespace Muon {
//}
ATH_MSG_DEBUG("created newTrack:");
ATH_MSG_DEBUG(m_printer->print(*newTrack)<<endreq<<
m_printer->printStations(*newTrack)<<endreq);//<<
ATH_MSG_DEBUG(m_printer->print(*newTrack)<<"\n"<<
m_printer->printStations(*newTrack)<<"\n");//<<
return newTrack;
}
......@@ -1546,7 +1546,7 @@ namespace Muon {
DataVector<const Trk::TrackStateOnSurface>::const_iterator iTsos=TSOS->begin();
for (; iTsos!=TSOS->end(); ++iTsos,itsos++) {
ATH_MSG_VERBOSE(endreq<<"TSOS: "<<itsos<<endreq<<**iTsos);
ATH_MSG_VERBOSE("\nTSOS: "<<itsos<<"\n"<<**iTsos);
if (!(*iTsos)->type(Trk::TrackStateOnSurface::Scatterer) &&
!(*iTsos)->type(Trk::TrackStateOnSurface::InertMaterial)) continue;
......@@ -1575,8 +1575,8 @@ namespace Muon {
const Trk::MaterialEffectsBase* meb = (**iTsos).materialEffectsOnTrack();
if (!meb) { ATH_MSG_DEBUG("no meb"); continue; }
ATH_MSG_DEBUG("Surface: "<<endreq<<meb->associatedSurface());
ATH_MSG_DEBUG("Surface ID: "<<endreq<<meb->associatedSurface().associatedDetectorElementIdentifier());
ATH_MSG_DEBUG("Surface: \n" << meb->associatedSurface());
ATH_MSG_DEBUG("Surface ID:\n" << meb->associatedSurface().associatedDetectorElementIdentifier());
const Trk::TrkDetElementBase* detelement=meb->associatedSurface().associatedDetectorElement();
if (!detelement) { ATH_MSG_DEBUG("no detelement"); continue; }
......@@ -2006,7 +2006,7 @@ namespace Muon {
itTsos!=track->trackStateOnSurfaces()->end(); ++itTsos,itsos++) {
// scattering residual(s) and/or energy loss first
ATH_MSG_DEBUG(endreq<<"tsos: "<<itsos);
ATH_MSG_DEBUG("\ntsos: "<<itsos);
const Trk::TrackStateOnSurface* tsos = *itTsos;
const Trk::TrackParameters * tparp = tsos->trackParameters();
......
......@@ -81,7 +81,7 @@ TgcGeometryManagerTool::~TgcGeometryManagerTool()
//_______________________________________________________________________
StatusCode TgcGeometryManagerTool::initialize()
{
msg(MSG::DEBUG) << "initialize() of TgcGeometryManagerTool" << endreq;
msg(MSG::DEBUG) << "initialize() of TgcGeometryManagerTool" << endmsg;
if (!CommonGeometryManagerTool::initialize().isSuccess()) {
ATH_MSG_FATAL("CommonGeometryManagerTool not initialized");
......@@ -94,7 +94,7 @@ StatusCode TgcGeometryManagerTool::initialize()
//________________________________________________________________________
StatusCode TgcGeometryManagerTool::finalize()
{
msg(MSG::DEBUG) << "finalize() of TgcGeometryManagerTool" << endreq;
msg(MSG::DEBUG) << "finalize() of TgcGeometryManagerTool" << endmsg;
if (!CommonGeometryManagerTool::finalize().isSuccess()) {
ATH_MSG_FATAL("CommonGeometryManagerTool finalize not successful");
......@@ -572,7 +572,7 @@ void TgcGeometryManagerTool::buildL23()
Amg::Transform3D gf2af=mdtTransform.inverse();
mod->setGlobalFrameToAlignFrameTransform(gf2af);
ATH_MSG_DEBUG("setting globalFrameToAlignFrame: "<<endreq
ATH_MSG_DEBUG("setting globalFrameToAlignFrame: "<<endmsg
<< gf2af[0][0]<<" "<< gf2af[0][1]<<" "<< gf2af[0][2]
<<" "<<gf2af[1][0]<<" "<< gf2af[1][1]<<" "<< gf2af[1][2]
<<" "<<gf2af[2][0]<<" "<< gf2af[2][1]<<" "<< gf2af[2][2]<<" ");
......
......@@ -947,8 +947,8 @@ namespace Muon {
double qOverP=m_charge/(m_momentum*1000.);
ATH_MSG_DEBUG("before calling prepareTrack: ");
ATH_MSG_DEBUG(m_printer->print(*bestTrack)<<endreq<<
m_printer->printStations(*bestTrack)<<endreq<<
ATH_MSG_DEBUG(m_printer->print(*bestTrack)<<endmsg<<
m_printer->printStations(*bestTrack)<<endmsg<<
m_printer->printMeasurements(*bestTrack));
const Trk::Track* goodTrack=prepareTrack(*bestTrack,qOverP);
......@@ -2161,7 +2161,7 @@ namespace Muon {
/*
ATH_MSG_VERBOSE(trackType<<" track, isFree: "
<<segSurface.isFree()<<", segSurface: "<<endreq<<segSurface);
<<segSurface.isFree()<<", segSurface: "<<endmsg<<segSurface);
//ATH_MSG_DEBUG(trackType<< " track, normal cross normal: "<<segSurface.normal().cross(detSurf.normal()).mag());
//ATH_MSG_DEBUG(trackType<<" track, angle: "
......@@ -2296,8 +2296,8 @@ namespace Muon {
//ATH_MSG_DEBUG("before redoing CROTs: ");
ATH_MSG_DEBUG("before recalibrating hits: ");
ATH_MSG_DEBUG(m_printer->print(*newTrack)<<endreq<<
m_printer->printStations(*newTrack)<<endreq<<
ATH_MSG_DEBUG(m_printer->print(*newTrack)<<endmsg<<
m_printer->printStations(*newTrack)<<endmsg<<
m_printer->printMeasurements(*newTrack));
const Trk::Track* oldTrack=newTrack;
......@@ -2312,8 +2312,8 @@ namespace Muon {
//ATH_MSG_DEBUG("after redoing CROTs: ");
ATH_MSG_DEBUG("after recalibrating hits: ");
ATH_MSG_DEBUG(m_printer->print(*newTrack)<<endreq<<
m_printer->printStations(*newTrack)<<endreq<<
ATH_MSG_DEBUG(m_printer->print(*newTrack)<<endmsg<<
m_printer->printStations(*newTrack)<<endmsg<<
m_printer->printMeasurements(*newTrack));
if (refitPT) {
......@@ -2970,8 +2970,8 @@ namespace Muon {
const Trk::Track* track=*trackIt;
ATH_MSG_DEBUG("in findBestTrack: track "<<itrack<<"/"<<tracks->size());
ATH_MSG_DEBUG(m_printer->print(*track)<<endreq<<
m_printer->printStations(*track)<<endreq<<
ATH_MSG_DEBUG(m_printer->print(*track)<<endmsg<<
m_printer->printStations(*track)<<endmsg<<
m_printer->printMeasurements(*track));
//double muonEta=track->perigeeParameters()->eta();
......
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