diff --git a/LArCalorimeter/LArMonTools/src/LArAffectedRegions.cxx b/LArCalorimeter/LArMonTools/src/LArAffectedRegions.cxx
index dc91668763b19fb097b536e7145f892df710e3d3..097a0e57ac025b7c5b77628b3dd3c906f34be28e 100644
--- a/LArCalorimeter/LArMonTools/src/LArAffectedRegions.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArAffectedRegions.cxx
@@ -91,11 +91,11 @@ LArAffectedRegions::~LArAffectedRegions()
StatusCode
LArAffectedRegions::initialize()
{
- msg(MSG::INFO) << "Initialize LArAffectedRegions" << endmsg;
+ ATH_MSG_INFO( "Initialize LArAffectedRegions" );
// End Initialize
ManagedMonitorToolBase::initialize().ignore();
- if ( msg().level() <= MSG::DEBUG ) msg(MSG::DEBUG) << "Successful Initialize LArAffectedRegions " << endmsg;
+ ATH_MSG_DEBUG( "Successful Initialize LArAffectedRegions " );
return StatusCode::SUCCESS;
}
@@ -104,7 +104,7 @@ LArAffectedRegions::initialize()
StatusCode
LArAffectedRegions::bookHistograms()
{
- if ( msg().level() <= MSG::DEBUG ) msg(MSG::DEBUG) << "in bookHists()" << endmsg;
+ ATH_MSG_DEBUG( "in bookHists()" );
// if(isNewRun ){ // Commented by B.Trocme to comply with new ManagedMonitorToolBase
@@ -215,7 +215,7 @@ StatusCode
LArAffectedRegions::fillHistograms()
{
bool debug = msg().level() <= MSG::DEBUG ;
- if (debug) msg(MSG::DEBUG) << "in fillHists()" << endmsg;
+ if (debug) ATH_MSG_DEBUG( "in fillHists()" );
m_eventsCounter++;
@@ -226,7 +226,7 @@ LArAffectedRegions::fillHistograms()
const CaloAffectedRegionInfoVec* affRegVec=0;
StatusCode sc = detStore()->retrieve(affRegVec, "LArAffectedRegion");
if (sc.isFailure() || !affRegVec) {
- msg(MSG::WARNING) << " Cannot find LArAffectedRegion in DetectorStore " << endmsg;
+ ATH_MSG_WARNING( " Cannot find LArAffectedRegion in DetectorStore " );
return StatusCode::SUCCESS;
}
@@ -252,11 +252,11 @@ LArAffectedRegions::fillHistograms()
float etamax=region->get_eta_max();
if (debug){
- msg(MSG::DEBUG) << " Print list of affected regions:" << endmsg;
- msg(MSG::DEBUG) << region << " "
+ ATH_MSG_DEBUG( " Print list of affected regions:" );
+ ATH_MSG_DEBUG( region << " "
<< region->get_eta_min() << " " << region->get_eta_max() << " "
<< region->get_phi_min() << " " << region->get_phi_max() << " "
- << region->get_layer_min() << " " << region->get_layer_max() << " " << region->get_problem() << endmsg;
+ << region->get_layer_min() << " " << region->get_layer_max() << " " << region->get_problem() );
}
/////////////////////////////////
// Build Affected Regions maps //
@@ -282,15 +282,16 @@ LArAffectedRegions::fillHistograms()
while(phi<phimax){
if(eta>=0){
m_hLArAffectedRegionsEMBPS[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBAPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsEMBPS[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBCPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/32);
+ if(fabs(phi)<1.e-4) phi=0.;
}
// phimin > phimax
}else{
@@ -298,29 +299,31 @@ LArAffectedRegions::fillHistograms()
while(phi<TMath::Pi()){
if(eta>=0){
m_hLArAffectedRegionsEMBPS[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBAPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsEMBPS[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBCPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/32);
+ if(fabs(phi)<1.e-4) phi=0.;
}
phi = -TMath::Pi();
while(phi<phimax){
if(eta>=0){
m_hLArAffectedRegionsEMBPS[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBAPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsEMBPS[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBCPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/32);
+ if(fabs(phi)<1.e-4) phi=0.;
}
}
eta+=0.2;
@@ -337,15 +340,16 @@ LArAffectedRegions::fillHistograms()
while(phi<phimax){
if(eta >=0){
m_hLArAffectedRegionsEMB[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta <0){
m_hLArAffectedRegionsEMB[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/128);
+ if(fabs(phi)<1.e-4) phi=0.;
}
// phimin > phimax: go over Pi
}else{
@@ -353,29 +357,31 @@ LArAffectedRegions::fillHistograms()
while(phi<TMath::Pi()){
if(eta >=0){
m_hLArAffectedRegionsEMB[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta <0){
m_hLArAffectedRegionsEMB[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/128);
+ if(fabs(phi)<1.e-4) phi=0.;
}
phi = -TMath::Pi();
while(phi<phimax){
if(eta >=0){
m_hLArAffectedRegionsEMB[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta <0){
m_hLArAffectedRegionsEMB[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMBC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMBC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/128);
+ if(fabs(phi)<1.e-4) phi=0.;
}
}
eta+=0.2;
@@ -392,15 +398,16 @@ LArAffectedRegions::fillHistograms()
while(phi<phimax){
if(eta>=0){
m_hLArAffectedRegionsEMECPS[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECAPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsEMECPS[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECCPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/64);
+ if(fabs(phi)<1.e-4) phi=0.;
}
// phimin > phimax
}else{
@@ -408,29 +415,31 @@ LArAffectedRegions::fillHistograms()
while(phi<TMath::Pi()){
if(eta>=0){
m_hLArAffectedRegionsEMECPS[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECAPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsEMECPS[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECCPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/64);
+ if(fabs(phi)<1.e-4) phi=0.;
}
phi = -TMath::Pi();
while(phi<phimax){
if(eta>=0){
m_hLArAffectedRegionsEMECPS[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECAPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsEMECPS[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECCPS " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/64);
+ if(fabs(phi)<1.e-4) phi=0.;
}
}
if(fabs(eta)<2.5)eta+=0.2;
@@ -448,15 +457,16 @@ LArAffectedRegions::fillHistograms()
while(phi<phimax){
if(eta>=0){
m_hLArAffectedRegionsEMEC[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsEMEC[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/256);
+ if(fabs(phi)<1.e-4) phi=0.;
}
// phimin > phimax
}else{
@@ -464,29 +474,31 @@ LArAffectedRegions::fillHistograms()
while(phi<TMath::Pi()){
if(eta>=0){
m_hLArAffectedRegionsEMEC[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsEMEC[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/256);
+ if(fabs(phi)<1.e-4) phi=0.;
}
phi = -TMath::Pi()+0.01;
while(phi<phimax){
if(eta>=0){
m_hLArAffectedRegionsEMEC[0]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsEMEC[1]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "EMECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "EMECC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/256);
+ if(fabs(phi)<1.e-4) phi=0.;
}
}
if(fabs(eta)>=2.8) eta+=0.4;
@@ -504,15 +516,16 @@ LArAffectedRegions::fillHistograms()
while(phi<phimax){
if(eta>=0){
m_hLArAffectedRegionsHECA[layermin-8]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "HECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "HECA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsHECC[layermin-8]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "HECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "HECC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/32);
+ if(fabs(phi)<1.e-4) phi=0.;
}
// phimin < phimax
}else{
@@ -520,29 +533,31 @@ LArAffectedRegions::fillHistograms()
while(phi<TMath::Pi()){
if(eta>=0){
m_hLArAffectedRegionsHECA[layermin-8]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "HECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "HECA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsHECC[layermin-8]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "HECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "HECC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/32);
+ if(fabs(phi)<1.e-4) phi=0.;
}
phi = -TMath::Pi();
while(phi<phimax){
if(eta>=0){
m_hLArAffectedRegionsHECA[layermin-8]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "HECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "HECA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsHECC[layermin-8]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "HECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "HECC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/32);
+ if(fabs(phi)<1.e-4) phi=0.;
}
}
}
@@ -556,15 +571,16 @@ LArAffectedRegions::fillHistograms()
while(phi<phimax){
if(eta>=0){
m_hLArAffectedRegionsFCALA[layermin-21]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "FCALA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "FCALA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsFCALC[layermin-21]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "FCALC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "FCALC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/16);
+ if(fabs(phi)<1.e-4) phi=0.;
}
// phimin > phimax
}else{
@@ -572,29 +588,31 @@ LArAffectedRegions::fillHistograms()
while(phi<TMath::Pi()){
if(eta>=0){
m_hLArAffectedRegionsFCALA[layermin-21]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "FCALA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "FCALA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsFCALC[layermin-21]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "FCALC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "FCALC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/16);
+ if(fabs(phi)<1.e-4) phi=0.;
}
phi = -TMath::Pi()+0.1;
while(phi<phimax){
if(eta>=0){
m_hLArAffectedRegionsFCALA[layermin-21]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "FCALA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "FCALA " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
if(eta<0){
m_hLArAffectedRegionsFCALC[layermin-21]->Fill(eta,phi,problem);
- if (debug) msg(MSG::DEBUG) << "FCALC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endmsg;
+ if (debug) ATH_MSG_DEBUG( "FCALC " << eta << " " << phi << " " << problem << " "
+ << layermin << " " << layermax << " " << region );
}
phi+=(2*TMath::Pi()/16);
+ if(fabs(phi)<1.e-4) phi=0.;
}
}
}
@@ -607,7 +625,7 @@ LArAffectedRegions::fillHistograms()
StatusCode LArAffectedRegions::procHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In procHistograms " << endmsg;
+ ATH_MSG_DEBUG( "In procHistograms " );
return StatusCode::SUCCESS;
}
diff --git a/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx
index 2406b3bf8773f6e52dd1f957269afea471aa27d5..75a5ca3750203b13a73a2ceccacee96a39d61110 100755
--- a/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx
@@ -91,7 +91,7 @@ LArCollisionTimeMonTool::initialize() {
ManagedMonitorToolBase::initialize().ignore();
CHECK(m_bunchGroupTool.retrieve());
- msg(MSG::DEBUG) << "Successful Initialize LArCollisionTimeMonTool " << endmsg;
+ ATH_MSG_DEBUG( "Successful Initialize LArCollisionTimeMonTool " );
return StatusCode::SUCCESS;
}
@@ -220,7 +220,7 @@ LArCollisionTimeMonTool::bookHistograms() {
StatusCode
LArCollisionTimeMonTool::fillHistograms()
{
- msg(MSG::DEBUG) << "in fillHists()" << endmsg;
+ ATH_MSG_DEBUG( "in fillHists()" );
// Increment event counter
m_eventsCounter++;
@@ -231,7 +231,7 @@ LArCollisionTimeMonTool::fillHistograms()
unsigned lumi_block = 0;
//double event_time_minutes = -1;
if (evtStore()->retrieve( event_info ).isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve EventInfo object" << endmsg;
+ ATH_MSG_ERROR( "Failed to retrieve EventInfo object" );
return StatusCode::FAILURE;
}
@@ -242,8 +242,8 @@ LArCollisionTimeMonTool::fillHistograms()
lumi_block = event_info->lumiBlock();
if(m_bunchGroupTool->bcType(bunch_crossing_id) == Trig::IBunchCrossingTool::Empty) {
- //msg(MSG::INFO) <<"BCID: "<<bunch_crossing_id<<" empty, not filling CollTime" <<endmsg;
- msg(MSG::INFO) <<"BCID: "<<bunch_crossing_id<<" empty ? not filling the coll. time" <<endmsg;
+ //ATH_MSG_INFO("BCID: "<<bunch_crossing_id<<" empty, not filling CollTime" );
+ ATH_MSG_INFO("BCID: "<<bunch_crossing_id<<" empty ? not filling the coll. time" );
return StatusCode::SUCCESS; // not filling anything in empty bunches
}
@@ -253,10 +253,10 @@ LArCollisionTimeMonTool::fillHistograms()
const LArCollisionTime * larTime;
if(evtStore()->retrieve(larTime,m_key).isFailure())
{
- msg(MSG::WARNING) << "Unable to retrieve LArCollisionTime event store" << endmsg;
+ ATH_MSG_WARNING( "Unable to retrieve LArCollisionTime event store" );
return StatusCode::SUCCESS; // Check if failure shd be returned. VB
} else {
- msg(MSG::DEBUG) << "LArCollisionTime successfully retrieved from event store" << endmsg;
+ ATH_MSG_DEBUG( "LArCollisionTime successfully retrieved from event store" );
}
if (larTime and !(event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,3))) {// Do not fill histo if noise burst suspected
@@ -276,7 +276,7 @@ LArCollisionTimeMonTool::fillHistograms()
if ( fabs(m_ECTimeDiff) < 10 ) m_LArCollTime_lb_timeCut_h[0]->Fill(lumi_block);
if ( fabs(m_ECTimeDiff) > 20 && fabs(m_ECTimeDiff) < 30 ) m_LArCollTime_lb_singlebeam_timeCut_h[0]->Fill(lumi_block);
if(m_IsOnline && bcid_distance > m_distance) { // fill histos inside the train
- msg(MSG::INFO) <<"BCID: "<<bunch_crossing_id<<" distance from Front: "<<bcid_distance<<"Filling in train..."<<endmsg;
+ ATH_MSG_INFO("BCID: "<<bunch_crossing_id<<" distance from Front: "<<bcid_distance<<"Filling in train...");
m_LArCollTime_h[1]->Fill(m_ECTimeDiff,weight);
m_LArCollTime_lb_h[1]->Fill(m_ECTimeDiff,weight);
m_LArCollTime_vs_LB_h[1]->Fill(lumi_block, m_ECTimeDiff,weight);
@@ -302,7 +302,7 @@ StatusCode LArCollisionTimeMonTool::procHistograms()
for(unsigned i=0; i<m_nhist; ++i) m_LArCollTime_lb_h[i]->Reset();
}
- msg(MSG::DEBUG) << "End of procHistograms " << endmsg;
+ ATH_MSG_DEBUG( "End of procHistograms " );
return StatusCode::SUCCESS;
}
diff --git a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx
index aee3be14e8f2a0c684a710bccffc346e37f46cf6..41e1939eee4be53defe74e1cb4b5ae6c70c0fc92 100755
--- a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx
@@ -106,19 +106,19 @@ LArCosmicsMonTool::~LArCosmicsMonTool()
StatusCode
LArCosmicsMonTool::initialize()
{
- msg(MSG::INFO) << "Initialize LArCosmicsMonTool" << endmsg;
+ ATH_MSG_INFO( "Initialize LArCosmicsMonTool" );
StatusCode sc;
sc = detStore()->retrieve(m_LArOnlineIDHelper, "LArOnlineID");
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endmsg;
+ ATH_MSG_FATAL( "Could not get LArOnlineIDHelper" );
return sc;
}
// Retrieve ID helpers
sc = detStore()->retrieve( m_caloIdMgr );
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get CaloIdMgr" << endmsg;
+ ATH_MSG_FATAL( "Could not get CaloIdMgr" );
return sc;
}
m_LArEM_IDHelper = m_caloIdMgr->getEM_ID();
@@ -128,7 +128,7 @@ LArCosmicsMonTool::initialize()
// CaloDetDescrMgr gives "detector description", including real positions of cells
sc = detStore()->retrieve(m_CaloDetDescrMgr);
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get CaloDetDescrMgr "<< endmsg;
+ ATH_MSG_FATAL( "Could not get CaloDetDescrMgr ");
return sc;
}
@@ -136,19 +136,19 @@ LArCosmicsMonTool::initialize()
// Get LAr Cabling Service
sc=m_larCablingService.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve LArCablingService" << endmsg;
+ ATH_MSG_ERROR( "Could not retrieve LArCablingService" );
return StatusCode::FAILURE;
}
// initialize monitoring bookkeeping info
sc = this->initMonInfo();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not initialize monitoring bookkeeping info" << endmsg;
+ ATH_MSG_ERROR( "Could not initialize monitoring bookkeeping info" );
}
// End Initialize
ManagedMonitorToolBase::initialize().ignore();
- msg(MSG::DEBUG) << "Successful Initialize LArCosmicsMonTool " << endmsg;
+ ATH_MSG_DEBUG( "Successful Initialize LArCosmicsMonTool " );
return StatusCode::SUCCESS;
}
@@ -156,7 +156,7 @@ LArCosmicsMonTool::initialize()
StatusCode
LArCosmicsMonTool::bookHistograms() {
- msg(MSG::DEBUG) << "in bookHists()" << endmsg;
+ ATH_MSG_DEBUG( "in bookHists()" );
// if(isNewRun ){// Commented by B.Trocme to comply with new ManagedMonitorToolBase
m_newrun=true;
@@ -248,7 +248,7 @@ LArCosmicsMonTool::bookHistograms() {
/*---------------------------------------------------------*/
StatusCode
LArCosmicsMonTool::fillHistograms() {
- msg(MSG::DEBUG) << "in fillHists()" << endmsg;
+ ATH_MSG_DEBUG( "in fillHists()" );
StatusCode sc;
// Increment event counter
@@ -265,8 +265,8 @@ LArCosmicsMonTool::fillHistograms() {
const LArDigitContainer* pLArDigitContainer;
sc = evtStore()->retrieve(pLArDigitContainer, m_LArDigitContainerKey);
if (sc.isFailure()) {
- msg(MSG::WARNING) << "Can\'t retrieve LArDigitContainer with key "
- << m_LArDigitContainerKey << endmsg;
+ ATH_MSG_WARNING( "Can\'t retrieve LArDigitContainer with key "
+ << m_LArDigitContainerKey );
return StatusCode::SUCCESS;
}
@@ -274,7 +274,7 @@ LArCosmicsMonTool::fillHistograms() {
if(m_newrun) {
sc=detStore()->retrieve(m_larPedestal,m_larPedestalKey);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Cannot retrieve pedestal(s) from Conditions Store!" << endmsg;
+ ATH_MSG_ERROR( "Cannot retrieve pedestal(s) from Conditions Store!" );
}
m_newrun=false;
}
@@ -295,7 +295,7 @@ LArCosmicsMonTool::fillHistograms() {
float eta = 0; float phi = 0;
sc = returnEtaPhiCoord(offlineID, eta, phi);
if(sc.isFailure()) {
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates" << endmsg;
+ ATH_MSG_ERROR( "Cannot retrieve (eta,phi) coordinates" );
continue;
}
@@ -426,20 +426,20 @@ LArCosmicsMonTool::fillHistograms() {
StatusCode LArCosmicsMonTool::procHistograms()
{
- msg(MSG::DEBUG) << "End of procHistograms " << endmsg;
+ ATH_MSG_DEBUG( "End of procHistograms " );
return StatusCode::SUCCESS;
}
/*---------------------------------------------------------*/
StatusCode LArCosmicsMonTool::initMonInfo()
{
- msg(MSG::DEBUG) << "in initMonInfo()" << endmsg;
+ ATH_MSG_DEBUG( "in initMonInfo()" );
std::vector<CaloGain::CaloGain> gains;
gains.push_back(CaloGain::LARHIGHGAIN);
gains.push_back(CaloGain::LARMEDIUMGAIN);
gains.push_back(CaloGain::LARLOWGAIN);
- msg(MSG::DEBUG) << "Init Monitoring ended successfully " << endmsg;
+ ATH_MSG_DEBUG( "Init Monitoring ended successfully " );
return StatusCode::SUCCESS;
}
diff --git a/LArCalorimeter/LArMonTools/src/LArCoverage.cxx b/LArCalorimeter/LArMonTools/src/LArCoverage.cxx
index 9b3909996d7664872c4604dc97ede08e038176a0..3f04996a6b1e638565d01ccef1129a7273590f60 100755
--- a/LArCalorimeter/LArMonTools/src/LArCoverage.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArCoverage.cxx
@@ -109,19 +109,19 @@ LArCoverage::~LArCoverage()
StatusCode
LArCoverage::initialize()
{
- msg(MSG::INFO) << "Initialize LArCoverage" << endmsg;
+ ATH_MSG_INFO( "Initialize LArCoverage" );
StatusCode sc;
sc = detStore()->retrieve(m_LArOnlineIDHelper, "LArOnlineID");
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endmsg;
+ ATH_MSG_FATAL( "Could not get LArOnlineIDHelper" );
return sc;
}
// Retrieve ID helpers
sc = detStore()->retrieve( m_caloIdMgr );
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get CaloIdMgr" << endmsg;
+ ATH_MSG_FATAL( "Could not get CaloIdMgr" );
return sc;
}
m_LArEM_IDHelper = m_caloIdMgr->getEM_ID();
@@ -131,30 +131,30 @@ LArCoverage::initialize()
// CaloDetDescrMgr gives "detector description", including real positions of cells
sc = detStore()->retrieve(m_CaloDetDescrMgr);
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get CaloDetDescrMgr "<< endmsg;
+ ATH_MSG_FATAL( "Could not get CaloDetDescrMgr ");
return sc;
}
// Get BadChannelTool
sc=m_badChannelTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve LArBadChannelTool " << m_badChannelTool << endmsg;
+ ATH_MSG_ERROR( "Could not retrieve LArBadChannelTool " << m_badChannelTool );
return StatusCode::FAILURE;
} else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "LArBadChannelTool" << m_badChannelTool << " retrieved" << endmsg;
+ ATH_MSG_DEBUG( "LArBadChannelTool" << m_badChannelTool << " retrieved" );
}
// Get bad-channel mask
sc=m_badChannelMask.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve BadChannelMask" << m_badChannelMask<< endmsg;
+ ATH_MSG_ERROR( "Could not retrieve BadChannelMask" << m_badChannelMask);
return StatusCode::FAILURE;
}
// Get LAr Cabling Service
sc=m_larCablingService.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve LArCablingService" << endmsg;
+ ATH_MSG_ERROR( "Could not retrieve LArCablingService" );
return StatusCode::FAILURE;
}
@@ -164,15 +164,15 @@ LArCoverage::initialize()
// Get CaloNoiseTool
if ( m_caloNoiseTool.retrieve().isFailure() ) {
- msg(MSG::FATAL) << "Failed to retrieve tool " << m_caloNoiseTool << endmsg;
+ ATH_MSG_FATAL( "Failed to retrieve tool " << m_caloNoiseTool );
return StatusCode::FAILURE;
} else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved tool " << m_caloNoiseTool << endmsg;
+ ATH_MSG_DEBUG( "Retrieved tool " << m_caloNoiseTool );
}
// End Initialize
ManagedMonitorToolBase::initialize().ignore();
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Successful Initialize LArCoverage " << endmsg;
+ ATH_MSG_DEBUG( "Successful Initialize LArCoverage " );
return StatusCode::SUCCESS;
}
@@ -180,14 +180,14 @@ LArCoverage::initialize()
StatusCode
LArCoverage::bookHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in bookHists()" << endmsg;
+ ATH_MSG_DEBUG( "in bookHists()" );
// if(isNewRun ){// Commented by B.Trocme to comply with new ManagedMonitorToolBase
const xAOD::EventInfo* thisEventInfo;
uint32_t lb1 = 0;
if ((evtStore()->retrieve(thisEventInfo))!=StatusCode::SUCCESS)
- msg(MSG::WARNING) << "No EventInfo object found! Can't read run number!" << endmsg;
+ ATH_MSG_WARNING( "No EventInfo object found! Can't read run number!" );
else{
lb1 = thisEventInfo->lumiBlock();
}
@@ -601,7 +601,7 @@ LArCoverage::bookHistograms()
StatusCode
LArCoverage::fillHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in fillHists()" << endmsg;
+ ATH_MSG_DEBUG( "in fillHists()" );
m_eventsCounter++;
@@ -611,7 +611,7 @@ LArCoverage::fillHistograms()
const LArRawChannelContainer* pRawChannelsContainer;
StatusCode sc = evtStore()->retrieve(pRawChannelsContainer, m_channelKey);
if(sc.isFailure()) {
- msg(MSG::WARNING) << "Can\'t retrieve LArRawChannelContainer with key " << m_channelKey <<endmsg;
+ ATH_MSG_WARNING( "Can\'t retrieve LArRawChannelContainer with key " << m_channelKey );
return StatusCode::SUCCESS;
}
@@ -639,7 +639,7 @@ LArCoverage::fillHistograms()
float etaChan = 0; float phiChan = 0.;
const CaloDetDescrElement* caloDetElement = m_CaloDetDescrMgr->get_element(offlineID);
if(caloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
+ ATH_MSG_ERROR( "Cannot retrieve (eta,phi) coordinates for raw channels" );
continue;
}else{
etaChan = caloDetElement->eta_raw();
@@ -829,7 +829,7 @@ LArCoverage::fillHistograms()
StatusCode LArCoverage::procHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In procHistograms " << endmsg;
+ ATH_MSG_DEBUG( "In procHistograms " );
return StatusCode::SUCCESS;
@@ -911,7 +911,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
if(caloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
+ ATH_MSG_ERROR( "Cannot retrieve (eta,phi) coordinates for raw channels" );
continue;
}else{
eta = caloDetElement->eta_raw();
@@ -943,7 +943,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
if(caloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
+ ATH_MSG_ERROR( "Cannot retrieve (eta,phi) coordinates for raw channels" );
continue;
}else{
eta = caloDetElement->eta_raw();
@@ -980,7 +980,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
if(caloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
+ ATH_MSG_ERROR( "Cannot retrieve (eta,phi) coordinates for raw channels" );
continue;
}else{
eta = caloDetElement->eta_raw();
@@ -1012,7 +1012,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
if(caloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
+ ATH_MSG_ERROR( "Cannot retrieve (eta,phi) coordinates for raw channels" );
continue;
}else{
eta = caloDetElement->eta_raw();
@@ -1078,7 +1078,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
if(caloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
+ ATH_MSG_ERROR( "Cannot retrieve (eta,phi) coordinates for raw channels" );
continue;
}else{
eta = caloDetElement->eta_raw();
@@ -1110,7 +1110,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* caloDetDescrMg
float eta, phi;
const CaloDetDescrElement* caloDetElement = caloDetDescrMgr->get_element(offid);
if(caloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
+ ATH_MSG_ERROR( "Cannot retrieve (eta,phi) coordinates for raw channels" );
continue;
}else{
eta = caloDetElement->eta_raw();
diff --git a/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx b/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx
index 0af61548d232b51bba706ce250dcdf8b1b38e33a..cbc861c27f994fcb508544d140bdeead432ec071 100755
--- a/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx
@@ -126,7 +126,7 @@ LArDigitMon::~LArDigitMon()
StatusCode
LArDigitMon::finalize()
{
- msg(MSG::INFO)<<"Finalize LArDigitMon" << endmsg;
+ ATH_MSG_INFO("Finalize LArDigitMon" );
DeleteHist(m_BarrelA);
DeleteHist(m_BarrelC);
DeleteHist(m_EmecA);
@@ -145,7 +145,7 @@ StatusCode
LArDigitMon::initialize()
{
- msg(MSG::INFO)<<"Initialize LArDigitMon" << endmsg;
+ ATH_MSG_INFO("Initialize LArDigitMon" );
StatusCode sc;
@@ -156,7 +156,7 @@ LArDigitMon::initialize()
} else {
- msg(MSG::FATAL) << "unable to connect non-tool: LArOnlineID" << endmsg;
+ ATH_MSG_FATAL( "unable to connect non-tool: LArOnlineID" );
return StatusCode::FAILURE;
}
@@ -169,7 +169,7 @@ LArDigitMon::initialize()
} else {
- msg(MSG::FATAL) << "unable to connect non-tool: LArEM_ID" << endmsg;
+ ATH_MSG_FATAL( "unable to connect non-tool: LArEM_ID" );
return StatusCode::FAILURE;
}
@@ -178,7 +178,7 @@ LArDigitMon::initialize()
/** Get LAr Calbling Service*/
sc=m_LArCablingService.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve LArCablingService" << endmsg;
+ ATH_MSG_ERROR( "Could not retrieve LArCablingService" );
return StatusCode::FAILURE;
}
@@ -186,7 +186,7 @@ LArDigitMon::initialize()
if (m_ignoreKnownBadChannels) {
sc=m_badChannelMask.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve BadChannelMask" << m_badChannelMask<< endmsg;
+ ATH_MSG_ERROR( "Could not retrieve BadChannelMask" << m_badChannelMask);
return StatusCode::FAILURE;
}
}
@@ -194,7 +194,7 @@ LArDigitMon::initialize()
/** Retrieve pedestals container*/
sc = detStore()->regHandle(m_larPedestal,m_larPedestalKey);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "could not register handle for pedestal " << endmsg;
+ ATH_MSG_ERROR( "could not register handle for pedestal " );
return StatusCode::FAILURE;
}
@@ -299,7 +299,7 @@ LArDigitMon::fillHistograms()
StatusCode sc = evtStore()->retrieve(noisyRO,"LArNoisyROSummary");
if (sc.isFailure())
{
- msg(MSG::WARNING) << "Can't retrieve LArNoisyROSummary " <<endmsg;
+ ATH_MSG_WARNING( "Can't retrieve LArNoisyROSummary " );
return StatusCode::SUCCESS;
}
const std::vector<HWIdentifier>& noisyFEB = noisyRO->get_noisy_febs();
@@ -313,7 +313,7 @@ LArDigitMon::fillHistograms()
// unsigned long run=0;
const xAOD::EventInfo* thisEvent;
if (evtStore()->retrieve(thisEvent).isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve EventInfo object" << endmsg;
+ ATH_MSG_ERROR( "Failed to retrieve EventInfo object" );
return StatusCode::FAILURE;
}
@@ -329,8 +329,8 @@ LArDigitMon::fillHistograms()
const LArDigitContainer* pLArDigitContainer;
sc = evtStore()->retrieve(pLArDigitContainer, m_LArDigitContainerKey);
if (sc.isFailure()) {
- msg(MSG::WARNING) << "Can\'t retrieve LArDigitContainer with key "
- << m_LArDigitContainerKey << endmsg;
+ ATH_MSG_WARNING( "Can\'t retrieve LArDigitContainer with key "
+ << m_LArDigitContainerKey );
return StatusCode::SUCCESS;
}
diff --git a/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx b/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx
index a752bd176bd95312fc82f6ab4e4129aeb077688f..7f30fbf488692334952cea763fef514bdfd27f25 100755
--- a/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx
@@ -135,11 +135,11 @@ LArFEBMon::~LArFEBMon() {
// ********************************************************************
StatusCode LArFEBMon::initialize() {
- msg(MSG::INFO) << "Initializing LArFEBMon " << endmsg;
+ ATH_MSG_INFO( "Initializing LArFEBMon " );
StatusCode sc = detStore()->retrieve(m_onlineHelper, "LArOnlineID");
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not get LArOnlineID helper !" << endmsg;
+ ATH_MSG_ERROR( "Could not get LArOnlineID helper !" );
return StatusCode::FAILURE;
}
@@ -149,10 +149,10 @@ StatusCode LArFEBMon::initialize() {
// Get BadChannelTool
sc=m_badChannelTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve LArBadChannelTool " << m_badChannelTool << endmsg;
+ ATH_MSG_ERROR( "Could not retrieve LArBadChannelTool " << m_badChannelTool );
return StatusCode::FAILURE;
} else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "LArBadChannelTool" << m_badChannelTool << " retrieved" << endmsg;
+ ATH_MSG_DEBUG( "LArBadChannelTool" << m_badChannelTool << " retrieved" );
}
ManagedMonitorToolBase::initialize().ignore();
@@ -332,11 +332,11 @@ StatusCode LArFEBMon::bookHistograms() {
const Trig::ChainGroup* allL1 = m_trigDec->getChainGroup("L1_.*");
std::vector<std::string> l1triggers = allL1->getListOfTriggers();
- msg(MSG::INFO ) << "lvl1 item names: [";
+ ATH_MSG_INFO( "lvl1 item names: [" );
for (unsigned int i=0;i< l1triggers.size();i++) {
- msg(MSG::INFO) << i << " " << l1triggers.at(i) << " , " << endmsg;
+ ATH_MSG_INFO( i << " " << l1triggers.at(i) << " , " );
}
- msg(MSG::INFO)<< "] " << endmsg;
+ ATH_MSG_INFO( "] " );
if (l1triggers.size()>0) {m_trigok=true;} else {m_trigok=false;}
}
@@ -350,10 +350,10 @@ StatusCode LArFEBMon::bookHistograms() {
summaryGroup.regTree(m_CorruptTree).ignore();
// }
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "done with bookHists()" << endmsg;
+ ATH_MSG_DEBUG( "done with bookHists()" );
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Bookhists failed" << endmsg;
+ ATH_MSG_ERROR( "Bookhists failed" );
}
return sc;
@@ -377,7 +377,7 @@ StatusCode LArFEBMon::fillHistograms() {
const xAOD::EventInfo* thisEvent=0;
if(evtStore()->retrieve(thisEvent).isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve EventInfo object" << endmsg;
+ ATH_MSG_ERROR( "Failed to retrieve EventInfo object" );
return StatusCode::FAILURE;
}
@@ -390,24 +390,24 @@ StatusCode LArFEBMon::fillHistograms() {
unsigned lumi_block = thisEvent->lumiBlock();
bool lar_inerror = (thisEvent->errorState(xAOD::EventInfo::LAr)==xAOD::EventInfo::Error) ? true : false;
- //msg(MSG::INFO) << "LArFEBMon Lumi block: "<<lumi_block<<endmsg;
+ //ATH_MSG_INFO( "LArFEBMon Lumi block: "<<lumi_block);
const LArFebHeaderContainer* hdrCont;
const LArFebErrorSummary* lArFebErrorSummary;
StatusCode sc = evtStore()->retrieve(hdrCont);
if (sc.isFailure() || !hdrCont) {
- msg(MSG::WARNING) << "No LArFebHeaderContainer found in TDS" << endmsg;
+ ATH_MSG_WARNING( "No LArFebHeaderContainer found in TDS" );
return sc;
}
if (hdrCont->size()==0) {
- msg(MSG::ERROR) << "Got empty LArFebHeaderContainer. Do nothing" << std::endl;
+ ATH_MSG_ERROR( "Got empty LArFebHeaderContainer. Do nothing" );
return StatusCode::FAILURE;
}
sc=evtStore()->retrieve( lArFebErrorSummary, "LArFebErrorSummary");
if (sc.isFailure()) {
- msg(MSG::ERROR) << "No LArFebErrorSummary found in TDS" << endmsg;
+ ATH_MSG_ERROR( "No LArFebErrorSummary found in TDS" );
return StatusCode::FAILURE;
}
@@ -424,8 +424,8 @@ StatusCode LArFEBMon::fillHistograms() {
const LArDSPThresholdsComplete* dspThresh=0;
sc=detStore()->retrieve(dspThresh,m_keyDSPThresholds);
if(!sc.isSuccess()) {
- msg(MSG::ERROR) <<" Failed to retrieve LArDSPThresholds with key " << m_keyDSPThresholds
- << ". Will not fill histograms" << endmsg;
+ ATH_MSG_ERROR(" Failed to retrieve LArDSPThresholds with key " << m_keyDSPThresholds
+ << ". Will not fill histograms" );
}
else {
auto chIt=m_onlineHelper->channel_begin();
@@ -442,14 +442,14 @@ StatusCode LArFEBMon::fillHistograms() {
const AthenaAttributeList* dspThrshAttr=0;
sc=detStore()->retrieve(dspThrshAttr,m_keyDSPThresholds);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve AttributeList with key (folder) " << m_keyDSPThresholds
- << ", containing DSP Thresholds. Will not fill histograms." << endmsg;
+ ATH_MSG_ERROR( "Failed to retrieve AttributeList with key (folder) " << m_keyDSPThresholds
+ << ", containing DSP Thresholds. Will not fill histograms." );
}
else {
const LArDSPThresholdsFlat* dspThreshFlat=new LArDSPThresholdsFlat(dspThrshAttr);
if (!dspThreshFlat->good()) {
- msg(MSG::ERROR) << "Failed to initialize LArDSPThresholdFlat from attribute list loaded from " << m_keyDSPThresholds
- << ". Will not fill histograms." << endmsg;
+ ATH_MSG_ERROR( "Failed to initialize LArDSPThresholdFlat from attribute list loaded from " << m_keyDSPThresholds
+ << ". Will not fill histograms." );
}//end if not good
const IdentifierHash chanMax=m_onlineHelper->channelHashMax();
for (unsigned iChan=0;iChan<chanMax;++iChan) {
@@ -462,7 +462,7 @@ StatusCode LArFEBMon::fillHistograms() {
}// else run 2
}// end load DSP thresholds from DB
else
- msg(MSG::WARNING) << "No LArDSPThresholds key specificed. Will not fill these histograms" << endmsg;
+ ATH_MSG_WARNING( "No LArDSPThresholds key specificed. Will not fill these histograms" );
}//end if eventsCounter==1
@@ -682,7 +682,7 @@ StatusCode LArFEBMon::fillHistograms() {
// If the nb of DSP headers is lower than the maximum, this means that there are some missing FEBs, probably
// due to missing ROS fragment
// This assumes that the maximum of DSP headers found is the expected one
- // msg(MSG::ERROR) << "ICI" << nbOfFeb << " " << m_nbOfFebBlocksTotal->GetBinLowEdge(m_nbOfFebBlocksTotal->GetMaximumBin()) << endmsg;
+ // ATH_MSG_ERROR( "ICI" << nbOfFeb << " " << m_nbOfFebBlocksTotal->GetBinLowEdge(m_nbOfFebBlocksTotal->GetMaximumBin()) );
if (nbOfFebOK(nbOfFeb,m_nbOfFebBlocksTotal)){
// The nb of readout FEB is lower than the maximum number of FEBs observed in this run
@@ -913,7 +913,7 @@ void LArFEBMon::fillErrorsSummary(summaryPartition& summ,int partitNb_2,int ft,i
//********************************************************************
StatusCode LArFEBMon::bookNewPartitionSumm(summaryPartition& summ,std::string summName)
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In bookNewPartitionSumm ->" << summName << endmsg;
+ ATH_MSG_DEBUG( "In bookNewPartitionSumm ->" << summName );
MonGroup perPartitionGroup( this, "/LAr/FEBMon/perPartition", run, ATTRIB_MANAGED );
MonGroup perPartitionYieldGroup( this, "/LAr/FEBMon/perPartition", run, ATTRIB_MANAGED, "" , "weightedEff" );
@@ -1093,7 +1093,7 @@ StatusCode LArFEBMon::bookNewPartitionSumm(summaryPartition& summ,std::string su
sc = sc && perPartitionDataGroup.regHist(summ.m_rejectedLBProfilePart);
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Unable to book partitions histograms" << endmsg;
+ ATH_MSG_FATAL( "Unable to book partitions histograms" );
}
}
return sc;
@@ -1189,7 +1189,7 @@ LArFEBMon::plotMaskedFEB(){
void
LArFEBMon::fillFebInError(const summaryPartition& summ,int errorType,int barrel_ec,int pos_neg,std::string summName)
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In fillFebInError" << endmsg;
+ ATH_MSG_DEBUG( "In fillFebInError" );
// TH2I* tempHisto = TH2I_LW::create(*summ.parity);
@@ -1271,7 +1271,7 @@ LArFEBMon::fillFebInError(const summaryPartition& summ,int errorType,int barrel_
(m_febInError[hashId]->GetYaxis())->SetTitle("Number of errors");
StatusCode sc = generalGroup.regHist(m_febInError[hashId]);
- if (sc.isFailure()) msg(MSG::ERROR) << "Failed to register Feb histogram!" << endmsg;
+ if (sc.isFailure()) ATH_MSG_ERROR( "Failed to register Feb histogram!" );
else m_bfebIE[hashId] = true;
}
m_febInError[hashId]->SetBinContent(errorType,binContent);
@@ -1291,7 +1291,7 @@ void LArFEBMon::fillYieldHistos(TH2I_LW* summaryHisto,TH2F_LW* statusHisto)
// Compute the yield of odd events in error per FEB
// The number of events in error is stored in summaryHisto and the yield is stored in statusHisto
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in fillYieldHistos() - " << m_eventsCounter << endmsg;
+ ATH_MSG_DEBUG( "in fillYieldHistos() - " << m_eventsCounter );
if (m_eventsCounter != 0){
for (unsigned int ix=1;ix<=summaryHisto->GetNbinsX();ix++){
diff --git a/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx
index 3160a837e56dbe72f7d33c9bf614f64a0d0c1bdd..7781f4885d98bc7d8f80b8da1a6b65c7c1a8a104 100644
--- a/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArHVCorrectionMonTool.cxx
@@ -85,33 +85,33 @@ LArHVCorrectionMonTool::~LArHVCorrectionMonTool()
StatusCode LArHVCorrectionMonTool::initialize()
{
- msg(MSG::INFO) << "Initialize LArHVCorrectionMonTool" << endmsg;
+ ATH_MSG_INFO( "Initialize LArHVCorrectionMonTool" );
StatusCode sc;
sc = detStore()->retrieve(m_LArOnlineIDHelper, "LArOnlineID");
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endmsg;
+ ATH_MSG_FATAL( "Could not get LArOnlineIDHelper" );
return sc;
}
// Retrieve HVCorrTool
sc = m_hvCorrTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to find tool for LArHVCorrTool" << endmsg;
+ ATH_MSG_ERROR( "Unable to find tool for LArHVCorrTool" );
return StatusCode::FAILURE;
}
// Retrieve HV Correction reference
sc = detStore()->regHandle(m_dd_HVScaleCorr,m_keyHVScaleCorr);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to register handle to HVScaleCorr " << endmsg;
+ ATH_MSG_ERROR( "Unable to register handle to HVScaleCorr " );
return StatusCode::FAILURE;
}
// Retrieve ID helpers
sc = detStore()->retrieve( m_caloIdMgr );
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get CaloIdMgr" << endmsg;
+ ATH_MSG_FATAL( "Could not get CaloIdMgr" );
return sc;
}
m_LArEM_IDHelper = m_caloIdMgr->getEM_ID();
@@ -121,14 +121,14 @@ StatusCode LArHVCorrectionMonTool::initialize()
// CaloDetDescrMgr gives "detector description", including real positions of cells
sc = detStore()->retrieve(m_CaloDetDescrMgr);
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get CaloDetDescrMgr "<< endmsg;
+ ATH_MSG_FATAL( "Could not get CaloDetDescrMgr ");
return sc;
}
// Get LAr Cabling Service
sc=m_larCablingService.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve LArCablingService" << endmsg;
+ ATH_MSG_ERROR( "Could not retrieve LArCablingService" );
return StatusCode::FAILURE;
}
@@ -138,7 +138,7 @@ StatusCode LArHVCorrectionMonTool::initialize()
// End Initialize
ManagedMonitorToolBase::initialize().ignore();
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Successful Initialize LArHVCorrection " << endmsg;
+ ATH_MSG_DEBUG( "Successful Initialize LArHVCorrection " );
return StatusCode::SUCCESS;
}
@@ -146,7 +146,7 @@ StatusCode LArHVCorrectionMonTool::initialize()
StatusCode
LArHVCorrectionMonTool::bookHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in bookHists()" << endmsg;
+ ATH_MSG_DEBUG( "in bookHists()" );
// if(isNewRun){
@@ -274,7 +274,7 @@ LArHVCorrectionMonTool::bookHistograms()
StatusCode
LArHVCorrectionMonTool::fillHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in fillHists()" << endmsg;
+ ATH_MSG_DEBUG( "in fillHists()" );
m_eventsCounter++;
@@ -283,7 +283,7 @@ LArHVCorrectionMonTool::fillHistograms()
// Retrieve event information
const xAOD::EventInfo* thisEventInfo;
if (evtStore()->retrieve(thisEventInfo).isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve EventInfo object" << endmsg;
+ ATH_MSG_ERROR( "Failed to retrieve EventInfo object" );
return StatusCode::FAILURE;
}
//const DataHandle<EventInfo> event_info;
@@ -298,7 +298,7 @@ LArHVCorrectionMonTool::fillHistograms()
const LArRawChannelContainer* pRawChannelsContainer;
StatusCode sc = evtStore()->retrieve(pRawChannelsContainer, m_channelKey);
if(sc.isFailure()) {
- msg(MSG::WARNING) << "Can't retrieve LArRawChannelContainer with key " << m_channelKey <<endmsg;
+ ATH_MSG_WARNING( "Can't retrieve LArRawChannelContainer with key " << m_channelKey );
return StatusCode::SUCCESS;
}
@@ -320,7 +320,7 @@ LArHVCorrectionMonTool::fillHistograms()
float etaChan = 0; float phiChan = 0.;
const CaloDetDescrElement* caloDetElement = m_CaloDetDescrMgr->get_element(offlineID);
if(caloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
+ ATH_MSG_ERROR( "Cannot retrieve (eta,phi) coordinates for raw channels" );
continue;
}else{
etaChan = caloDetElement->eta_raw();
@@ -333,13 +333,13 @@ LArHVCorrectionMonTool::fillHistograms()
// Retrieve HV correction info
float hvdev = 0;
float hvcorr = m_hvCorrTool->Scale(offlineID);
- //msg(MSG::VERBOSE) << "hvcorr" << hvcorr << endmsg;
+ //ATH_MSG_VERBOSE( "hvcorr" << hvcorr );
float hvonline = m_dd_HVScaleCorr->HVScaleCorr(offlineID);
if (hvonline<=0) continue; //No valid online correction
- //msg(MSG::VERBOSE) << "hvonline" << hvonline << endmsg;
+ //ATH_MSG_VERBOSE( "hvonline" << hvonline );
if (hvcorr>hvonline) hvdev = hvonline-hvcorr; //Monitor only channels that get a higher correction from DCS (eg are at a lower voltage).
- //msg(MSG::VERBOSE) << "hvdev" << hvdev << endmsg;
+ //ATH_MSG_VERBOSE( "hvdev" << hvdev );
if (fabs(hvdev/hvonline)> m_threshold){
@@ -408,7 +408,7 @@ LArHVCorrectionMonTool::fillHistograms()
StatusCode LArHVCorrectionMonTool::procHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In procHistograms " << endmsg;
+ ATH_MSG_DEBUG( "In procHistograms " );
// //
// // Normalize and fix bins only at the end of a block, and only ONCE ! Otherwise it's a mess
diff --git a/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx b/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx
index df4271fe61b70fe5870a7c0f268b845a0359c7d6..eef3df5ee47aad611628810c8de9b6a4d582033e 100644
--- a/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArNoisyROMon.cxx
@@ -83,7 +83,7 @@ StatusCode LArNoisyROMon::initialize()
{
if ( !(detStore()->retrieve(m_LArOnlineIDHelper, "LArOnlineID" ).isSuccess()) )
{
- msg(MSG::FATAL) << "unable to retrieve LArOnlineID from detStore" << endmsg;
+ ATH_MSG_FATAL( "unable to retrieve LArOnlineID from detStore" );
return StatusCode::FAILURE;
}
@@ -96,7 +96,7 @@ StatusCode LArNoisyROMon::initialize()
StatusCode sc = m_trigDec.retrieve();
if ( !sc.isSuccess() )
{
- msg(MSG::FATAL) << "unable to initialize TrigDecisionTool " << endmsg;
+ ATH_MSG_FATAL( "unable to initialize TrigDecisionTool " );
return StatusCode::FAILURE;
}
}
@@ -249,7 +249,7 @@ StatusCode LArNoisyROMon::fillHistograms()
sc = evtStore()->retrieve(noisyRO,m_inputKey);
if (sc.isFailure())
{
- msg(MSG::WARNING) << "Can't retrieve LArNoisyROSummary " <<endmsg;
+ ATH_MSG_WARNING( "Can't retrieve LArNoisyROSummary " );
return StatusCode::SUCCESS;
}
@@ -258,7 +258,7 @@ StatusCode LArNoisyROMon::fillHistograms()
sc = evtStore()->retrieve(eventInfo);
if (sc.isFailure())
{
- msg(MSG::WARNING) << "Can't retrieve EventInfo " <<endmsg;
+ ATH_MSG_WARNING( "Can't retrieve EventInfo " );
return StatusCode::SUCCESS;
}
@@ -1507,7 +1507,7 @@ void LArNoisyROMon::fillTriggerHisto(partitionHistos& partition, uint8_t trigger
StatusCode LArNoisyROMon::finalize()
{
- msg(MSG::INFO) << " in LArNoisyROMon::finalize() " << endmsg;
+ ATH_MSG_INFO( " in LArNoisyROMon::finalize() " );
// delete temposary histograms
if ( m_h_LBN ) {
diff --git a/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx
index 6bf8786da89e07051926b5cf8b47ba108b8a94ed..a0f849fee12b3114bda8fad7de4880fd762c566a 100755
--- a/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx
@@ -181,7 +181,7 @@ LArRODMonTool::initialize() {
StatusCode sc = detStore()->retrieve(m_LArOnlineIDHelper, "LArOnlineID");
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endmsg;
+ ATH_MSG_FATAL( "Could not get LArOnlineIDHelper" );
return sc;
}
@@ -191,41 +191,41 @@ LArRODMonTool::initialize() {
// if (m_doDspTestDump) {
sc = detStore()->regHandle(m_dd_ofc,m_keyOFC);
if (sc!=StatusCode::SUCCESS) {
- msg(MSG::FATAL) << "Cannot register DataHandle for OFC object with key " << m_keyOFC << endmsg;
+ ATH_MSG_FATAL( "Cannot register DataHandle for OFC object with key " << m_keyOFC );
return sc;
}
sc = detStore()->regHandle(m_dd_shape,m_keyShape);
if (sc!=StatusCode::SUCCESS) {
- msg(MSG::FATAL) << "Cannot register DataHandle for Shape object with key " << m_keyShape << endmsg;
+ ATH_MSG_FATAL( "Cannot register DataHandle for Shape object with key " << m_keyShape );
return sc;
}
sc = detStore()->regHandle(m_dd_HVScaleCorr,"LArHVScaleCorr");
if (sc!=StatusCode::SUCCESS) {
- msg(MSG::FATAL) << "Cannot register DataHandle for HVScaleCorr object with key LArHVScaleCorr" << endmsg;
+ ATH_MSG_FATAL( "Cannot register DataHandle for HVScaleCorr object with key LArHVScaleCorr" );
return sc;
}
// ADC2MeV Tool
sc = m_adc2mevtool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to find tool for LArADC2MeV" << endmsg;
+ ATH_MSG_ERROR( "Unable to find tool for LArADC2MeV" );
return StatusCode::FAILURE;
}
sc = m_calo_noise_tool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to find calo noise tool" << endmsg;
+ ATH_MSG_ERROR( "Unable to find calo noise tool" );
return StatusCode::FAILURE;
}
sc = m_cable_service_tool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to find cabling service tool" << endmsg;
+ ATH_MSG_ERROR( "Unable to find cabling service tool" );
return StatusCode::FAILURE;
}
sc = detStore()->retrieve(m_calo_description_mgr);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to find CeloDetDescrManager " << endmsg;
+ ATH_MSG_ERROR( "Unable to find CeloDetDescrManager " );
return StatusCode::FAILURE;
}
// }
@@ -233,14 +233,14 @@ LArRODMonTool::initialize() {
// if (m_skipNullPed || m_doDspTestDump) {
sc=detStore()->retrieve(m_larpedestal,m_larpedestalkey);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Cannot register DataHandle for Pedestal object with key " << m_larpedestalkey << endmsg;
+ ATH_MSG_ERROR( "Cannot register DataHandle for Pedestal object with key " << m_larpedestalkey );
return StatusCode::FAILURE;
}
// }
if (m_skipKnownProblematicChannels) {
sc=m_badChannelMask.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve BadChannelMask" << m_badChannelMask<< endmsg;
+ ATH_MSG_ERROR( "Could not retrieve BadChannelMask" << m_badChannelMask);
return StatusCode::FAILURE;
}
@@ -626,7 +626,7 @@ LArRODMonTool::bookHistograms()
// }
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Bookhistograms failed" << endmsg;
+ ATH_MSG_ERROR( "Bookhistograms failed" );
}
return sc;
@@ -638,7 +638,7 @@ bool LArRODMonTool::FebStatus_Check() {
const LArFebHeaderContainer* febCont=NULL;
StatusCode sc = evtStore()->retrieve(febCont);
if (sc.isFailure() || !febCont) {
- msg(MSG::WARNING) << "No LArFEB container found in TDS" << endmsg;
+ ATH_MSG_WARNING( "No LArFEB container found in TDS" );
return false;
}
LArFebHeaderContainer::const_iterator itFEB = febCont->begin();
@@ -668,7 +668,7 @@ StatusCode LArRODMonTool::fillHistograms() {
const xAOD::EventInfo* thisEventInfo;
if (evtStore()->retrieve(thisEventInfo).isFailure()) {
- msg(MSG::ERROR) << "No EventInfo object found! Can't read run number!" << endmsg;
+ ATH_MSG_ERROR( "No EventInfo object found! Can't read run number!" );
return StatusCode::FAILURE;
}
@@ -679,12 +679,12 @@ StatusCode LArRODMonTool::fillHistograms() {
if ( thisEventInfo->isEventFlagBitSet(xAOD::EventInfo::LAr,0) ) {
isEventFlaggedByLArNoisyROAlg = true;
- msg(MSG::DEBUG) << " !!! Noisy event found from LArNoisyROAlg !!!" << endmsg;
+ ATH_MSG_DEBUG( " !!! Noisy event found from LArNoisyROAlg !!!" );
}
if ( thisEventInfo->isEventFlagBitSet(xAOD::EventInfo::LAr,3) ) {
isEventFlaggedByLArNoisyROAlgInTimeW = true;
- msg(MSG::DEBUG) << " !!! Noisy event found by LArNoisyROAlg in Time window of 500ms!!!" << endmsg;
+ ATH_MSG_DEBUG( " !!! Noisy event found by LArNoisyROAlg in Time window of 500ms!!!" );
}
// Noise bursts cleaning (LArNoisyRO_Std or TimeWindowVeto) added by B.Trocme - 19/7/12
@@ -738,7 +738,7 @@ StatusCode LArRODMonTool::fillHistograms() {
const LArRawChannelContainer* rawColl_fromDigits;
StatusCode sc = evtStore()->retrieve(rawColl_fromDigits, m_channelKey_fromDigits);
if(sc.isFailure()) {
- msg(MSG::WARNING) << "Can\'t retrieve LArRawChannelContainer with key " << m_channelKey_fromDigits <<endmsg;
+ ATH_MSG_WARNING( "Can\'t retrieve LArRawChannelContainer with key " << m_channelKey_fromDigits );
return StatusCode::FAILURE;
}
@@ -746,7 +746,7 @@ StatusCode LArRODMonTool::fillHistograms() {
const LArRawChannelContainer* rawColl_fromBytestream;
sc = evtStore()->retrieve(rawColl_fromBytestream, m_channelKey_fromBytestream);
if(sc.isFailure()) {
- msg(MSG::WARNING) << "Can\'t retrieve LArRawChannelContainer with key " << m_channelKey_fromBytestream <<endmsg;
+ ATH_MSG_WARNING( "Can\'t retrieve LArRawChannelContainer with key " << m_channelKey_fromBytestream );
return StatusCode::FAILURE;
}
@@ -755,7 +755,7 @@ StatusCode LArRODMonTool::fillHistograms() {
// if (m_dumpDigits) {
sc = evtStore()->retrieve(pLArDigitContainer, m_LArDigitContainerKey);
if (sc.isFailure()) {
- msg(MSG::WARNING) << "Can't retrieve LArDigitContainer with key " << m_LArDigitContainerKey <<". Turn off digit dump." << endmsg;
+ ATH_MSG_WARNING( "Can't retrieve LArDigitContainer with key " << m_LArDigitContainerKey <<". Turn off digit dump." );
closeDumpfiles();
m_dumpDigits=false;
m_doDspTestDump=false;
@@ -787,7 +787,7 @@ StatusCode LArRODMonTool::fillHistograms() {
LArRawChannelContainer::const_iterator rcBSIt_e=rawColl_fromBytestream->end();
//Loop over indices in LArRawChannelContainer built offline (the small one)
- msg(MSG::DEBUG) << "Entering the LArRawChannel loop." << endmsg;
+ ATH_MSG_DEBUG( "Entering the LArRawChannel loop." );
for (;rcDigIt!=rcDigIt_e;++rcDigIt) {
const HWIdentifier idDig=rcDigIt->hardwareID();
@@ -810,11 +810,11 @@ StatusCode LArRODMonTool::fillHistograms() {
LArRawChannelContainer::const_iterator currIt=rcBSIt; //Remember current position in container
for (;rcBSIt!=rcBSIt_e && rcBSIt->hardwareID() != idDig; ++rcBSIt);
if (rcBSIt==rcBSIt_e) {
- msg(MSG::WARNING) << "LArRawChannelContainer not in the expected order. Change of LArByteStream format?" << endmsg;
+ ATH_MSG_WARNING( "LArRawChannelContainer not in the expected order. Change of LArByteStream format?" );
//Wrap-around
for (rcBSIt=rawColl_fromBytestream->begin();rcBSIt!=currIt && rcBSIt->hardwareID() != idDig; ++rcBSIt);
if (rcBSIt==currIt) {
- msg(MSG::ERROR) << "Channel " << m_LArOnlineIDHelper->channel_name(idDig) << " not found." << endmsg;
+ ATH_MSG_ERROR( "Channel " << m_LArOnlineIDHelper->channel_name(idDig) << " not found." );
return StatusCode::FAILURE;
}
}
@@ -826,7 +826,7 @@ StatusCode LArRODMonTool::fillHistograms() {
const unsigned digContSize=pLArDigitContainer->size();
for(;index<digContSize && pLArDigitContainer->at(index)->hardwareID()!=idDig;++index);
if (index==digContSize) {
- msg(MSG::ERROR) << "Can't find LArDigit corresponding to channel " << m_LArOnlineIDHelper->channel_name(idDig) << ". Turn off digit dump" << endmsg;
+ ATH_MSG_ERROR( "Can't find LArDigit corresponding to channel " << m_LArOnlineIDHelper->channel_name(idDig) << ". Turn off digit dump" );
closeDumpfiles();
m_dumpDigits=false;
m_doDspTestDump=false;
@@ -848,19 +848,19 @@ StatusCode LArRODMonTool::fillHistograms() {
if ((maxSamples-minSamples) > m_adc_th || m_adc_th <= 0) compareChannels(idDig,(*rcDigIt),(*rcBSIt),dig).ignore();
else {
- if (dig) msg(MSG::DEBUG) << "Samples : "<< maxSamples << " " << minSamples << endmsg;
+ if (dig) ATH_MSG_DEBUG( "Samples : "<< maxSamples << " " << minSamples );
}
}//end loop over rawColl_fromDigits
- msg(MSG::DEBUG) << "End of rawChannels loop" << endmsg;
+ ATH_MSG_DEBUG( "End of rawChannels loop" );
if(m_IsOnline && m_last_lb < m_curr_lb && (m_curr_lb - m_last_lb) % m_history_granularity == m_history_granularity -1 ) { // if new LB subtract the old for Out_[E,Q,T]_FT_vs_SLOT
- msg(MSG::INFO) << " Last LB: "<<m_last_lb<<" curr. LB: "<<m_curr_lb<<" subtracting histos"<<endmsg;
+ ATH_MSG_INFO( " Last LB: "<<m_last_lb<<" curr. LB: "<<m_curr_lb<<" subtracting histos");
// subtract all previously not done bins....
int hbin = (m_curr_lb % m_history_size) / m_history_granularity;
for(int i=0; i<=hbin; ++i) {
if(!m_hdone[i]) {
- msg(MSG::INFO) << " Going to subtract and reset the: "<< i << " bin of shadow histo"<<endmsg;
+ ATH_MSG_INFO( " Going to subtract and reset the: "<< i << " bin of shadow histo");
for(unsigned l=0; l<m_histos.size(); ++l) {// go through all histo groups
m_histos[l].m_hOut_E_FT_vs_SLOT->Add(m_histos[l].m_hOut_E_FT_vs_SLOT_shadow[i], -1.);
m_histos[l].m_hOut_E_FT_vs_SLOT_shadow[i]->Reset();
@@ -899,18 +899,18 @@ StatusCode LArRODMonTool::fillHistograms() {
if (msgLvl(MSG::VERBOSE)) {
- msg(MSG::VERBOSE) << "*Number of errors in Energy Computation : " << endmsg;
- msg(MSG::VERBOSE) << "* Low Gain : " << MSG::dec << allEC.errors_E[2] << " / " << m_count_gain[2] << endmsg;
- msg(MSG::VERBOSE) << "* Medium Gain : " << MSG::dec << allEC.errors_E[1] << " / " << m_count_gain[1] << endmsg;
- msg(MSG::VERBOSE) << "* High Gain : " << MSG::dec << allEC.errors_E[0] << " / " << m_count_gain[0] << endmsg;
- msg(MSG::VERBOSE) << "*Number of errors in Time Computation : " << endmsg;
- msg(MSG::VERBOSE) << "* Low Gain : " << MSG::dec << allEC.errors_T[2] << " / " << m_count_gain[2] << endmsg;
- msg(MSG::VERBOSE) << "* Medium Gain : " << MSG::dec << allEC.errors_T[1] << " / " << m_count_gain[1] << endmsg;
- msg(MSG::VERBOSE) << "* High Gain : " << MSG::dec << allEC.errors_T[0] << " / " << m_count_gain[0] << endmsg;
- msg(MSG::VERBOSE) << "*Number of errors in Quality Computation : " << " / " << m_count_gain[2] << endmsg;
- msg(MSG::VERBOSE) << "* Low Gain : " << MSG::dec << allEC.errors_Q[2] << " / " << m_count_gain[2] << endmsg;
- msg(MSG::VERBOSE) << "* Medium Gain : " << MSG::dec << allEC.errors_Q[1] << " / " << m_count_gain[1] << endmsg;
- msg(MSG::VERBOSE) << "* High Gain : " << MSG::dec << allEC.errors_Q[0] << " / " << m_count_gain[0] << endmsg;
+ ATH_MSG_VERBOSE( "*Number of errors in Energy Computation : " );
+ ATH_MSG_VERBOSE( "* Low Gain : " << MSG::dec << allEC.errors_E[2] << " / " << m_count_gain[2] );
+ ATH_MSG_VERBOSE( "* Medium Gain : " << MSG::dec << allEC.errors_E[1] << " / " << m_count_gain[1] );
+ ATH_MSG_VERBOSE( "* High Gain : " << MSG::dec << allEC.errors_E[0] << " / " << m_count_gain[0] );
+ ATH_MSG_VERBOSE( "*Number of errors in Time Computation : " );
+ ATH_MSG_VERBOSE( "* Low Gain : " << MSG::dec << allEC.errors_T[2] << " / " << m_count_gain[2] );
+ ATH_MSG_VERBOSE( "* Medium Gain : " << MSG::dec << allEC.errors_T[1] << " / " << m_count_gain[1] );
+ ATH_MSG_VERBOSE( "* High Gain : " << MSG::dec << allEC.errors_T[0] << " / " << m_count_gain[0] );
+ ATH_MSG_VERBOSE( "*Number of errors in Quality Computation : " << " / " << m_count_gain[2] );
+ ATH_MSG_VERBOSE( "* Low Gain : " << MSG::dec << allEC.errors_Q[2] << " / " << m_count_gain[2] );
+ ATH_MSG_VERBOSE( "* Medium Gain : " << MSG::dec << allEC.errors_Q[1] << " / " << m_count_gain[1] );
+ ATH_MSG_VERBOSE( "* High Gain : " << MSG::dec << allEC.errors_Q[0] << " / " << m_count_gain[0] );
}// end if verbose
@@ -1067,7 +1067,7 @@ void LArRODMonTool::closeDumpfiles() {
}
StatusCode LArRODMonTool::compareChannels(const HWIdentifier chid,const LArRawChannel& rcDig, const LArRawChannel& rcBS, const LArDigit* dig) {
- msg(MSG::DEBUG) << " I am entering compareChannels method" << endmsg;
+ ATH_MSG_DEBUG( " I am entering compareChannels method" );
const int slot_fD = m_LArOnlineIDHelper->slot(chid);
const int feedthrough_fD = m_LArOnlineIDHelper->feedthrough(chid);
const float timeOffline = rcDig.time()/m_unit_offline - m_timeOffset*m_BC;
@@ -1080,7 +1080,7 @@ StatusCode LArRODMonTool::compareChannels(const HWIdentifier chid,const LArRawCh
const float abs_en_fB=fabs(en_fB);
if (fabs(timeOffline) > m_peakTime_cut*1000.){
- msg(MSG::DEBUG) << " timeOffline too large " << timeOffline << endmsg;
+ ATH_MSG_DEBUG( " timeOffline too large " << timeOffline );
return StatusCode::SUCCESS;
}
// Set the cuts corresponding to the range
@@ -1209,62 +1209,67 @@ StatusCode LArRODMonTool::compareChannels(const HWIdentifier chid,const LArRawCh
if(m_IsOnline && ndump<max_dump) {
const int channel=m_LArOnlineIDHelper->channel(chid);
const HWIdentifier febid=m_LArOnlineIDHelper->feb_Id(chid);
- msg(MSG::INFO) << "Channel: " << channel << " of FEB " << febid << endmsg;
+ ATH_MSG_INFO( "Channel: " << channel << " of FEB " << febid );
//if(fabs(DiffE) > DECut && hvscale == 1.) { // only for channels without HV corrections
if(fabs(DiffE) > DECut ) {
// absolute cut on energy 1.MeV
//if(fabs(DiffE) > 1.) {
- msg(MSG::INFO) << "DSP Energy Error : " << m_LArOnlineIDHelper->channel_name(chid) << endmsg;
- msg(MSG::INFO) << " Eonl = " << en_fB << " , Eoff = " << rcDig.energy()
- << " , Eoff - Eonl = " << rcDig.energy() - en_fB << endmsg;
- msg(MSG::INFO) << " Qonl = " << q_fB << " , Qoff = " << rcDig.quality()
- << " (Qoff - Qnl)/sqrt(Qoff) = " << (rcDig.quality() - q_fB)/TMath::Sqrt(rcDig.quality()) << endmsg;
+ ATH_MSG_INFO( "DSP Energy Error : " << m_LArOnlineIDHelper->channel_name(chid) );
+ ATH_MSG_INFO( " Eonl = " << en_fB << " , Eoff = " << rcDig.energy()
+ << " , Eoff - Eonl = " << rcDig.energy() - en_fB );
+ ATH_MSG_INFO( " Qonl = " << q_fB << " , Qoff = " << rcDig.quality()
+ << " (Qoff - Qnl)/sqrt(Qoff) = " << (rcDig.quality() - q_fB)/TMath::Sqrt(rcDig.quality()) );
}
if(keepQ && (fabs(DiffQ) > DQCut)) {
- msg(MSG::INFO) << "DSP Quality Error : " << m_LArOnlineIDHelper->channel_name(chid) << endmsg;
- msg(MSG::INFO) << " Qonl = " << q_fB << " , Qoff = " << rcDig.quality()
- << " (Qoff - Qnl)/sqrt(Qoff) = " << (rcDig.quality() - q_fB)/TMath::Sqrt(rcDig.quality()) << endmsg;
- msg(MSG::INFO) << " Eonl = " << en_fB << " , Eoff = " << rcDig.energy()
- << " , Eoff - Eonl = " << rcDig.energy() - en_fB << endmsg;
+ ATH_MSG_INFO( "DSP Quality Error : " << m_LArOnlineIDHelper->channel_name(chid) );
+ ATH_MSG_INFO( " Qonl = " << q_fB << " , Qoff = " << rcDig.quality()
+ << " (Qoff - Qnl)/sqrt(Qoff) = " << (rcDig.quality() - q_fB)/TMath::Sqrt(rcDig.quality()) );
+ ATH_MSG_INFO( " Eonl = " << en_fB << " , Eoff = " << rcDig.energy()
+ << " , Eoff - Eonl = " << rcDig.energy() - en_fB );
}
- msg(MSG::INFO) << " Tauonl = " << rcBS.time() << " , Tauoff = " << rcDig.time() << endmsg;
+ ATH_MSG_INFO( " Tauonl = " << rcBS.time() << " , Tauoff = " << rcDig.time() );
const std::vector<short>& samples=dig->samples();
- msg(MSG::INFO) << "Digits : ";
- for (unsigned int k = 0; k<samples.size(); k++) {msg(MSG::INFO) << samples.at(k) << " ";}
- msg(MSG::INFO) << endmsg;
+ std::ostringstream os;
+ os << "Digits : ";
+ for (unsigned int k = 0; k<samples.size(); k++) {os << samples.at(k) << " ";}
+ ATH_MSG_INFO( os.str() );
ILArOFC::OFCRef_t this_OFC_a_test = m_dd_ofc->OFC_a(chid,rcDig.gain());
- msg(MSG::INFO) << "OFCa : ";
- for (unsigned int k = 0; k<this_OFC_a_test.size(); ++k) {msg(MSG::INFO) << this_OFC_a_test.at(k) << " ";}
- msg(MSG::INFO) << endmsg;
+ os.clear(); os.seekp(0);
+ os << "OFCa : ";
+ for (unsigned int k = 0; k<this_OFC_a_test.size(); ++k) {os << this_OFC_a_test.at(k) << " ";}
+ ATH_MSG_INFO( os.str() );
ILArOFC::OFCRef_t this_OFC_b_test = m_dd_ofc->OFC_b(chid,rcDig.gain());
- msg(MSG::INFO) << "OFCb : ";
- for (unsigned int k = 0; k<this_OFC_b_test.size(); ++k) {msg(MSG::INFO) << this_OFC_b_test.at(k) << " ";}
- msg(MSG::INFO) << endmsg;
+ os.clear(); os.seekp(0);
+ os << "OFCb : ";
+ for (unsigned int k = 0; k<this_OFC_b_test.size(); ++k) {os << this_OFC_b_test.at(k) << " ";}
+ ATH_MSG_INFO( os.str() );
ILArShape::ShapeRef_t this_Shape_test = m_dd_shape->Shape(chid,rcDig.gain());
- msg(MSG::INFO) << "Shape : ";
- for (unsigned int k = 0; k<this_Shape_test.size(); ++k) {msg(MSG::INFO) << this_Shape_test.at(k) << " ";}
- msg(MSG::INFO) << endmsg;
+ os.clear(); os.seekp(0);
+ os << "Shape : ";
+ for (unsigned int k = 0; k<this_Shape_test.size(); ++k) {os << this_Shape_test.at(k) << " ";}
+ ATH_MSG_INFO( os.str() );
ILArShape::ShapeRef_t this_ShapeDer_test = m_dd_shape->ShapeDer(chid,rcDig.gain());
- msg(MSG::INFO) << "ShapeDer : ";
- for (unsigned int k = 0; k<this_ShapeDer_test.size(); ++k) {msg(MSG::INFO) << this_ShapeDer_test.at(k) << " ";}
- msg(MSG::INFO) << endmsg;
+ os.clear(); os.seekp(0);
+ os << "ShapeDer : ";
+ for (unsigned int k = 0; k<this_ShapeDer_test.size(); ++k) {os << this_ShapeDer_test.at(k) << " ";}
+ ATH_MSG_INFO( os.str() );
const std::vector<float>& ramp=m_adc2mevtool->ADC2MEV(chid,rcDig.gain());
const float escale = ramp[1];
float ramp0 = ramp[0];
if (q_gain == 0) ramp0 = 0.; // no ramp intercepts in HG
const float ped = m_larpedestal->pedestal(chid,rcDig.gain());
- msg(MSG::INFO) << "Escale: "<<escale<<" intercept: "<<ramp0<<" pedestal: "<<ped<<" gain: "<<rcDig.gain() <<endmsg;
+ ATH_MSG_INFO( "Escale: "<<escale<<" intercept: "<<ramp0<<" pedestal: "<<ped<<" gain: "<<rcDig.gain() );
const Identifier cellid=m_cable_service_tool->cnvToIdentifier(chid);
CaloDetDescrElement* cellDDE = m_calo_description_mgr->get_element(cellid);
const float noise=m_calo_noise_tool->totalNoiseRMS(cellDDE,rcDig.gain(),20.);
- msg(MSG::INFO) << "Noise for mu=20: "<<noise<<endmsg;
- msg(MSG::INFO) << "HVScaleCorr: "<<hvscale<<endmsg;
+ ATH_MSG_INFO( "Noise for mu=20: "<<noise);
+ ATH_MSG_INFO( "HVScaleCorr: "<<hvscale);
double emon=0.;
const unsigned nOFCSamp=std::min(samples.size(),this_OFC_a_test.size());
for (unsigned k=0; k<nOFCSamp; ++k) emon += (samples.at(k)-ped)*this_OFC_a_test.at(k);
emon *= escale;
emon += ramp0;
- msg(MSG::INFO) << "intercept + Escale*Sum[(sample-ped)*OFCa] "<<emon<<endmsg;
+ ATH_MSG_INFO( "intercept + Escale*Sum[(sample-ped)*OFCa] "<<emon);
++ndump;
} // DE cut
} // dumper
@@ -1343,9 +1348,9 @@ StatusCode LArRODMonTool::compareChannels(const HWIdentifier chid,const LArRawCh
if (m_printEnergyErrors && msgLvl(MSG::DEBUG)) {
if (fabs(rcDig.energy() - en_fB) > DECut) {
- msg(MSG::DEBUG) << "DSP Energy Error : " << m_LArOnlineIDHelper->channel_name(chid) << endmsg;
- msg(MSG::DEBUG) << " Eonl = " << en_fB << " , Eoff = " << rcDig.energy()
- << " , Eoff - Eonl = " << rcDig.energy() - en_fB << endmsg;
+ ATH_MSG_DEBUG( "DSP Energy Error : " << m_LArOnlineIDHelper->channel_name(chid) );
+ ATH_MSG_DEBUG( " Eonl = " << en_fB << " , Eoff = " << rcDig.energy()
+ << " , Eoff - Eonl = " << rcDig.energy() - en_fB );
}
}
@@ -1382,7 +1387,7 @@ StatusCode LArRODMonTool::compareChannels(const HWIdentifier chid,const LArRawCh
m_counter++;
}//end if E,t or Q cut passed
}//end if dig
- msg(MSG::DEBUG) << " I am leaving compareChannels method" << endmsg;
+ ATH_MSG_DEBUG( " I am leaving compareChannels method" );
return StatusCode::SUCCESS;
}
diff --git a/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx
index b33dbe613c5b46a37ba6c0920b4324b699fd7e3d..325c7dad904046ede4f3ae03eb28272e6cc60d2a 100755
--- a/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx
@@ -166,7 +166,7 @@ LArRawChannelMonTool::~LArRawChannelMonTool()
/*----------------------------------------------------------------------------*/
StatusCode LArRawChannelMonTool::initialize()
{
- ATH_MSG(DEBUG) << "===> start " << name() << "::initialize <=== " << endmsg;
+ ATH_MSG_DEBUG( "===> start " << name() << "::initialize <=== " );
m_event_counter = 0;
m_noise_stream_event_counter = 0;
@@ -176,12 +176,12 @@ StatusCode LArRawChannelMonTool::initialize()
// --- non-trivial ManagedMonitorToolBase intialize routine ---
if ( ManagedMonitorToolBase::initialize().isSuccess() ) {
- ATH_MSG(DEBUG) << "initialized ManagedMonitorToolBase" << endmsg;
+ ATH_MSG_DEBUG( "initialized ManagedMonitorToolBase" );
} else {
- msg(MSG::FATAL) << "Unable to initialize ManagedMonitorToolBase"
- << endmsg;
+ ATH_MSG_FATAL( "Unable to initialize ManagedMonitorToolBase"
+ );
return StatusCode::FAILURE;
}
@@ -189,11 +189,11 @@ StatusCode LArRawChannelMonTool::initialize()
// --- get LArOnlineID ---
if ( detStore()->retrieve( m_lar_online_id_ptr, "LArOnlineID" ).isSuccess() ) {
- ATH_MSG(DEBUG) << "connected non-tool: LArOnlineID" << endmsg;
+ ATH_MSG_DEBUG( "connected non-tool: LArOnlineID" );
} else {
- msg(MSG::FATAL) << "unable to connect non-tool: LArOnlineID" << endmsg;
+ ATH_MSG_FATAL( "unable to connect non-tool: LArOnlineID" );
return StatusCode::FAILURE;
}
@@ -203,12 +203,12 @@ StatusCode LArRawChannelMonTool::initialize()
// --- get CaloDetDescrManager ---
if ( detStore()->retrieve( m_calo_description_mgr_ptr ).isSuccess() ) {
- ATH_MSG(DEBUG) << "connected non-tool: CaloDetDescrManager " << endmsg;
+ ATH_MSG_DEBUG( "connected non-tool: CaloDetDescrManager " );
} else {
- msg(MSG::FATAL) << "unable to connect non-tool: CaloDetDescrMgr "
- << endmsg;
+ ATH_MSG_FATAL( "unable to connect non-tool: CaloDetDescrMgr "
+ );
return StatusCode::FAILURE;
}
@@ -216,12 +216,12 @@ StatusCode LArRawChannelMonTool::initialize()
// --- get CaloIDManager ---
if ( detStore()->retrieve( m_calo_id_mgr_ptr ).isSuccess() ) {
- ATH_MSG(DEBUG) << "connected non-tool: CaloIdManager" << endmsg;
+ ATH_MSG_DEBUG( "connected non-tool: CaloIdManager" );
} else {
- msg(MSG::FATAL) << "unable to connect non-tool: CaloIdManager "
- << endmsg;
+ ATH_MSG_FATAL( "unable to connect non-tool: CaloIdManager "
+ );
return StatusCode::FAILURE;
}
@@ -295,7 +295,7 @@ StatusCode LArRawChannelMonTool::initialize()
} catch ( std::out_of_range &err ) {
- msg(MSG::WARNING) << "FEB hash out of range" << err.what() << endmsg;
+ ATH_MSG_WARNING( "FEB hash out of range" << err.what() );
}
@@ -346,12 +346,11 @@ StatusCode LArRawChannelMonTool::initialize()
}
if (msgLvl(MSG::DEBUG)) {
- msg(MSG::DEBUG) << "Number of channels in detectors: " << std::endl;
+ ATH_MSG_DEBUG( "Number of channels in detectors: " );
typedef std::map<Detector,unsigned int> det_int_map_t;
foreach( det_int_map_t::value_type i, m_det_to_nchannels){
- msg(MSG::DEBUG) << detector_str( i.first ) << " has " << i.second << "channels " << std::endl;
+ ATH_MSG_DEBUG( detector_str( i.first ) << " has " << i.second << "channels " );
}
- msg(MSG::DEBUG) << endmsg;
}
@@ -362,7 +361,7 @@ StatusCode LArRawChannelMonTool::initialize()
m_noise_streams_set.insert(m_noise_streams.begin(),m_noise_streams.end());
- ATH_MSG(DEBUG) << "===> end " << name() << "::initialize <=== " << endmsg;
+ ATH_MSG_DEBUG( "===> end " << name() << "::initialize <=== " );
return StatusCode::SUCCESS;
@@ -373,7 +372,7 @@ StatusCode LArRawChannelMonTool::initialize()
StatusCode LArRawChannelMonTool::bookHistograms()
{
- ATH_MSG(DEBUG) << "===> start " << name() << "::bookHistograms <=== " << endmsg;
+ ATH_MSG_DEBUG( "===> start " << name() << "::bookHistograms <=== " );
std::deque<Detector> detectors = list_of( EMBA )( EMBC )( EMECA )( EMECC )( HECA )( HECC )( FCALA )( FCALC );
@@ -403,8 +402,8 @@ StatusCode LArRawChannelMonTool::bookHistograms()
// case file:
// case all:
// default:
-// msg(MSG::WARNING) << "given bad interval job-option: " << m_interval_str
-// << " ... booking histograms per run ..." << endmsg;
+// ATH_MSG_WARNING( "given bad interval job-option: " << m_interval_str
+// << " ... booking histograms per run ..." );
// is_new_interval = isNewRun;
// }
//
@@ -893,7 +892,7 @@ StatusCode LArRawChannelMonTool::bookHistograms()
// --- Book and register per Feedthrough Histograms ---
if ( m_monitor_feedthroughs ) {
- ATH_MSG(DEBUG) << " - Booking per feedthrough histos" << endmsg;
+ ATH_MSG_DEBUG( " - Booking per feedthrough histos" );
// --- Look for existing feedthough histogram ---
bool is_new_ft = false;
@@ -1015,7 +1014,7 @@ StatusCode LArRawChannelMonTool::bookHistograms()
} catch ( std::out_of_range &err ){
- msg(MSG::WARNING) << "FEB hash out of range: " << err.what() << endmsg;
+ ATH_MSG_WARNING( "FEB hash out of range: " << err.what() );
}
@@ -1235,7 +1234,7 @@ StatusCode LArRawChannelMonTool::bookHistograms()
} // --- end booking for monitoring interval ---
- ATH_MSG(DEBUG) << "===> end " << name() << "::bookHistograms <=== " << endmsg;
+ ATH_MSG_DEBUG( "===> end " << name() << "::bookHistograms <=== " );
return StatusCode::SUCCESS;
@@ -1246,12 +1245,12 @@ StatusCode LArRawChannelMonTool::bookHistograms()
StatusCode LArRawChannelMonTool::fillHistograms()
{
- ATH_MSG(DEBUG) << "===> start " << name() << "::fillHistograms boulou <=== " << endmsg;
+ ATH_MSG_DEBUG( "===> start " << name() << "::fillHistograms boulou <=== " );
// -- Set ATLAS Ready Filter
setIsATLASReady();
- // ATH_MSG(DEBUG) << "Vikas Says: ATLAS READY Flag is set to " << isATLASReady() << endmsg;
+ // ATH_MSG_DEBUG( "Vikas Says: ATLAS READY Flag is set to " << isATLASReady() );
// --- check set in bookHistogram ---
if ( !m_has_lar_raw_channels ) return StatusCode::SUCCESS;
@@ -1260,8 +1259,8 @@ StatusCode LArRawChannelMonTool::fillHistograms()
const LArRawChannelContainer *raw_channels = 0;
if ( !evtStore()->retrieve( raw_channels, m_LArRawChannel_container_key ).isSuccess() ) {
- msg(MSG::WARNING) << "Cannot retrieve LArRawChannelContainer with key: "
- << m_LArRawChannel_container_key << endmsg;
+ ATH_MSG_WARNING( "Cannot retrieve LArRawChannelContainer with key: "
+ << m_LArRawChannel_container_key );
return StatusCode::FAILURE;
}
@@ -1276,24 +1275,24 @@ StatusCode LArRawChannelMonTool::fillHistograms()
// double event_time_minutes = -1;
if ( evtStore()->retrieve( event_info ).isSuccess()) {
- //ATH_MSG(DEBUG) << "event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,0"<<event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,0) << endmsg;
+ //ATH_MSG_DEBUG( "event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,0"<<event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,0) );
// Check for LArNoisyROAlg event info
// if (event_info->errorState(EventInfo::LAr) == EventInfo::Warning) {
if ( event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,LArEventBitInfo::BADFEBS) ) {
isEventFlaggedByLArNoisyROAlg = true;
- ATH_MSG(DEBUG) << " !!! Noisy event found from LArNoisyROAlg !!!" << endmsg;
+ ATH_MSG_DEBUG( " !!! Noisy event found from LArNoisyROAlg !!!" );
}
if ( event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,LArEventBitInfo::BADFEBS_W) ) {
isEventFlaggedByLArNoisyROAlg_W = true;
- ATH_MSG(DEBUG) << " !!! Noisy event found from LArNoisyROAlg_W !!!" << endmsg;
+ ATH_MSG_DEBUG( " !!! Noisy event found from LArNoisyROAlg_W !!!" );
}
if ( event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,3) ) {
isEventFlaggedByLArNoisyROAlgInTimeW = true;
- ATH_MSG(DEBUG) << " !!! Noisy event found by LArNoisyROAlg in Time window of 500ms!!!" << endmsg;
+ ATH_MSG_DEBUG( " !!! Noisy event found by LArNoisyROAlg in Time window of 500ms!!!" );
}
@@ -1329,7 +1328,7 @@ StatusCode LArRawChannelMonTool::fillHistograms()
std::vector<TriggerInfo::StreamTag> event_stream_tags = trig->streamTags();
foreach( const std::string & stream_name, m_noise_streams ) {
foreach( const TriggerInfo::StreamTag stream_tag, event_stream_tags ) {
- ATH_MSG(DEBUG) << "Keeping Stream Tag: " << stream_tag.type() << "_" << stream_tag.name() << endmsg;
+ ATH_MSG_DEBUG( "Keeping Stream Tag: " << stream_tag.type() << "_" << stream_tag.name() );
if( stream_name == stream_tag.name()) {
m_is_noise_event = true;
break;
@@ -1338,7 +1337,7 @@ StatusCode LArRawChannelMonTool::fillHistograms()
}
}
*/
- } else ATH_MSG(DEBUG) << "Cannot retrieve EventInfo" << endmsg;
+ } else ATH_MSG_DEBUG( "Cannot retrieve EventInfo" );
++m_event_counter;
@@ -1530,14 +1529,14 @@ StatusCode LArRawChannelMonTool::fillHistograms()
} catch ( const std::out_of_range &err ) {
- msg(MSG::WARNING) << "FEB hash out of range. Detector undefined"
- << err.what() << endmsg;
+ ATH_MSG_WARNING( "FEB hash out of range. Detector undefined"
+ << err.what() );
continue; // skip this channel
} catch ( const LArID_Exception& err ) {
- msg(MSG::WARNING) << "channel offline id undefined ... skipping"
- << endmsg;
+ ATH_MSG_WARNING( "channel offline id undefined ... skipping"
+ );
continue; // skip this channel
}
@@ -1579,11 +1578,11 @@ StatusCode LArRawChannelMonTool::fillHistograms()
} catch ( std::out_of_range &err ) {
- msg(MSG::WARNING) <<"failed per FEB monitoring "<< err.what() << endmsg;
+ ATH_MSG_WARNING("failed per FEB monitoring "<< err.what() );
} catch ( std::bad_cast &err ) {
- msg(MSG::WARNING) <<"failed per FEB monitoring "<< err.what() << endmsg;
+ ATH_MSG_WARNING("failed per FEB monitoring "<< err.what() );
}
@@ -1622,8 +1621,8 @@ StatusCode LArRawChannelMonTool::fillHistograms()
} catch ( std::out_of_range &err ) {
- msg(MSG::WARNING) << "failed per feedthrough monitoring " << err.what()
- << endmsg;
+ ATH_MSG_WARNING( "failed per feedthrough monitoring " << err.what()
+ );
}
@@ -1729,18 +1728,18 @@ StatusCode LArRawChannelMonTool::fillHistograms()
case 7:
per_detector_total_energy[FCALC] += energy; break;
default:
- msg(MSG::WARNING) << "Something is wrong with choosing of detector partition " << endmsg;
+ ATH_MSG_WARNING( "Something is wrong with choosing of detector partition " );
}
} catch ( const std::out_of_range &err ) {
- msg(MSG::WARNING) << "Failed monitoring " << err.what() << endmsg;
+ ATH_MSG_WARNING( "Failed monitoring " << err.what() );
} catch ( const std::bad_cast &err ) {
- msg(MSG::WARNING) << "Failed monitoring " << err.what() << endmsg;
+ ATH_MSG_WARNING( "Failed monitoring " << err.what() );
}
@@ -1949,7 +1948,7 @@ StatusCode LArRawChannelMonTool::fillHistograms()
StatusCode LArRawChannelMonTool::procHistograms()
{
- ATH_MSG(DEBUG) << "===> start " << name() << "::procHistograms <=== " << endmsg;
+ ATH_MSG_DEBUG( "===> start " << name() << "::procHistograms <=== " );
bool is_new_interval = false;
switch ( m_interval ) {
@@ -1965,8 +1964,8 @@ StatusCode LArRawChannelMonTool::procHistograms()
is_new_interval = endOfRunFlag();
break;
default:
- msg(MSG::WARNING) << "given bad interval job-option: " << m_interval_str
- << " ... booking histograms per run ..." << endmsg;
+ ATH_MSG_WARNING( "given bad interval job-option: " << m_interval_str
+ << " ... booking histograms per run ..." );
is_new_interval = endOfRunFlag();
}
@@ -2041,7 +2040,7 @@ StatusCode LArRawChannelMonTool::procHistograms()
}
- ATH_MSG(DEBUG) << "===> end " << name() << "::procHistograms <=== " << endmsg;
+ ATH_MSG_DEBUG( "===> end " << name() << "::procHistograms <=== " );
return StatusCode::SUCCESS;
@@ -2060,8 +2059,8 @@ std::string LArRawChannelMonTool::threshold_histogram_title_snippet( const doubl
} catch ( const bad_lexical_cast& err ) {
- msg(MSG::WARNING) << "Could not include threshold for histogram titles."
- << err.what() << endmsg;
+ ATH_MSG_WARNING( "Could not include threshold for histogram titles."
+ << err.what() );
return "";
}
@@ -2079,8 +2078,8 @@ std::string LArRawChannelMonTool::threshold_histogram_title_snippet( const int&
} catch ( const bad_lexical_cast& err ) {
- msg(MSG::WARNING) << "Could not include threshold for histogram titles."
- << err.what() << endmsg;
+ ATH_MSG_WARNING( "Could not include threshold for histogram titles."
+ << err.what() );
return "";
}
@@ -2092,12 +2091,12 @@ bool LArRawChannelMonTool::registerHistogram( LWHist* histo, const std::string&
MonGroup histGroup(this,dir,m_interval,ATTRIB_MANAGED,"",merge);
if ( !histGroup.regHist(histo).isSuccess() ) {
- msg(MSG::ERROR) << "Cannot book: " << histo->GetName() << endmsg;
+ ATH_MSG_ERROR( "Cannot book: " << histo->GetName() );
return false;
} else {
- ATH_MSG(DEBUG) << "Booked: " << histo->GetName() << endmsg;
+ ATH_MSG_DEBUG( "Booked: " << histo->GetName() );
return true;
}