From 3e10ff9e83da28feb1a3d7e28d2e6f8f5ea80fc5 Mon Sep 17 00:00:00 2001
From: Pavol Strizenec <Pavol.Strizenec@cern.ch>
Date: Mon, 29 Aug 2016 23:00:30 +0200
Subject: [PATCH] endreq->endmsg (LArMonTools-02-00-48)
* removing deprecated endreq and status variables
* tag LArMonTools-02-00-48
24-08-2016 Pavol Strizenec
* to decrease the memory consumtion, LArCollisionTimeMonTool was
changed to LWHist and intrain histos only for online
* and because we have saved a lot of memory, adding the low gain
saturation plots to LArDigitMon
* Tagging LArMonTools-02-00-47
Former-commit-id: e1c19b1896db1cd77a1b8c1bdeb52b5f41576f66
---
.../LArMonTools/LArCollisionTimeMonTool.h | 37 +++---
.../LArMonTools/LArMonTools/LArDigitMon.h | 9 ++
.../LArMonTools/LArMonTools/LArFEBMon.h | 13 +-
.../LArMonTools/LArRawChannelMonTool.h | 4 +-
.../LArCollisionTimeMonTool_jobOptions.py | 7 +-
.../LArMonTools/src/LArAffectedRegions.cxx | 88 ++++++-------
.../src/LArCollisionTimeMonTool.cxx | 73 ++++++-----
.../LArMonTools/src/LArCosmicsMonTool.cxx | 30 ++---
.../LArMonTools/src/LArCoverage.cxx | 46 +++----
.../LArMonTools/src/LArDigitMon.cxx | 71 +++++++++--
LArCalorimeter/LArMonTools/src/LArFEBMon.cxx | 60 +++++----
.../src/LArHVCorrectionMonTool.cxx | 36 +++---
.../LArMonTools/src/LArNoisyROMon.cxx | 14 +-
.../LArMonTools/src/LArRODMonTool.cxx | 120 +++++++++---------
.../LArMonTools/src/LArRawChannelMonTool.cxx | 90 ++++++-------
15 files changed, 386 insertions(+), 312 deletions(-)
diff --git a/LArCalorimeter/LArMonTools/LArMonTools/LArCollisionTimeMonTool.h b/LArCalorimeter/LArMonTools/LArMonTools/LArCollisionTimeMonTool.h
index b6ab86d56b0..b08a72dc51d 100755
--- a/LArCalorimeter/LArMonTools/LArMonTools/LArCollisionTimeMonTool.h
+++ b/LArCalorimeter/LArMonTools/LArMonTools/LArCollisionTimeMonTool.h
@@ -19,21 +19,21 @@
#include <string>
#include <bitset>
#include <vector>
-#include "TH1.h"
-#include "TH2I.h"
-#include "TH2F.h"
+//#include "TH1.h"
+//#include "TH2I.h"
+//#include "TH2F.h"
#include "TMath.h"
-#include "TProfile2D.h"
#include "TTree.h"
class StoreGateSvc;
class ITHistSvc;
-class TH1I;
-class TH2I;
-class TH2F;
-class TProfile2D;
+//class TH1F;
+//class TH2F;
class TTree;
+class TH1F_LW;
+class TH2F_LW;
+
namespace Trig {
class IBunchCrossingTool;
@@ -83,18 +83,19 @@ class LArCollisionTimeMonTool: public ManagedMonitorToolBase
float m_ECTimeDiff;
float m_ECTimeAvg;
- const unsigned m_nhist=2;
- TH1F** m_LArCollTime_h;
- TH1F** m_LArCollTime_lb_h;
- TH1F** m_LArCollTime_lb_timeCut_h;
- TH1F** m_LArCollTime_lb_singlebeam_timeCut_h;
- TH2F** m_LArCollTime_vs_LB_h;
- TH2F** m_LArCollTime_vs_BCID_h;
- TH1F** m_LArCollAvgTime_h;
- TH2F** m_LArCollAvgTime_vs_LB_h;
- TH2F** m_LArCollAvgTime_vs_BCID_h;
+ unsigned m_nhist;
+ TH1F_LW** m_LArCollTime_h;
+ TH1F_LW** m_LArCollTime_lb_h;
+ TH1F_LW** m_LArCollTime_lb_timeCut_h;
+ TH1F_LW** m_LArCollTime_lb_singlebeam_timeCut_h;
+ TH2F_LW** m_LArCollTime_vs_LB_h;
+ TH2F_LW** m_LArCollTime_vs_BCID_h;
+ TH1F_LW** m_LArCollAvgTime_h;
+ TH2F_LW** m_LArCollAvgTime_vs_LB_h;
+ TH2F_LW** m_LArCollAvgTime_vs_BCID_h;
int m_distance; // distance from train front to fill second histos
+ bool m_IsOnline;
// Counters
int m_eventsCounter;
diff --git a/LArCalorimeter/LArMonTools/LArMonTools/LArDigitMon.h b/LArCalorimeter/LArMonTools/LArMonTools/LArDigitMon.h
index 01454ae1dee..c03657dae91 100755
--- a/LArCalorimeter/LArMonTools/LArMonTools/LArDigitMon.h
+++ b/LArCalorimeter/LArMonTools/LArMonTools/LArDigitMon.h
@@ -90,15 +90,19 @@ private:
partition():
m_NullDigit(0),
m_SatDigit(0),
+ m_SatDigitLow(0),
m_OutDigit(0),
m_NullDigitChan(0),
m_SatDigitChan(0),
+ m_SatDigitChanLow(0),
m_OutDigitChan(0),
m_Temp_NullDigitChan(0),
m_Temp_SatDigitChan(0),
+ m_Temp_SatDigitChanLow(0),
m_Temp_OutDigitChan(0),
m_PNullDigit(0),
m_PSatDigit(0),
+ m_PSatDigitLow(0),
m_POutDigit(0),
m_AverDig(0),
m_AverTempPos_PerStream(0),
@@ -112,20 +116,24 @@ private:
TH2I_LW* m_NullDigit;
TH2I_LW* m_SatDigit;
+ TH2I_LW* m_SatDigitLow;
TH2I_LW* m_OutDigit;
//define histograms at channel levels
TH2F_LW* m_NullDigitChan;
TH2F_LW* m_SatDigitChan;
+ TH2F_LW* m_SatDigitChanLow;
TH2F_LW* m_OutDigitChan;
//Declare temporary histograms to be used online...
TH2I_LW* m_Temp_NullDigitChan;
TH2I_LW* m_Temp_SatDigitChan;
+ TH2I_LW* m_Temp_SatDigitChanLow;
TH2I_LW* m_Temp_OutDigitChan;
TProfile2D_LW* m_PNullDigit;
TProfile2D_LW* m_PSatDigit;
+ TProfile2D_LW* m_PSatDigitLow;
TProfile2D_LW* m_POutDigit;
TProfile2D_LW* m_AverDig;
@@ -196,6 +204,7 @@ private:
void HistTitle(TProfile2D_LW* hist,partition& sub);
void HistTitleSum(LWHist2D* hist);
void FillSaturation(partition& sub);
+ void FillSaturationLow(partition& sub);
void FillOutOfRange(partition& sub);
void FillAverMaxDig(partition& sub, int& i, float nrj, unsigned int& m_l1Trig,unsigned int& lumiblock);
void FillSumary(partition& sub);
diff --git a/LArCalorimeter/LArMonTools/LArMonTools/LArFEBMon.h b/LArCalorimeter/LArMonTools/LArMonTools/LArFEBMon.h
index 6b1f6c271b3..1665726640b 100755
--- a/LArCalorimeter/LArMonTools/LArMonTools/LArFEBMon.h
+++ b/LArCalorimeter/LArMonTools/LArMonTools/LArFEBMon.h
@@ -20,15 +20,16 @@
#include "LArMonTools/LArOnlineIDStrHelper.h"
#include "TrigDecisionTool/TrigDecisionTool.h"
-#include "LWHists/TH1I_LW.h"
-#include "LWHists/TH2I_LW.h"
-#include "LWHists/TH1F_LW.h"
-#include "LWHists/TH2F_LW.h"
-#include "LWHists/TProfile2D_LW.h"
-#include "LWHists/TProfile_LW.h"
+//#include "LWHists/TH1I_LW.h"
+//#include "LWHists/TH2I_LW.h"
+//#include "LWHists/TH1F_LW.h"
+//#include "LWHists/TH2F_LW.h"
+//#include "LWHists/TProfile2D_LW.h"
+//#include "LWHists/TProfile_LW.h"
class TH1I_LW;
class TH1F_LW;
+class TH2F_LW;
class TH2I_LW;
class TProfile2D_LW;
class TProfile_LW;
diff --git a/LArCalorimeter/LArMonTools/LArMonTools/LArRawChannelMonTool.h b/LArCalorimeter/LArMonTools/LArMonTools/LArRawChannelMonTool.h
index 8b5414bffb2..89854dbadfa 100755
--- a/LArCalorimeter/LArMonTools/LArMonTools/LArRawChannelMonTool.h
+++ b/LArCalorimeter/LArMonTools/LArMonTools/LArRawChannelMonTool.h
@@ -283,9 +283,9 @@ template <class HANDLE>
bool LArRawChannelMonTool::RetrieveHandle( const HANDLE& handle )
{
if ( handle.retrieve().isSuccess() ) {
- msg(MSG::DEBUG) << "successfully retrieved: " << handle << endreq;
+ msg(MSG::DEBUG) << "successfully retrieved: " << handle << endmsg;
} else {
- msg(MSG::ERROR) << "unable to retrieve: " << handle << endreq;
+ msg(MSG::ERROR) << "unable to retrieve: " << handle << endmsg;
return false;
}
return true;
diff --git a/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py
index feba188844c..d30e83ce228 100755
--- a/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py
@@ -22,6 +22,7 @@ if 'EventBlockSize' not in dir():
EventBlockSize=0
# --- LArCollisionTimeMon configuration ---
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
from LArMonTools.LArMonToolsConf import LArCollisionTimeMonTool
LArCollisionTimeMon = LArCollisionTimeMonTool(
# --- Configure mon tool ---
@@ -30,7 +31,8 @@ LArCollisionTimeMon = LArCollisionTimeMonTool(
nCells = 1,# Needs at least >=2 cells to get rid of electronic noise
m_lumi_blocks = 3000,
BunchCrossingTool = theBunchCrossingTool,
- TrainFrontDistance = 20
+ TrainFrontDistance = 20,
+ IsOnline = athenaCommonFlags.isOnline()
)
@@ -39,7 +41,8 @@ LArCluCollTimeMonTool=LArCollisionTimeMonTool(Key="ClusterCollTime",
nCells=0,
m_lumi_blocks=3000,
BunchCrossingTool = theBunchCrossingTool,
- TrainFrontDistance = 20
+ TrainFrontDistance = 20,
+ IsOnline = athenaCommonFlags.isOnline()
)
diff --git a/LArCalorimeter/LArMonTools/src/LArAffectedRegions.cxx b/LArCalorimeter/LArMonTools/src/LArAffectedRegions.cxx
index 18c02717cfd..dc91668763b 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" << endreq;
+ msg(MSG::INFO) << "Initialize LArAffectedRegions" << endmsg;
// End Initialize
ManagedMonitorToolBase::initialize().ignore();
- if ( msg().level() <= MSG::DEBUG ) msg(MSG::DEBUG) << "Successful Initialize LArAffectedRegions " << endreq;
+ if ( msg().level() <= MSG::DEBUG ) msg(MSG::DEBUG) << "Successful Initialize LArAffectedRegions " << endmsg;
return StatusCode::SUCCESS;
}
@@ -104,7 +104,7 @@ LArAffectedRegions::initialize()
StatusCode
LArAffectedRegions::bookHistograms()
{
- if ( msg().level() <= MSG::DEBUG ) msg(MSG::DEBUG) << "in bookHists()" << endreq;
+ if ( msg().level() <= MSG::DEBUG ) msg(MSG::DEBUG) << "in bookHists()" << endmsg;
// 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()" << endreq;
+ if (debug) msg(MSG::DEBUG) << "in fillHists()" << endmsg;
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 " << endreq;
+ msg(MSG::WARNING) << " Cannot find LArAffectedRegion in DetectorStore " << endmsg;
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:" << endreq;
+ msg(MSG::DEBUG) << " Print list of affected regions:" << endmsg;
msg(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() << endreq;
+ << region->get_layer_min() << " " << region->get_layer_max() << " " << region->get_problem() << endmsg;
}
/////////////////////////////////
// Build Affected Regions maps //
@@ -283,12 +283,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsEMBPS[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsEMBPS[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/32);
}
@@ -299,12 +299,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsEMBPS[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsEMBPS[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/32);
}
@@ -313,12 +313,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsEMBPS[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsEMBPS[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/32);
}
@@ -338,12 +338,12 @@ LArAffectedRegions::fillHistograms()
if(eta >=0){
m_hLArAffectedRegionsEMB[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta <0){
m_hLArAffectedRegionsEMB[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/128);
}
@@ -354,12 +354,12 @@ LArAffectedRegions::fillHistograms()
if(eta >=0){
m_hLArAffectedRegionsEMB[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta <0){
m_hLArAffectedRegionsEMB[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/128);
}
@@ -368,12 +368,12 @@ LArAffectedRegions::fillHistograms()
if(eta >=0){
m_hLArAffectedRegionsEMB[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta <0){
m_hLArAffectedRegionsEMB[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMBC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/128);
}
@@ -393,12 +393,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsEMECPS[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsEMECPS[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/64);
}
@@ -409,12 +409,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsEMECPS[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsEMECPS[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/64);
}
@@ -423,12 +423,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsEMECPS[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECAPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsEMECPS[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECCPS " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/64);
}
@@ -449,12 +449,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsEMEC[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsEMEC[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/256);
}
@@ -465,12 +465,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsEMEC[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsEMEC[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/256);
}
@@ -479,12 +479,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsEMEC[0]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsEMEC[1]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "EMECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/256);
}
@@ -505,12 +505,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsHECA[layermin-8]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "HECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsHECC[layermin-8]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "HECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/32);
}
@@ -521,12 +521,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsHECA[layermin-8]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "HECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsHECC[layermin-8]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "HECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/32);
}
@@ -535,12 +535,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsHECA[layermin-8]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "HECA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsHECC[layermin-8]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "HECC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/32);
}
@@ -557,12 +557,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsFCALA[layermin-21]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "FCALA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsFCALC[layermin-21]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "FCALC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/16);
}
@@ -573,12 +573,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsFCALA[layermin-21]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "FCALA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsFCALC[layermin-21]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "FCALC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/16);
}
@@ -587,12 +587,12 @@ LArAffectedRegions::fillHistograms()
if(eta>=0){
m_hLArAffectedRegionsFCALA[layermin-21]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "FCALA " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
if(eta<0){
m_hLArAffectedRegionsFCALC[layermin-21]->Fill(eta,phi,problem);
if (debug) msg(MSG::DEBUG) << "FCALC " << eta << " " << phi << " " << problem << " "
- << layermin << " " << layermax << " " << region << endreq;
+ << layermin << " " << layermax << " " << region << endmsg;
}
phi+=(2*TMath::Pi()/16);
}
@@ -607,7 +607,7 @@ LArAffectedRegions::fillHistograms()
StatusCode LArAffectedRegions::procHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In procHistograms " << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In procHistograms " << endmsg;
return StatusCode::SUCCESS;
}
diff --git a/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx
index 7409eaa2a5e..5d9d95bb9ec 100755
--- a/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArCollisionTimeMonTool.cxx
@@ -26,6 +26,9 @@
#include <utility>
#include <algorithm>
+#include "LWHists/TH1F_LW.h"
+#include "LWHists/TH2F_LW.h"
+
#include "LArMonTools/LArCollisionTimeMonTool.h"
#include "LArRecEvent/LArCollisionTime.h"
@@ -58,7 +61,8 @@ LArCollisionTimeMonTool::LArCollisionTimeMonTool(const std::string& type,
declareProperty( "Key" , m_key="LArCollisionTime");
declareProperty( "histPath" , m_histPath="LArCollisionTime");
declareProperty( "BunchCrossingTool" , m_bunchGroupTool);
- declareProperty( "TrainFrontDistance" , m_distance = 30);
+ declareProperty( "TrainFrontDistance" , m_distance = 30);
+ declareProperty( "IsOnline" , m_IsOnline=false);
m_eventsCounter = 0;
@@ -83,7 +87,7 @@ LArCollisionTimeMonTool::initialize() {
ManagedMonitorToolBase::initialize().ignore();
CHECK(m_bunchGroupTool.retrieve());
- msg(MSG::DEBUG) << "Successful Initialize LArCollisionTimeMonTool " << endreq;
+ msg(MSG::DEBUG) << "Successful Initialize LArCollisionTimeMonTool " << endmsg;
return StatusCode::SUCCESS;
}
@@ -91,29 +95,32 @@ LArCollisionTimeMonTool::initialize() {
StatusCode
LArCollisionTimeMonTool::bookHistograms() {
+ if(m_IsOnline) m_nhist=2; else m_nhist=1;
// So far 2 histos, all bcid and inside the train
- m_LArCollTime_h=new TH1F*[m_nhist];
- m_LArCollAvgTime_h=new TH1F*[m_nhist];
- m_LArCollTime_lb_h=new TH1F*[m_nhist];
- m_LArCollTime_lb_timeCut_h=new TH1F*[m_nhist];
- m_LArCollTime_lb_singlebeam_timeCut_h=new TH1F*[m_nhist];
- m_LArCollTime_vs_LB_h=new TH2F*[m_nhist];
- m_LArCollTime_vs_BCID_h=new TH2F*[m_nhist];
- m_LArCollAvgTime_vs_LB_h=new TH2F*[m_nhist];
- m_LArCollAvgTime_vs_BCID_h=new TH2F*[m_nhist];
+ m_LArCollTime_h=new TH1F_LW*[m_nhist];
+ m_LArCollAvgTime_h=new TH1F_LW*[m_nhist];
+ m_LArCollTime_lb_h=new TH1F_LW*[m_nhist];
+ m_LArCollTime_lb_timeCut_h=new TH1F_LW*[m_nhist];
+ m_LArCollTime_lb_singlebeam_timeCut_h=new TH1F_LW*[m_nhist];
+ m_LArCollTime_vs_LB_h=new TH2F_LW*[m_nhist];
+ m_LArCollTime_vs_BCID_h=new TH2F_LW*[m_nhist];
+ m_LArCollAvgTime_vs_LB_h=new TH2F_LW*[m_nhist];
+ m_LArCollAvgTime_vs_BCID_h=new TH2F_LW*[m_nhist];
- std::vector<std::string> hnameadd(m_nhist); hnameadd={"","_intrain"};
- std::vector<std::string> htitadd(m_nhist); htitadd={"",", inside the train"};
+ std::vector<std::string> hnameadd(m_nhist);
+ if(m_IsOnline) hnameadd={"","_intrain"}; else hnameadd={""};
+ std::vector<std::string> htitadd(m_nhist);
+ if(m_IsOnline) htitadd={"",", inside the train"}; else htitadd={""};
MonGroup generalGroupShift( this, "/LAr/"+m_histPath+"/", run, ATTRIB_MANAGED);
- MonGroup generalGroupLB( this, "/LAr/"+m_histPath+"/", run, ATTRIB_X_VS_LB);
+ MonGroup generalGroupLB( this, "/LAr/"+m_histPath+"/", run, ATTRIB_X_VS_LB, "", "merge");
//if(isNewRun ){ // Commented by B.Trocme to comply with new ManagedMonitorToolBase
newrun=true;
//
// Create top folder for histos
//
for(unsigned i=0; i<m_nhist; ++i) {
- m_LArCollTime_h[i] = new TH1F(("LArCollTime"+hnameadd[i]).data(),
+ m_LArCollTime_h[i] = TH1F_LW::create(("LArCollTime"+hnameadd[i]).data(),
("LArCollisionTime - difference of avg time from ECC and ECA"+htitadd[i]).data(),
101, -50.5, 50.5 );
@@ -121,7 +128,7 @@ LArCollisionTimeMonTool::bookHistograms() {
m_LArCollTime_h[i]->GetXaxis()->SetTitle("<t_{C}> - <t_{A}> (ns)");
generalGroupShift.regHist(m_LArCollTime_h[i]).ignore();
- m_LArCollTime_lb_h[i] = new TH1F(("LArCollTimeLumiBlock"+hnameadd[i]).data(),
+ m_LArCollTime_lb_h[i] = TH1F_LW::create(("LArCollTimeLumiBlock"+hnameadd[i]).data(),
("LArCollisionTime - difference of avg time from ECC and ECA"+htitadd[i]).data(),
101, -50.5, 50.5 );
@@ -131,7 +138,7 @@ LArCollisionTimeMonTool::bookHistograms() {
- m_LArCollTime_vs_LB_h[i] = new TH2F(("LArCollTime_vs_LB"+hnameadd[i]).data(),
+ m_LArCollTime_vs_LB_h[i] = TH2F_LW::create(("LArCollTime_vs_LB"+hnameadd[i]).data(),
("LArCollisionTime Vs Luminosity Block - difference of avg time of ECC and ECA as a function of luminosity block"+htitadd[i]).data(),
m_lumi_blocks, 0.5, double(m_lumi_blocks)+0.5, 101, -50.5, 50.5 );
@@ -140,7 +147,7 @@ LArCollisionTimeMonTool::bookHistograms() {
m_LArCollTime_vs_LB_h[i]->GetZaxis()->SetTitle("Number of events (weighted by energy/GeV)");
generalGroupLB.regHist(m_LArCollTime_vs_LB_h[i]).ignore();
- m_LArCollTime_vs_BCID_h[i] = new TH2F(("LArCollTime_vs_BCID"+hnameadd[i]).data(),
+ m_LArCollTime_vs_BCID_h[i] = TH2F_LW::create(("LArCollTime_vs_BCID"+hnameadd[i]).data(),
("LArCollisionTime Vs BCID - difference of avg time of ECC and ECA as a function of BCID"+htitadd[i]).data(),
3564, 0.5, 3564.5, 101, -50.5, 50.5 );
@@ -151,7 +158,7 @@ LArCollisionTimeMonTool::bookHistograms() {
// Average Time
- m_LArCollAvgTime_h[i] = new TH1F(("LArCollAvgTime"+hnameadd[i]).data(),
+ m_LArCollAvgTime_h[i] = TH1F_LW::create(("LArCollAvgTime"+hnameadd[i]).data(),
("LArCollisionAverageTime - avg time of ECC and ECA"+htitadd[i]).data(),
320, -40., 40. );
@@ -159,7 +166,7 @@ LArCollisionTimeMonTool::bookHistograms() {
m_LArCollAvgTime_h[i]->GetXaxis()->SetTitle("(<t_{C}> + <t_{A}>) / 2 (ns)");
generalGroupShift.regHist(m_LArCollAvgTime_h[i]).ignore();
- m_LArCollAvgTime_vs_LB_h[i] = new TH2F(("LArCollAvgTime_vs_LB"+hnameadd[i]).data(),
+ m_LArCollAvgTime_vs_LB_h[i] = TH2F_LW::create(("LArCollAvgTime_vs_LB"+hnameadd[i]).data(),
("LArCollisionAvgTime Vs Luminosity Block - avg time of ECC and ECA as a function of luminosity block"+htitadd[i]).data(),
m_lumi_blocks, 0.5, double(m_lumi_blocks)+0.5, 320, -40., 40. );
@@ -168,7 +175,7 @@ LArCollisionTimeMonTool::bookHistograms() {
m_LArCollAvgTime_vs_LB_h[i]->GetZaxis()->SetTitle("Number of events (weighted by energy/GeV)");
generalGroupLB.regHist(m_LArCollAvgTime_vs_LB_h[i]).ignore();
- m_LArCollAvgTime_vs_BCID_h[i] = new TH2F(("LArCollAvgTime_vs_BCID"+hnameadd[i]).data(),
+ m_LArCollAvgTime_vs_BCID_h[i] = TH2F_LW::create(("LArCollAvgTime_vs_BCID"+hnameadd[i]).data(),
("LArCollisionAvgTime Vs BCID - avg time of ECC and ECA as a function of luminosity block"+htitadd[i]).data(),
m_lumi_blocks, 0.5, double(m_lumi_blocks)+0.5, 320, -40., 40. );
@@ -178,7 +185,7 @@ LArCollisionTimeMonTool::bookHistograms() {
generalGroupShift.regHist(m_LArCollAvgTime_vs_BCID_h[i]).ignore();
//Monitoring events as a function of LB when events lie in a time window of +/-10ns
- m_LArCollTime_lb_timeCut_h[i] = new TH1F(("LArCollTimeLumiBlockTimeCut"+hnameadd[i]).data(),
+ m_LArCollTime_lb_timeCut_h[i] = TH1F_LW::create(("LArCollTimeLumiBlockTimeCut"+hnameadd[i]).data(),
("Events with abs(<t_{C}> - <t_{A}>) < 10ns as a function of LB"+htitadd[i]).data(),
m_lumi_blocks, 0.5, double(m_lumi_blocks)+0.5 );
@@ -187,7 +194,7 @@ LArCollisionTimeMonTool::bookHistograms() {
generalGroupShift.regHist(m_LArCollTime_lb_timeCut_h[i]).ignore();
//Monitoring events as a function of LB when events lie in a time window of +/-[20-30]ns
- m_LArCollTime_lb_singlebeam_timeCut_h[i] = new TH1F(("LArCollTimeLumiBlockSingleBeamTimeCut"+hnameadd[i]).data(),
+ m_LArCollTime_lb_singlebeam_timeCut_h[i] = TH1F_LW::create(("LArCollTimeLumiBlockSingleBeamTimeCut"+hnameadd[i]).data(),
("Events with 20 ns < abs(<t_{C}> - <t_{A}>) < 30ns as a function of LB"+htitadd[i]).data(),
m_lumi_blocks, 0.5, double(m_lumi_blocks)+0.5 );
@@ -207,7 +214,7 @@ LArCollisionTimeMonTool::bookHistograms() {
StatusCode
LArCollisionTimeMonTool::fillHistograms()
{
- msg(MSG::DEBUG) << "in fillHists()" << endreq;
+ msg(MSG::DEBUG) << "in fillHists()" << endmsg;
// Increment event counter
m_eventsCounter++;
@@ -218,7 +225,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" << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve EventInfo object" << endmsg;
return StatusCode::FAILURE;
}
@@ -229,8 +236,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" <<endreq;
- msg(MSG::INFO) <<"BCID: "<<bunch_crossing_id<<" empty ? not filling the coll. time" <<endreq;
+ //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;
return StatusCode::SUCCESS; // not filling anything in empty bunches
}
@@ -240,10 +247,10 @@ LArCollisionTimeMonTool::fillHistograms()
const LArCollisionTime * larTime;
if(evtStore()->retrieve(larTime,m_key).isFailure())
{
- msg(MSG::WARNING) << "Unable to retrieve LArCollisionTime event store" << endreq;
+ msg(MSG::WARNING) << "Unable to retrieve LArCollisionTime event store" << endmsg;
return StatusCode::SUCCESS; // Check if failure shd be returned. VB
} else {
- msg(MSG::DEBUG) << "LArCollisionTime successfully retrieved from event store" << endreq;
+ msg(MSG::DEBUG) << "LArCollisionTime successfully retrieved from event store" << endmsg;
}
if (larTime and !(event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,3))) {// Do not fill histo if noise burst suspected
@@ -262,8 +269,8 @@ LArCollisionTimeMonTool::fillHistograms()
m_LArCollAvgTime_vs_BCID_h[0]->Fill(bunch_crossing_id, m_ECTimeAvg,weight);
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(bcid_distance > m_distance) { // fill histos inside the train
- msg(MSG::INFO) <<"BCID: "<<bunch_crossing_id<<" distance from Front: "<<bcid_distance<<"Filling in train..."<<endreq;
+ 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;
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);
@@ -284,11 +291,11 @@ LArCollisionTimeMonTool::fillHistograms()
StatusCode LArCollisionTimeMonTool::procHistograms()
{
- if(endOfLumiBlock ){
+ if(endOfLumiBlockFlag() ){
// For online monitoring, reset the histogram after Lumi block finishes
for(unsigned i=0; i<m_nhist; ++i) m_LArCollTime_lb_h[i]->Reset();
}
- msg(MSG::DEBUG) << "End of procHistograms " << endreq;
+ msg(MSG::DEBUG) << "End of procHistograms " << endmsg;
return StatusCode::SUCCESS;
}
diff --git a/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArCosmicsMonTool.cxx
index 66bdfa18067..def92dd304d 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" << endreq;
+ msg(MSG::INFO) << "Initialize LArCosmicsMonTool" << endmsg;
StatusCode sc;
sc = detStore()->retrieve(m_LArOnlineIDHelper, "LArOnlineID");
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endreq;
+ msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endmsg;
return sc;
}
// Retrieve ID helpers
sc = detStore()->retrieve( m_caloIdMgr );
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get CaloIdMgr" << endreq;
+ msg(MSG::FATAL) << "Could not get CaloIdMgr" << endmsg;
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 "<< endreq;
+ msg(MSG::FATAL) << "Could not get CaloDetDescrMgr "<< endmsg;
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" << endreq;
+ msg(MSG::ERROR) << "Could not retrieve LArCablingService" << endmsg;
return StatusCode::FAILURE;
}
// initialize monitoring bookkeeping info
sc = this->initMonInfo();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not initialize monitoring bookkeeping info" << endreq;
+ msg(MSG::ERROR) << "Could not initialize monitoring bookkeeping info" << endmsg;
}
// End Initialize
ManagedMonitorToolBase::initialize().ignore();
- msg(MSG::DEBUG) << "Successful Initialize LArCosmicsMonTool " << endreq;
+ msg(MSG::DEBUG) << "Successful Initialize LArCosmicsMonTool " << endmsg;
return StatusCode::SUCCESS;
}
@@ -156,7 +156,7 @@ LArCosmicsMonTool::initialize()
StatusCode
LArCosmicsMonTool::bookHistograms() {
- msg(MSG::DEBUG) << "in bookHists()" << endreq;
+ msg(MSG::DEBUG) << "in bookHists()" << endmsg;
// 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()" << endreq;
+ msg(MSG::DEBUG) << "in fillHists()" << endmsg;
StatusCode sc;
// Increment event counter
@@ -268,7 +268,7 @@ LArCosmicsMonTool::fillHistograms() {
sc = evtStore()->retrieve(pLArDigitContainer, m_LArDigitContainerKey);
if (sc.isFailure()) {
msg(MSG::WARNING) << "Can\'t retrieve LArDigitContainer with key "
- << m_LArDigitContainerKey << endreq;
+ << m_LArDigitContainerKey << endmsg;
return StatusCode::SUCCESS;
}
@@ -276,7 +276,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!" << endreq;
+ msg(MSG::ERROR) << "Cannot retrieve pedestal(s) from Conditions Store!" << endmsg;
}
m_newrun=false;
}
@@ -297,7 +297,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" << endreq;
+ msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates" << endmsg;
continue;
}
@@ -428,20 +428,20 @@ LArCosmicsMonTool::fillHistograms() {
StatusCode LArCosmicsMonTool::procHistograms()
{
- msg(MSG::DEBUG) << "End of procHistograms " << endreq;
+ msg(MSG::DEBUG) << "End of procHistograms " << endmsg;
return StatusCode::SUCCESS;
}
/*---------------------------------------------------------*/
StatusCode LArCosmicsMonTool::initMonInfo()
{
- msg(MSG::DEBUG) << "in initMonInfo()" << endreq;
+ msg(MSG::DEBUG) << "in initMonInfo()" << endmsg;
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 " << endreq;
+ msg(MSG::DEBUG) << "Init Monitoring ended successfully " << endmsg;
return StatusCode::SUCCESS;
}
diff --git a/LArCalorimeter/LArMonTools/src/LArCoverage.cxx b/LArCalorimeter/LArMonTools/src/LArCoverage.cxx
index bc3a2f98a0a..8a5dad1f444 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" << endreq;
+ msg(MSG::INFO) << "Initialize LArCoverage" << endmsg;
StatusCode sc;
sc = detStore()->retrieve(m_LArOnlineIDHelper, "LArOnlineID");
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endreq;
+ msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endmsg;
return sc;
}
// Retrieve ID helpers
sc = detStore()->retrieve( m_caloIdMgr );
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get CaloIdMgr" << endreq;
+ msg(MSG::FATAL) << "Could not get CaloIdMgr" << endmsg;
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 "<< endreq;
+ msg(MSG::FATAL) << "Could not get CaloDetDescrMgr "<< endmsg;
return sc;
}
// Get BadChannelTool
sc=m_badChannelTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve LArBadChannelTool " << m_badChannelTool << endreq;
+ msg(MSG::ERROR) << "Could not retrieve LArBadChannelTool " << m_badChannelTool << endmsg;
return StatusCode::FAILURE;
} else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "LArBadChannelTool" << m_badChannelTool << " retrieved" << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "LArBadChannelTool" << m_badChannelTool << " retrieved" << endmsg;
}
// Get bad-channel mask
sc=m_badChannelMask.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve BadChannelMask" << m_badChannelMask<< endreq;
+ msg(MSG::ERROR) << "Could not retrieve BadChannelMask" << m_badChannelMask<< endmsg;
return StatusCode::FAILURE;
}
// Get LAr Cabling Service
sc=m_larCablingService.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve LArCablingService" << endreq;
+ msg(MSG::ERROR) << "Could not retrieve LArCablingService" << endmsg;
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 << endreq;
+ msg(MSG::FATAL) << "Failed to retrieve tool " << m_caloNoiseTool << endmsg;
return StatusCode::FAILURE;
} else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved tool " << m_caloNoiseTool << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Retrieved tool " << m_caloNoiseTool << endmsg;
}
// End Initialize
ManagedMonitorToolBase::initialize().ignore();
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Successful Initialize LArCoverage " << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Successful Initialize LArCoverage " << endmsg;
return StatusCode::SUCCESS;
}
@@ -180,14 +180,14 @@ LArCoverage::initialize()
StatusCode
LArCoverage::bookHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in bookHists()" << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in bookHists()" << endmsg;
// 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!" << endreq;
+ msg(MSG::WARNING) << "No EventInfo object found! Can't read run number!" << endmsg;
else{
lb1 = thisEventInfo->lumiBlock();
}
@@ -601,7 +601,7 @@ LArCoverage::bookHistograms()
StatusCode
LArCoverage::fillHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in fillHists()" << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in fillHists()" << endmsg;
static CaloPhiRange m_phiHelper;
m_eventsCounter++;
@@ -612,7 +612,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 <<endreq;
+ msg(MSG::WARNING) << "Can\'t retrieve LArRawChannelContainer with key " << m_channelKey <<endmsg;
return StatusCode::SUCCESS;
}
@@ -640,7 +640,7 @@ LArCoverage::fillHistograms()
float etaChan = 0; float phiChan = 0.;
const CaloDetDescrElement* m_CaloDetElement = m_CaloDetDescrMgr->get_element(offlineID);
if(m_CaloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endreq;
+ msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
continue;
}else{
etaChan = m_CaloDetElement->eta_raw();
@@ -830,7 +830,7 @@ LArCoverage::fillHistograms()
StatusCode LArCoverage::procHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In procHistograms " << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In procHistograms " << endmsg;
return StatusCode::SUCCESS;
@@ -912,7 +912,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* m_CaloDetDescr
float eta, phi;
const CaloDetDescrElement* m_CaloDetElement = m_CaloDetDescrMgr->get_element(offid);
if(m_CaloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endreq;
+ msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
continue;
}else{
eta = m_CaloDetElement->eta_raw();
@@ -944,7 +944,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* m_CaloDetDescr
float eta, phi;
const CaloDetDescrElement* m_CaloDetElement = m_CaloDetDescrMgr->get_element(offid);
if(m_CaloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endreq;
+ msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
continue;
}else{
eta = m_CaloDetElement->eta_raw();
@@ -981,7 +981,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* m_CaloDetDescr
float eta, phi;
const CaloDetDescrElement* m_CaloDetElement = m_CaloDetDescrMgr->get_element(offid);
if(m_CaloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endreq;
+ msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
continue;
}else{
eta = m_CaloDetElement->eta_raw();
@@ -1013,7 +1013,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* m_CaloDetDescr
float eta, phi;
const CaloDetDescrElement* m_CaloDetElement = m_CaloDetDescrMgr->get_element(offid);
if(m_CaloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endreq;
+ msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
continue;
}else{
eta = m_CaloDetElement->eta_raw();
@@ -1079,7 +1079,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* m_CaloDetDescr
float eta, phi;
const CaloDetDescrElement* m_CaloDetElement = m_CaloDetDescrMgr->get_element(offid);
if(m_CaloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endreq;
+ msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
continue;
}else{
eta = m_CaloDetElement->eta_raw();
@@ -1111,7 +1111,7 @@ void LArCoverage::FillKnownMissingFEBs(const CaloDetDescrManager* m_CaloDetDescr
float eta, phi;
const CaloDetDescrElement* m_CaloDetElement = m_CaloDetDescrMgr->get_element(offid);
if(m_CaloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endreq;
+ msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
continue;
}else{
eta = m_CaloDetElement->eta_raw();
diff --git a/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx b/LArCalorimeter/LArMonTools/src/LArDigitMon.cxx
index 0c7b1b2a056..3947c2df91d 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" << endreq;
+ msg(MSG::INFO)<<"Finalize LArDigitMon" << endmsg;
DeleteHist(BarrelA);
DeleteHist(BarrelC);
DeleteHist(EmecA);
@@ -145,7 +145,7 @@ StatusCode
LArDigitMon::initialize()
{
- msg(MSG::INFO)<<"Initialize LArDigitMon" << endreq;
+ msg(MSG::INFO)<<"Initialize LArDigitMon" << endmsg;
StatusCode sc;
@@ -156,7 +156,7 @@ LArDigitMon::initialize()
} else {
- msg(MSG::FATAL) << "unable to connect non-tool: LArOnlineID" << endreq;
+ msg(MSG::FATAL) << "unable to connect non-tool: LArOnlineID" << endmsg;
return StatusCode::FAILURE;
}
@@ -169,7 +169,7 @@ LArDigitMon::initialize()
} else {
- msg(MSG::FATAL) << "unable to connect non-tool: LArEM_ID" << endreq;
+ msg(MSG::FATAL) << "unable to connect non-tool: LArEM_ID" << endmsg;
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" << endreq;
+ msg(MSG::ERROR) << "Could not retrieve LArCablingService" << endmsg;
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<< endreq;
+ msg(MSG::ERROR) << "Could not retrieve BadChannelMask" << m_badChannelMask<< endmsg;
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 " << endreq;
+ msg(MSG::ERROR) << "could not register handle for pedestal " << endmsg;
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 " <<endreq;
+ msg(MSG::WARNING) << "Can't retrieve LArNoisyROSummary " <<endmsg;
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" << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve EventInfo object" << endmsg;
return StatusCode::FAILURE;
}
@@ -330,7 +330,7 @@ LArDigitMon::fillHistograms()
sc = evtStore()->retrieve(pLArDigitContainer, m_LArDigitContainerKey);
if (sc.isFailure()) {
msg(MSG::WARNING) << "Can\'t retrieve LArDigitContainer with key "
- << m_LArDigitContainerKey << endreq;
+ << m_LArDigitContainerKey << endmsg;
return StatusCode::SUCCESS;
}
@@ -529,7 +529,7 @@ StatusCode LArDigitMon::procHistograms()
{
/** Don't do anything*/
- if(endOfRun || endOfEventsBlock)
+ if(endOfRunFlag() || endOfEventsBlockFlag() )
{
FillSumary(BarrelA);
FillSumary(BarrelC);
@@ -540,7 +540,7 @@ StatusCode LArDigitMon::procHistograms()
FillSumary(FcalA);
FillSumary(FcalC);
/** Properly Delete the LW hists*/
- if(endOfRun){
+ if(endOfRunFlag()){
EndOfRun(BarrelA);
EndOfRun(BarrelC);
EndOfRun(EmecA);
@@ -621,12 +621,22 @@ void LArDigitMon::BookPartitions(partition& sub, const std::string& PartitionNam
hName =hName+PartitionName;
std::string hTitle=titlesat+" Med/High Gain - "+PartitionName;
sub.m_SatDigit = TH2I_LW::create(hName.c_str(), hTitle.c_str(),slot,slot_low,slot_up,FEB,FEB_low,FEB_up);
+ hName = "tSaturationLow_";
+ hName =hName+PartitionName;
+ hTitle=titlesat+" Low Gain - "+PartitionName;
+ sub.m_SatDigitLow = TH2I_LW::create(hName.c_str(), hTitle.c_str(),slot,slot_low,slot_up,FEB,FEB_low,FEB_up);
hName = "Saturation_";
hName =hName+PartitionName;
hTitle=titlesat+PartitionName;
sub.m_PSatDigit = TProfile2D_LW::create(hName.c_str(),hTitle.c_str(),slot,slot_low,slot_up,FEB,FEB_low,FEB_up);
ExpertGroup.regHist(sub.m_PSatDigit).ignore();
m_strHelper->definePartitionSummProp(sub.m_PSatDigit).ignore();
+ hName = "SaturationLow_";
+ hName =hName+PartitionName;
+ hTitle=titlesat+PartitionName;
+ sub.m_PSatDigitLow = TProfile2D_LW::create(hName.c_str(),hTitle.c_str(),slot,slot_low,slot_up,FEB,FEB_low,FEB_up);
+ ExpertGroup.regHist(sub.m_PSatDigitLow).ignore();
+ m_strHelper->definePartitionSummProp(sub.m_PSatDigitLow).ignore();
hName = "tNullDigit_";
hName =hName+PartitionName;
@@ -656,6 +666,12 @@ void LArDigitMon::BookPartitions(partition& sub, const std::string& PartitionNam
sub.m_SatDigitChan = TH2F_LW::create(hName.c_str(), hTitle.c_str(),crates,crates_low,crates_up,chan,chan_low,chan_up);
ExpertGroupEff.regHist(sub.m_SatDigitChan).ignore();
m_strHelper->definePartitionSummProp2(sub.m_SatDigitChan).ignore();
+ hName = "SaturationChanLow_";
+ hName =hName+PartitionName;
+ hTitle=titlesatchan+PartitionName+" - Low Gain - All Stream";
+ sub.m_SatDigitChanLow = TH2F_LW::create(hName.c_str(), hTitle.c_str(),crates,crates_low,crates_up,chan,chan_low,chan_up);
+ ExpertGroupEff.regHist(sub.m_SatDigitChanLow).ignore();
+ m_strHelper->definePartitionSummProp2(sub.m_SatDigitChanLow).ignore();
hName = "NullDigitChan_";
hName =hName+PartitionName;
@@ -735,6 +751,7 @@ void LArDigitMon::BookPartitions(partition& sub, const std::string& PartitionNam
{
sub.m_Temp_NullDigitChan=TH2I_LW::create(("temp_NullDigit_"+PartitionName).c_str(), "",crates,crates_low,crates_up,chan,chan_low,chan_up);
sub.m_Temp_SatDigitChan=TH2I_LW::create(("temp_SatDigitChan_"+PartitionName).c_str(), "",crates,crates_low,crates_up,chan,chan_low,chan_up);
+ sub.m_Temp_SatDigitChanLow=TH2I_LW::create(("temp_SatDigitChanLow_"+PartitionName).c_str(), "",crates,crates_low,crates_up,chan,chan_low,chan_up);
sub.m_Temp_OutDigitChan=TH2I_LW::create(("temp_OutDigitChan_"+PartitionName).c_str(), "",crates,crates_low,crates_up,chan,chan_low,chan_up);
}
@@ -879,6 +896,15 @@ void LArDigitMon::FillSaturation(partition& sub)
else sub.m_SatDigitChan->Fill(m_slot+(numb*m_feedthrough),m_channel);
}
/*---------------------------------------------------------*/
+void LArDigitMon::FillSaturationLow(partition& sub)
+{
+ sub.m_SatDigitLow->Fill(m_slot,m_feedthrough);
+ int numb=15;
+ if(sub.sumpos==0||sub.sumpos==1) numb=14;
+ if(m_IsOnline) sub.m_Temp_SatDigitChanLow->Fill(m_slot+(numb*m_feedthrough),m_channel);
+ else sub.m_SatDigitChanLow->Fill(m_slot+(numb*m_feedthrough),m_channel);
+}
+/*---------------------------------------------------------*/
void LArDigitMon::FillNullHisto(partition& sub)
{
sub.m_NullDigit->Fill(m_slot,m_feedthrough);
@@ -909,12 +935,14 @@ void LArDigitMon::ScalePartition(partition& sub)
if(m_IsOnline){
DumpOnlineHisto(sub.m_Temp_NullDigitChan,sub.m_NullDigitChan);
DumpOnlineHisto(sub.m_Temp_SatDigitChan,sub.m_SatDigitChan);
+ DumpOnlineHisto(sub.m_Temp_SatDigitChanLow,sub.m_SatDigitChanLow);
DumpOnlineHisto(sub.m_Temp_OutDigitChan,sub.m_OutDigitChan);
}
// BT on 10/4/2015 : originally the DumpHisto was 4 lines before (see comments above).
// I have the feeling that the online normalisation was wrong.
DumpHisto(sub.m_NullDigit,sub.m_PNullDigit);
DumpHisto(sub.m_SatDigit,sub.m_PSatDigit);
+ DumpHisto(sub.m_SatDigitLow,sub.m_PSatDigitLow);
DumpHisto(sub.m_OutDigit,sub.m_POutDigit);
ATH_MSG_DEBUG("End of Scale Histograms " );
@@ -1026,6 +1054,10 @@ void LArDigitMon::EndOfRun(partition& sub)
sub.m_SatDigit->Reset() ;
}
+ if(sub.m_SatDigitLow){
+ sub.m_SatDigitLow->Reset() ;
+ }
+
if(m_IsOnline)
{
if(sub.m_Temp_NullDigitChan){
@@ -1036,6 +1068,10 @@ void LArDigitMon::EndOfRun(partition& sub)
sub.m_Temp_SatDigitChan->Reset();
}
+ if(sub.m_Temp_SatDigitChanLow){
+ sub.m_Temp_SatDigitChanLow->Reset();
+ }
+
if(sub.m_Temp_OutDigitChan){
sub.m_Temp_OutDigitChan->Reset();
}
@@ -1043,6 +1079,7 @@ void LArDigitMon::EndOfRun(partition& sub)
else{
ScaleHisto(sub.m_NullDigitChan,m_eventsCounter);
ScaleHisto(sub.m_SatDigitChan,m_eventsCounter);
+ ScaleHisto(sub.m_SatDigitChanLow,m_eventsCounter);
ScaleHisto(sub.m_OutDigitChan,m_eventsCounter);
}
}
@@ -1066,6 +1103,11 @@ void LArDigitMon::DeleteHist(partition& sub)
sub.m_SatDigit=0;
}
+ if(sub.m_SatDigitLow){
+ LWHist::safeDelete(sub.m_SatDigitLow);
+ sub.m_SatDigitLow=0;
+ }
+
if(m_IsOnline)
{
if(sub.m_Temp_NullDigitChan){
@@ -1078,6 +1120,11 @@ void LArDigitMon::DeleteHist(partition& sub)
sub.m_Temp_SatDigitChan=0;
}
+ if(sub.m_Temp_SatDigitChanLow){
+ LWHist::safeDelete(sub.m_Temp_SatDigitChanLow);
+ sub.m_Temp_SatDigitChanLow=0;
+ }
+
if(sub.m_Temp_OutDigitChan){
LWHist::safeDelete(sub.m_Temp_OutDigitChan);
sub.m_Temp_OutDigitChan=0;
diff --git a/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx b/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx
index 954155d2963..2bddd316234 100755
--- a/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArFEBMon.cxx
@@ -27,6 +27,12 @@
#include "LArCOOLConditions/LArDSPThresholdsFlat.h"
#include "TTree.h"
+#include "LWHists/TH1I_LW.h"
+#include "LWHists/TH2I_LW.h"
+#include "LWHists/TH1F_LW.h"
+#include "LWHists/TH2F_LW.h"
+#include "LWHists/TProfile2D_LW.h"
+#include "LWHists/TProfile_LW.h"
#include "LArMonTools/LArFEBMon.h"
@@ -83,7 +89,7 @@ LArFEBMon::LArFEBMon(const std::string& type,
m_eventsCounter = 0;
- for (int i = 0;i < nFEBnominal; i++) {
+ for (unsigned i = 0;i < nFEBnominal; i++) {
m_febInError[i] = NULL;
m_bfebIE[i] = false;
}
@@ -128,11 +134,11 @@ LArFEBMon::~LArFEBMon() {
// ********************************************************************
StatusCode LArFEBMon::initialize() {
- msg(MSG::INFO) << "Initializing LArFEBMon " << endreq;
+ msg(MSG::INFO) << "Initializing LArFEBMon " << endmsg;
StatusCode sc = detStore()->retrieve(m_onlineHelper, "LArOnlineID");
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not get LArOnlineID helper !" << endreq;
+ msg(MSG::ERROR) << "Could not get LArOnlineID helper !" << endmsg;
return StatusCode::FAILURE;
}
@@ -142,10 +148,10 @@ StatusCode LArFEBMon::initialize() {
// Get BadChannelTool
sc=m_badChannelTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve LArBadChannelTool " << m_badChannelTool << endreq;
+ msg(MSG::ERROR) << "Could not retrieve LArBadChannelTool " << m_badChannelTool << endmsg;
return StatusCode::FAILURE;
} else {
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "LArBadChannelTool" << m_badChannelTool << " retrieved" << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "LArBadChannelTool" << m_badChannelTool << " retrieved" << endmsg;
}
ManagedMonitorToolBase::initialize().ignore();
@@ -327,9 +333,9 @@ StatusCode LArFEBMon::bookHistograms() {
msg(MSG::INFO ) << "lvl1 item names: [";
for (unsigned int i=0;i< l1triggers.size();i++) {
- msg(MSG::INFO) << i << " " << l1triggers.at(i) << " , " << endreq;
+ msg(MSG::INFO) << i << " " << l1triggers.at(i) << " , " << endmsg;
}
- msg(MSG::INFO)<< "] " << endreq;
+ msg(MSG::INFO)<< "] " << endmsg;
if (l1triggers.size()>0) {m_trigok=true;} else {m_trigok=false;}
}
@@ -343,10 +349,10 @@ StatusCode LArFEBMon::bookHistograms() {
summaryGroup.regTree(m_CorruptTree).ignore();
// }
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "done with bookHists()" << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "done with bookHists()" << endmsg;
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Bookhists failed" << endreq;
+ msg(MSG::ERROR) << "Bookhists failed" << endmsg;
}
return sc;
@@ -370,7 +376,7 @@ StatusCode LArFEBMon::fillHistograms() {
const xAOD::EventInfo* thisEvent=0;
if(evtStore()->retrieve(thisEvent).isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve EventInfo object" << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve EventInfo object" << endmsg;
return StatusCode::FAILURE;
}
@@ -383,13 +389,13 @@ 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<<endreq;
+ //msg(MSG::INFO) << "LArFEBMon Lumi block: "<<lumi_block<<endmsg;
const LArFebHeaderContainer* hdrCont;
const LArFebErrorSummary* lArFebErrorSummary;
StatusCode sc = evtStore()->retrieve(hdrCont);
if (sc.isFailure() || !hdrCont) {
- msg(MSG::WARNING) << "No LArFebHeaderContainer found in TDS" << endreq;
+ msg(MSG::WARNING) << "No LArFebHeaderContainer found in TDS" << endmsg;
return sc;
}
@@ -400,7 +406,7 @@ StatusCode LArFEBMon::fillHistograms() {
sc=evtStore()->retrieve( lArFebErrorSummary, "LArFebErrorSummary");
if (sc.isFailure()) {
- msg(MSG::ERROR) << "No LArFebErrorSummary found in TDS" << endreq;
+ msg(MSG::ERROR) << "No LArFebErrorSummary found in TDS" << endmsg;
return StatusCode::FAILURE;
}
@@ -418,7 +424,7 @@ StatusCode LArFEBMon::fillHistograms() {
sc=detStore()->retrieve(dspThresh,m_keyDSPThresholds);
if(!sc.isSuccess()) {
msg(MSG::ERROR) <<" Failed to retrieve LArDSPThresholds with key " << m_keyDSPThresholds
- << ". Will not fill histograms" << endreq;
+ << ". Will not fill histograms" << endmsg;
}
else {
auto chIt=m_onlineHelper->channel_begin();
@@ -436,13 +442,13 @@ StatusCode LArFEBMon::fillHistograms() {
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." << endreq;
+ << ", containing DSP Thresholds. Will not fill histograms." << endmsg;
}
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." << endreq;
+ << ". Will not fill histograms." << endmsg;
}//end if not good
const IdentifierHash chanMax=m_onlineHelper->channelHashMax();
for (unsigned iChan=0;iChan<chanMax;++iChan) {
@@ -455,7 +461,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" << endreq;
+ msg(MSG::WARNING) << "No LArDSPThresholds key specificed. Will not fill these histograms" << endmsg;
}//end if eventsCounter==1
@@ -673,7 +679,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()) << endreq;
+ // msg(MSG::ERROR) << "ICI" << nbOfFeb << " " << m_nbOfFebBlocksTotal->GetBinLowEdge(m_nbOfFebBlocksTotal->GetMaximumBin()) << endmsg;
if (nbOfFebOK(nbOfFeb,m_nbOfFebBlocksTotal)){
// The nb of readout FEB is lower than the maximum number of FEBs observed in this run
@@ -902,7 +908,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 << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In bookNewPartitionSumm ->" << summName << endmsg;
MonGroup perPartitionGroup( this, "/LAr/FEBMon/perPartition", run, ATTRIB_MANAGED );
MonGroup perPartitionYieldGroup( this, "/LAr/FEBMon/perPartition", run, ATTRIB_MANAGED, "" , "weightedEff" );
@@ -1082,7 +1088,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" << endreq;
+ msg(MSG::FATAL) << "Unable to book partitions histograms" << endmsg;
}
}
return sc;
@@ -1093,18 +1099,18 @@ StatusCode
LArFEBMon::procHistograms()
{
- if (m_eventsCounter != 0 && endOfEventsBlock){
+ if (m_eventsCounter != 0 && endOfEventsBlockFlag()){
float scaleFactor = 100./((float) m_eventsCounter);
AddHistos(m_rejectedYield,m_rejectedHisto,m_rejectedHisto,scaleFactor,0.);
m_rejectedYield->SetEntries(m_eventsCounter);
}
// Reset now done manually to be sure it works online!
- // if (isEndOfLumiBlock){
+ // if (isEndOfLumiBlockFlag(){
// m_rejectedLBProfile->Reset();
// }
- if (endOfRun || endOfEventsBlock){
+ if (endOfRunFlag() || endOfEventsBlockFlag()){
// Book dynamically all FEBs in error
for (int iError = 1;iError<14;iError++){
fillFebInError(m_barrelCSummary,iError,0,0,"EMBC");
@@ -1118,7 +1124,7 @@ LArFEBMon::procHistograms()
}
}
- // if (isEndOfLumiBlock && m_iovStart!=0){
+ // if (isEndOfLumiBlockFlag() && m_iovStart!=0){
// m_iovStop=m_iovStop+1; // Add 1second to cope with time needed to resync the QPLL (S.Simion June LAr week)
// }
return StatusCode::SUCCESS;
@@ -1178,7 +1184,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" << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In fillFebInError" << endmsg;
// TH2I* tempHisto = TH2I_LW::create(*summ.parity);
@@ -1260,7 +1266,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!" << endreq;
+ if (sc.isFailure()) msg(MSG::ERROR) << "Failed to register Feb histogram!" << endmsg;
else m_bfebIE[hashId] = true;
}
m_febInError[hashId]->SetBinContent(errorType,binContent);
@@ -1280,7 +1286,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 << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in fillYieldHistos() - " << m_eventsCounter << endmsg;
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 9b5cdbc23a5..88747473c40 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" << endreq;
+ msg(MSG::INFO) << "Initialize LArHVCorrectionMonTool" << endmsg;
StatusCode sc;
sc = detStore()->retrieve(m_LArOnlineIDHelper, "LArOnlineID");
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endreq;
+ msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endmsg;
return sc;
}
// Retrieve HVCorrTool
sc = m_hvCorrTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to find tool for LArHVCorrTool" << endreq;
+ msg(MSG::ERROR) << "Unable to find tool for LArHVCorrTool" << endmsg;
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 " << endreq;
+ msg(MSG::ERROR) << "Unable to register handle to HVScaleCorr " << endmsg;
return StatusCode::FAILURE;
}
// Retrieve ID helpers
sc = detStore()->retrieve( m_caloIdMgr );
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get CaloIdMgr" << endreq;
+ msg(MSG::FATAL) << "Could not get CaloIdMgr" << endmsg;
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 "<< endreq;
+ msg(MSG::FATAL) << "Could not get CaloDetDescrMgr "<< endmsg;
return sc;
}
// Get LAr Cabling Service
sc=m_larCablingService.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve LArCablingService" << endreq;
+ msg(MSG::ERROR) << "Could not retrieve LArCablingService" << endmsg;
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 " << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "Successful Initialize LArHVCorrection " << endmsg;
return StatusCode::SUCCESS;
}
@@ -146,7 +146,7 @@ StatusCode LArHVCorrectionMonTool::initialize()
StatusCode
LArHVCorrectionMonTool::bookHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in bookHists()" << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in bookHists()" << endmsg;
// if(isNewRun){
@@ -260,7 +260,7 @@ LArHVCorrectionMonTool::bookHistograms()
// }// end isNewRun
// Reset event counter at the start of each LB
- if(newLumiBlock){
+ if(newLumiBlockFlag()){
m_eventsCounter = 0;
@@ -274,7 +274,7 @@ LArHVCorrectionMonTool::bookHistograms()
StatusCode
LArHVCorrectionMonTool::fillHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in fillHists()" << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "in fillHists()" << endmsg;
static CaloPhiRange m_phiHelper;
m_eventsCounter++;
@@ -284,7 +284,7 @@ LArHVCorrectionMonTool::fillHistograms()
// Retrieve event information
const xAOD::EventInfo* thisEventInfo;
if (evtStore()->retrieve(thisEventInfo).isFailure()) {
- msg(MSG::ERROR) << "Failed to retrieve EventInfo object" << endreq;
+ msg(MSG::ERROR) << "Failed to retrieve EventInfo object" << endmsg;
return StatusCode::FAILURE;
}
//const DataHandle<EventInfo> event_info;
@@ -299,7 +299,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 <<endreq;
+ msg(MSG::WARNING) << "Can't retrieve LArRawChannelContainer with key " << m_channelKey <<endmsg;
return StatusCode::SUCCESS;
}
@@ -321,7 +321,7 @@ LArHVCorrectionMonTool::fillHistograms()
float etaChan = 0; float phiChan = 0.;
const CaloDetDescrElement* m_CaloDetElement = m_CaloDetDescrMgr->get_element(offlineID);
if(m_CaloDetElement == 0 ){
- msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endreq;
+ msg(MSG::ERROR) << "Cannot retrieve (eta,phi) coordinates for raw channels" << endmsg;
continue;
}else{
etaChan = m_CaloDetElement->eta_raw();
@@ -334,13 +334,13 @@ LArHVCorrectionMonTool::fillHistograms()
// Retrieve HV correction info
float hvdev = 0;
float hvcorr = m_hvCorrTool->Scale(offlineID);
- //msg(MSG::VERBOSE) << "hvcorr" << hvcorr << endreq;
+ //msg(MSG::VERBOSE) << "hvcorr" << hvcorr << endmsg;
float hvonline = m_dd_HVScaleCorr->HVScaleCorr(offlineID);
if (hvonline<=0) continue; //No valid online correction
- //msg(MSG::VERBOSE) << "hvonline" << hvonline << endreq;
+ //msg(MSG::VERBOSE) << "hvonline" << hvonline << endmsg;
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 << endreq;
+ //msg(MSG::VERBOSE) << "hvdev" << hvdev << endmsg;
if (fabs(hvdev/hvonline)> m_threshold){
@@ -409,7 +409,7 @@ LArHVCorrectionMonTool::fillHistograms()
StatusCode LArHVCorrectionMonTool::procHistograms()
{
- if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In procHistograms " << endreq;
+ if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "In procHistograms " << endmsg;
// //
// // 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 4e79c07c644..c18ee964765 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" << endreq;
+ msg(MSG::FATAL) << "unable to retrieve LArOnlineID from detStore" << endmsg;
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 " << endreq;
+ msg(MSG::FATAL) << "unable to initialize TrigDecisionTool " << endmsg;
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 " <<endreq;
+ msg(MSG::WARNING) << "Can't retrieve LArNoisyROSummary " <<endmsg;
return StatusCode::SUCCESS;
}
@@ -258,7 +258,7 @@ StatusCode LArNoisyROMon::fillHistograms()
sc = evtStore()->retrieve(eventInfo);
if (sc.isFailure())
{
- msg(MSG::WARNING) << "Can't retrieve EventInfo " <<endreq;
+ msg(MSG::WARNING) << "Can't retrieve EventInfo " <<endmsg;
return StatusCode::SUCCESS;
}
@@ -805,7 +805,7 @@ StatusCode LArNoisyROMon::procHistograms()
{
if(!m_doHisto) return StatusCode::SUCCESS;
- if ( endOfRun || endOfEventsBlock){
+ if ( endOfRunFlag() || endOfEventsBlockFlag()){
if ( m_IsOnline )
{
// copy the "running" histo to the final ones, to be normalised
@@ -995,7 +995,7 @@ StatusCode LArNoisyROMon::procHistograms()
}//end if m_eventCounter>0
}
- if ( endOfRun ) {
+ if ( endOfRunFlag() ) {
// delete temposary histograms
if ( h_LBN ) {
// LWHist::safeDelete(h_LBN);
@@ -1506,7 +1506,7 @@ void LArNoisyROMon::fillTriggerHisto(partitionHistos& partition, uint8_t trigger
StatusCode LArNoisyROMon::finalize()
{
- msg(MSG::INFO) << " in LArNoisyROMon::finalize() " << endreq;
+ msg(MSG::INFO) << " in LArNoisyROMon::finalize() " << endmsg;
// delete temposary histograms
if ( h_LBN ) {
diff --git a/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx
index 6fa6f88aae4..bbfa9f6eeb0 100755
--- a/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArRODMonTool.cxx
@@ -178,7 +178,7 @@ LArRODMonTool::initialize() {
StatusCode sc = detStore()->retrieve(m_LArOnlineIDHelper, "LArOnlineID");
if (sc.isFailure()) {
- msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endreq;
+ msg(MSG::FATAL) << "Could not get LArOnlineIDHelper" << endmsg;
return sc;
}
@@ -188,41 +188,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 << endreq;
+ msg(MSG::FATAL) << "Cannot register DataHandle for OFC object with key " << m_keyOFC << endmsg;
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 << endreq;
+ msg(MSG::FATAL) << "Cannot register DataHandle for Shape object with key " << m_keyShape << endmsg;
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" << endreq;
+ msg(MSG::FATAL) << "Cannot register DataHandle for HVScaleCorr object with key LArHVScaleCorr" << endmsg;
return sc;
}
// ADC2MeV Tool
sc = m_adc2mevtool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to find tool for LArADC2MeV" << endreq;
+ msg(MSG::ERROR) << "Unable to find tool for LArADC2MeV" << endmsg;
return StatusCode::FAILURE;
}
sc = m_calo_noise_tool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to find calo noise tool" << endreq;
+ msg(MSG::ERROR) << "Unable to find calo noise tool" << endmsg;
return StatusCode::FAILURE;
}
sc = m_cable_service_tool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to find cabling service tool" << endreq;
+ msg(MSG::ERROR) << "Unable to find cabling service tool" << endmsg;
return StatusCode::FAILURE;
}
sc = detStore()->retrieve(m_calo_description_mgr);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to find CeloDetDescrManager " << endreq;
+ msg(MSG::ERROR) << "Unable to find CeloDetDescrManager " << endmsg;
return StatusCode::FAILURE;
}
// }
@@ -230,14 +230,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 << endreq;
+ msg(MSG::ERROR) << "Cannot register DataHandle for Pedestal object with key " << m_larpedestalkey << endmsg;
return StatusCode::FAILURE;
}
// }
if (m_skipKnownProblematicChannels) {
sc=m_badChannelMask.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve BadChannelMask" << m_badChannelMask<< endreq;
+ msg(MSG::ERROR) << "Could not retrieve BadChannelMask" << m_badChannelMask<< endmsg;
return StatusCode::FAILURE;
}
@@ -623,7 +623,7 @@ LArRODMonTool::bookHistograms()
// }
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Bookhistograms failed" << endreq;
+ msg(MSG::ERROR) << "Bookhistograms failed" << endmsg;
}
return sc;
@@ -635,7 +635,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" << endreq;
+ msg(MSG::WARNING) << "No LArFEB container found in TDS" << endmsg;
return false;
}
LArFebHeaderContainer::const_iterator itFEB = febCont->begin();
@@ -665,7 +665,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!" << endreq;
+ msg(MSG::ERROR) << "No EventInfo object found! Can't read run number!" << endmsg;
return StatusCode::FAILURE;
}
@@ -676,12 +676,12 @@ StatusCode LArRODMonTool::fillHistograms() {
if ( thisEventInfo->isEventFlagBitSet(xAOD::EventInfo::LAr,0) ) {
isEventFlaggedByLArNoisyROAlg = true;
- msg(MSG::DEBUG) << " !!! Noisy event found from LArNoisyROAlg !!!" << endreq;
+ msg(MSG::DEBUG) << " !!! Noisy event found from LArNoisyROAlg !!!" << endmsg;
}
if ( thisEventInfo->isEventFlagBitSet(xAOD::EventInfo::LAr,3) ) {
isEventFlaggedByLArNoisyROAlgInTimeW = true;
- msg(MSG::DEBUG) << " !!! Noisy event found by LArNoisyROAlg in Time window of 500ms!!!" << endreq;
+ msg(MSG::DEBUG) << " !!! Noisy event found by LArNoisyROAlg in Time window of 500ms!!!" << endmsg;
}
// Noise bursts cleaning (LArNoisyRO_Std or TimeWindowVeto) added by B.Trocme - 19/7/12
@@ -735,7 +735,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 <<endreq;
+ msg(MSG::WARNING) << "Can\'t retrieve LArRawChannelContainer with key " << m_channelKey_fromDigits <<endmsg;
return StatusCode::FAILURE;
}
@@ -743,7 +743,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 <<endreq;
+ msg(MSG::WARNING) << "Can\'t retrieve LArRawChannelContainer with key " << m_channelKey_fromBytestream <<endmsg;
return StatusCode::FAILURE;
}
@@ -752,7 +752,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." << endreq;
+ msg(MSG::WARNING) << "Can't retrieve LArDigitContainer with key " << m_LArDigitContainerKey <<". Turn off digit dump." << endmsg;
closeDumpfiles();
m_dumpDigits=false;
m_doDspTestDump=false;
@@ -784,7 +784,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." << endreq;
+ msg(MSG::DEBUG) << "Entering the LArRawChannel loop." << endmsg;
for (;rcDigIt!=rcDigIt_e;++rcDigIt) {
const HWIdentifier idDig=rcDigIt->hardwareID();
@@ -807,11 +807,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?" << endreq;
+ msg(MSG::WARNING) << "LArRawChannelContainer not in the expected order. Change of LArByteStream format?" << endmsg;
//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." << endreq;
+ msg(MSG::ERROR) << "Channel " << m_LArOnlineIDHelper->channel_name(idDig) << " not found." << endmsg;
return StatusCode::FAILURE;
}
}
@@ -823,7 +823,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" << endreq;
+ msg(MSG::ERROR) << "Can't find LArDigit corresponding to channel " << m_LArOnlineIDHelper->channel_name(idDig) << ". Turn off digit dump" << endmsg;
closeDumpfiles();
m_dumpDigits=false;
m_doDspTestDump=false;
@@ -845,19 +845,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 << endreq;
+ if (dig) msg(MSG::DEBUG) << "Samples : "<< maxSamples << " " << minSamples << endmsg;
}
}//end loop over rawColl_fromDigits
- msg(MSG::DEBUG) << "End of rawChannels loop" << endreq;
+ msg(MSG::DEBUG) << "End of rawChannels loop" << endmsg;
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"<<endreq;
+ msg(MSG::INFO) << " Last LB: "<<m_last_lb<<" curr. LB: "<<m_curr_lb<<" subtracting histos"<<endmsg;
// 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"<<endreq;
+ msg(MSG::INFO) << " Going to subtract and reset the: "<< i << " bin of shadow histo"<<endmsg;
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();
@@ -896,18 +896,18 @@ StatusCode LArRODMonTool::fillHistograms() {
if (msgLvl(MSG::VERBOSE)) {
- msg(MSG::VERBOSE) << "*Number of errors in Energy Computation : " << endreq;
- msg(MSG::VERBOSE) << "* Low Gain : " << MSG::dec << allEC.errors_E[2] << " / " << m_count_gain[2] << endreq;
- msg(MSG::VERBOSE) << "* Medium Gain : " << MSG::dec << allEC.errors_E[1] << " / " << m_count_gain[1] << endreq;
- msg(MSG::VERBOSE) << "* High Gain : " << MSG::dec << allEC.errors_E[0] << " / " << m_count_gain[0] << endreq;
- msg(MSG::VERBOSE) << "*Number of errors in Time Computation : " << endreq;
- msg(MSG::VERBOSE) << "* Low Gain : " << MSG::dec << allEC.errors_T[2] << " / " << m_count_gain[2] << endreq;
- msg(MSG::VERBOSE) << "* Medium Gain : " << MSG::dec << allEC.errors_T[1] << " / " << m_count_gain[1] << endreq;
- msg(MSG::VERBOSE) << "* High Gain : " << MSG::dec << allEC.errors_T[0] << " / " << m_count_gain[0] << endreq;
- msg(MSG::VERBOSE) << "*Number of errors in Quality Computation : " << " / " << m_count_gain[2] << endreq;
- msg(MSG::VERBOSE) << "* Low Gain : " << MSG::dec << allEC.errors_Q[2] << " / " << m_count_gain[2] << endreq;
- msg(MSG::VERBOSE) << "* Medium Gain : " << MSG::dec << allEC.errors_Q[1] << " / " << m_count_gain[1] << endreq;
- msg(MSG::VERBOSE) << "* High Gain : " << MSG::dec << allEC.errors_Q[0] << " / " << m_count_gain[0] << endreq;
+ 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;
}// end if verbose
@@ -1064,7 +1064,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" << endreq;
+ msg(MSG::DEBUG) << " I am entering compareChannels method" << endmsg;
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;
@@ -1077,7 +1077,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 << endreq;
+ msg(MSG::DEBUG) << " timeOffline too large " << timeOffline << endmsg;
return StatusCode::SUCCESS;
}
// Set the cuts corresponding to the range
@@ -1206,61 +1206,61 @@ StatusCode LArRODMonTool::compareChannels(const HWIdentifier chid,const LArRawCh
if(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 << endreq;
+ msg(MSG::INFO) << "Channel: " << channel << " of FEB " << febid << endmsg;
//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) << endreq;
+ 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 << endreq;
+ << " , 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()) << endreq;
+ << " (Qoff - Qnl)/sqrt(Qoff) = " << (rcDig.quality() - q_fB)/TMath::Sqrt(rcDig.quality()) << endmsg;
}
if(keepQ && (fabs(DiffQ) > DQCut)) {
- msg(MSG::INFO) << "DSP Quality Error : " << m_LArOnlineIDHelper->channel_name(chid) << endreq;
+ 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()) << endreq;
+ << " (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 << endreq;
+ << " , Eoff - Eonl = " << rcDig.energy() - en_fB << endmsg;
}
- msg(MSG::INFO) << " Tauonl = " << rcBS.time() << " , Tauoff = " << rcDig.time() << endreq;
+ msg(MSG::INFO) << " Tauonl = " << rcBS.time() << " , Tauoff = " << rcDig.time() << endmsg;
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) << endreq;
+ msg(MSG::INFO) << endmsg;
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) << endreq;
+ msg(MSG::INFO) << endmsg;
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) << endreq;
+ msg(MSG::INFO) << endmsg;
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) << endreq;
+ msg(MSG::INFO) << endmsg;
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) << endreq;
+ msg(MSG::INFO) << endmsg;
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() <<endreq;
+ msg(MSG::INFO) << "Escale: "<<escale<<" intercept: "<<ramp0<<" pedestal: "<<ped<<" gain: "<<rcDig.gain() <<endmsg;
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<<endreq;
- msg(MSG::INFO) << "HVScaleCorr: "<<hvscale<<endreq;
+ msg(MSG::INFO) << "Noise for mu=20: "<<noise<<endmsg;
+ msg(MSG::INFO) << "HVScaleCorr: "<<hvscale<<endmsg;
double emon=0.;
for (unsigned k=0; k<samples.size(); ++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<<endreq;
+ msg(MSG::INFO) << "intercept + Escale*Sum[(sample-ped)*OFCa] "<<emon<<endmsg;
++ndump;
}
}
@@ -1339,9 +1339,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) << endreq;
+ 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 << endreq;
+ << " , Eoff - Eonl = " << rcDig.energy() - en_fB << endmsg;
}
}
@@ -1378,7 +1378,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" << endreq;
+ msg(MSG::DEBUG) << " I am leaving compareChannels method" << endmsg;
return StatusCode::SUCCESS;
}
diff --git a/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx b/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx
index 0f7290486b4..810c1499573 100755
--- a/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx
+++ b/LArCalorimeter/LArMonTools/src/LArRawChannelMonTool.cxx
@@ -70,7 +70,7 @@ typedef std::map<Detector,map_idhash_str_th2> map_det_idhash_str_th2;
typedef std::vector<HWIdentifier>::const_iterator citer_vect_hwid;
-typedef std::pair<Detector,TH2*> pair_det_th2ptr;
+//typedef std::pair<Detector,TH2*> pair_det_th2ptr;
typedef std::map<Detector,boost::shared_ptr<IHistoProxyBase> > map_det_th2ptr;
typedef map_det_th2ptr::const_iterator citer_det_th2ptr;
@@ -166,7 +166,7 @@ LArRawChannelMonTool::~LArRawChannelMonTool()
/*----------------------------------------------------------------------------*/
StatusCode LArRawChannelMonTool::initialize()
{
- ATH_MSG(DEBUG) << "===> start " << name() << "::initialize <=== " << endreq;
+ ATH_MSG(DEBUG) << "===> start " << name() << "::initialize <=== " << endmsg;
_event_counter = 0;
_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" << endreq;
+ ATH_MSG(DEBUG) << "initialized ManagedMonitorToolBase" << endmsg;
} else {
msg(MSG::FATAL) << "Unable to initialize ManagedMonitorToolBase"
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
@@ -189,11 +189,11 @@ StatusCode LArRawChannelMonTool::initialize()
// --- get LArOnlineID ---
if ( detStore()->retrieve( _lar_online_id_ptr, "LArOnlineID" ).isSuccess() ) {
- ATH_MSG(DEBUG) << "connected non-tool: LArOnlineID" << endreq;
+ ATH_MSG(DEBUG) << "connected non-tool: LArOnlineID" << endmsg;
} else {
- msg(MSG::FATAL) << "unable to connect non-tool: LArOnlineID" << endreq;
+ msg(MSG::FATAL) << "unable to connect non-tool: LArOnlineID" << endmsg;
return StatusCode::FAILURE;
}
@@ -203,12 +203,12 @@ StatusCode LArRawChannelMonTool::initialize()
// --- get CaloDetDescrManager ---
if ( detStore()->retrieve( _calo_description_mgr_ptr ).isSuccess() ) {
- ATH_MSG(DEBUG) << "connected non-tool: CaloDetDescrManager " << endreq;
+ ATH_MSG(DEBUG) << "connected non-tool: CaloDetDescrManager " << endmsg;
} else {
msg(MSG::FATAL) << "unable to connect non-tool: CaloDetDescrMgr "
- << endreq;
+ << endmsg;
return StatusCode::FAILURE;
}
@@ -216,12 +216,12 @@ StatusCode LArRawChannelMonTool::initialize()
// --- get CaloIDManager ---
if ( detStore()->retrieve( _calo_id_mgr_ptr ).isSuccess() ) {
- ATH_MSG(DEBUG) << "connected non-tool: CaloIdManager" << endreq;
+ ATH_MSG(DEBUG) << "connected non-tool: CaloIdManager" << endmsg;
} else {
msg(MSG::FATAL) << "unable to connect non-tool: CaloIdManager "
- << endreq;
+ << endmsg;
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() << endreq;
+ msg(MSG::WARNING) << "FEB hash out of range" << err.what() << endmsg;
}
@@ -351,7 +351,7 @@ StatusCode LArRawChannelMonTool::initialize()
foreach( det_int_map_t::value_type i, _det_to_nchannels){
msg(MSG::DEBUG) << detector_str( i.first ) << " has " << i.second << "channels " << std::endl;
}
- msg(MSG::DEBUG) << endreq;
+ msg(MSG::DEBUG) << endmsg;
}
@@ -362,7 +362,7 @@ StatusCode LArRawChannelMonTool::initialize()
m_noise_streams_set.insert(_noise_streams.begin(),_noise_streams.end());
- ATH_MSG(DEBUG) << "===> end " << name() << "::initialize <=== " << endreq;
+ ATH_MSG(DEBUG) << "===> end " << name() << "::initialize <=== " << endmsg;
return StatusCode::SUCCESS;
@@ -373,7 +373,7 @@ StatusCode LArRawChannelMonTool::initialize()
StatusCode LArRawChannelMonTool::bookHistograms()
{
- ATH_MSG(DEBUG) << "===> start " << name() << "::bookHistograms <=== " << endreq;
+ ATH_MSG(DEBUG) << "===> start " << name() << "::bookHistograms <=== " << endmsg;
std::deque<Detector> detectors = list_of( EMBA )( EMBC )( EMECA )( EMECC )( HECA )( HECC )( FCALA )( FCALC );
@@ -404,7 +404,7 @@ StatusCode LArRawChannelMonTool::bookHistograms()
// case all:
// default:
// msg(MSG::WARNING) << "given bad interval job-option: " << _interval_str
-// << " ... booking histograms per run ..." << endreq;
+// << " ... booking histograms per run ..." << endmsg;
// is_new_interval = isNewRun;
// }
//
@@ -893,7 +893,7 @@ StatusCode LArRawChannelMonTool::bookHistograms()
// --- Book and register per Feedthrough Histograms ---
if ( _monitor_feedthroughs ) {
- ATH_MSG(DEBUG) << " - Booking per feedthrough histos" << endreq;
+ ATH_MSG(DEBUG) << " - Booking per feedthrough histos" << endmsg;
// --- Look for existing feedthough histogram ---
bool is_new_ft = false;
@@ -1015,7 +1015,7 @@ StatusCode LArRawChannelMonTool::bookHistograms()
} catch ( std::out_of_range &err ){
- msg(MSG::WARNING) << "FEB hash out of range: " << err.what() << endreq;
+ msg(MSG::WARNING) << "FEB hash out of range: " << err.what() << endmsg;
}
@@ -1235,7 +1235,7 @@ StatusCode LArRawChannelMonTool::bookHistograms()
} // --- end booking for monitoring interval ---
- ATH_MSG(DEBUG) << "===> end " << name() << "::bookHistograms <=== " << endreq;
+ ATH_MSG(DEBUG) << "===> end " << name() << "::bookHistograms <=== " << endmsg;
return StatusCode::SUCCESS;
@@ -1246,12 +1246,12 @@ StatusCode LArRawChannelMonTool::bookHistograms()
StatusCode LArRawChannelMonTool::fillHistograms()
{
- ATH_MSG(DEBUG) << "===> start " << name() << "::fillHistograms boulou <=== " << endreq;
+ ATH_MSG(DEBUG) << "===> start " << name() << "::fillHistograms boulou <=== " << endmsg;
// -- Set ATLAS Ready Filter
setIsATLASReady();
- // ATH_MSG(DEBUG) << "Vikas Says: ATLAS READY Flag is set to " << isATLASReady() << endreq;
+ // ATH_MSG(DEBUG) << "Vikas Says: ATLAS READY Flag is set to " << isATLASReady() << endmsg;
// --- check set in bookHistogram ---
if ( !_has_lar_raw_channels ) return StatusCode::SUCCESS;
@@ -1261,7 +1261,7 @@ StatusCode LArRawChannelMonTool::fillHistograms()
if ( !evtStore()->retrieve( raw_channels, _LArRawChannel_container_key ).isSuccess() ) {
msg(MSG::WARNING) << "Cannot retrieve LArRawChannelContainer with key: "
- << _LArRawChannel_container_key << endreq;
+ << _LArRawChannel_container_key << endmsg;
return StatusCode::FAILURE;
}
@@ -1276,24 +1276,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) << endreq;
+ //ATH_MSG(DEBUG) << "event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,0"<<event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,0) << endmsg;
// 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 !!!" << endreq;
+ ATH_MSG(DEBUG) << " !!! Noisy event found from LArNoisyROAlg !!!" << endmsg;
}
if ( event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,LArEventBitInfo::BADFEBS_W) ) {
isEventFlaggedByLArNoisyROAlg_W = true;
- ATH_MSG(DEBUG) << " !!! Noisy event found from LArNoisyROAlg_W !!!" << endreq;
+ ATH_MSG(DEBUG) << " !!! Noisy event found from LArNoisyROAlg_W !!!" << endmsg;
}
if ( event_info->isEventFlagBitSet(xAOD::EventInfo::LAr,3) ) {
isEventFlaggedByLArNoisyROAlgInTimeW = true;
- ATH_MSG(DEBUG) << " !!! Noisy event found by LArNoisyROAlg in Time window of 500ms!!!" << endreq;
+ ATH_MSG(DEBUG) << " !!! Noisy event found by LArNoisyROAlg in Time window of 500ms!!!" << endmsg;
}
@@ -1329,7 +1329,7 @@ StatusCode LArRawChannelMonTool::fillHistograms()
std::vector<TriggerInfo::StreamTag> event_stream_tags = trig->streamTags();
foreach( const std::string & stream_name, _noise_streams ) {
foreach( const TriggerInfo::StreamTag stream_tag, event_stream_tags ) {
- ATH_MSG(DEBUG) << "Keeping Stream Tag: " << stream_tag.type() << "_" << stream_tag.name() << endreq;
+ ATH_MSG(DEBUG) << "Keeping Stream Tag: " << stream_tag.type() << "_" << stream_tag.name() << endmsg;
if( stream_name == stream_tag.name()) {
_is_noise_event = true;
break;
@@ -1338,7 +1338,7 @@ StatusCode LArRawChannelMonTool::fillHistograms()
}
}
*/
- } else ATH_MSG(DEBUG) << "Cannot retrieve EventInfo" << endreq;
+ } else ATH_MSG(DEBUG) << "Cannot retrieve EventInfo" << endmsg;
++_event_counter;
@@ -1531,13 +1531,13 @@ StatusCode LArRawChannelMonTool::fillHistograms()
} catch ( const std::out_of_range &err ) {
msg(MSG::WARNING) << "FEB hash out of range. Detector undefined"
- << err.what() << endreq;
+ << err.what() << endmsg;
continue; // skip this channel
} catch ( const LArID_Exception& err ) {
msg(MSG::WARNING) << "channel offline id undefined ... skipping"
- << endreq;
+ << endmsg;
continue; // skip this channel
}
@@ -1579,11 +1579,11 @@ StatusCode LArRawChannelMonTool::fillHistograms()
} catch ( std::out_of_range &err ) {
- msg(MSG::WARNING) <<"failed per FEB monitoring "<< err.what() << endreq;
+ msg(MSG::WARNING) <<"failed per FEB monitoring "<< err.what() << endmsg;
} catch ( std::bad_cast &err ) {
- msg(MSG::WARNING) <<"failed per FEB monitoring "<< err.what() << endreq;
+ msg(MSG::WARNING) <<"failed per FEB monitoring "<< err.what() << endmsg;
}
@@ -1623,7 +1623,7 @@ StatusCode LArRawChannelMonTool::fillHistograms()
} catch ( std::out_of_range &err ) {
msg(MSG::WARNING) << "failed per feedthrough monitoring " << err.what()
- << endreq;
+ << endmsg;
}
@@ -1729,18 +1729,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 " << endreq;
+ msg(MSG::WARNING) << "Something is wrong with choosing of detector partition " << endmsg;
}
} catch ( const std::out_of_range &err ) {
- msg(MSG::WARNING) << "Failed monitoring " << err.what() << endreq;
+ msg(MSG::WARNING) << "Failed monitoring " << err.what() << endmsg;
} catch ( const std::bad_cast &err ) {
- msg(MSG::WARNING) << "Failed monitoring " << err.what() << endreq;
+ msg(MSG::WARNING) << "Failed monitoring " << err.what() << endmsg;
}
@@ -1949,25 +1949,25 @@ StatusCode LArRawChannelMonTool::fillHistograms()
StatusCode LArRawChannelMonTool::procHistograms()
{
- ATH_MSG(DEBUG) << "===> start " << name() << "::procHistograms <=== " << endreq;
+ ATH_MSG(DEBUG) << "===> start " << name() << "::procHistograms <=== " << endmsg;
bool is_new_interval = false;
switch ( _interval ) {
// BT : what about endOfEventsBlock????
case lumiBlock:
- is_new_interval = endOfLumiBlock;
+ is_new_interval = endOfLumiBlockFlag();
break;
case lowStat:
is_new_interval = newLowStat;
break;
case run:
- is_new_interval = endOfRun;
+ is_new_interval = endOfRunFlag();
break;
default:
msg(MSG::WARNING) << "given bad interval job-option: " << _interval_str
- << " ... booking histograms per run ..." << endreq;
- is_new_interval = endOfRun;
+ << " ... booking histograms per run ..." << endmsg;
+ is_new_interval = endOfRunFlag();
}
if ( is_new_interval ) {
@@ -2041,7 +2041,7 @@ StatusCode LArRawChannelMonTool::procHistograms()
}
- ATH_MSG(DEBUG) << "===> end " << name() << "::procHistograms <=== " << endreq;
+ ATH_MSG(DEBUG) << "===> end " << name() << "::procHistograms <=== " << endmsg;
return StatusCode::SUCCESS;
@@ -2061,7 +2061,7 @@ 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() << endreq;
+ << err.what() << endmsg;
return "";
}
@@ -2080,7 +2080,7 @@ 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() << endreq;
+ << err.what() << endmsg;
return "";
}
@@ -2092,12 +2092,12 @@ bool LArRawChannelMonTool::registerHistogram( LWHist* histo, const std::string&
MonGroup histGroup(this,dir,_interval,ATTRIB_MANAGED,"",merge);
if ( !histGroup.regHist(histo).isSuccess() ) {
- msg(MSG::ERROR) << "Cannot book: " << histo->GetName() << endreq;
+ msg(MSG::ERROR) << "Cannot book: " << histo->GetName() << endmsg;
return false;
} else {
- ATH_MSG(DEBUG) << "Booked: " << histo->GetName() << endreq;
+ ATH_MSG(DEBUG) << "Booked: " << histo->GetName() << endmsg;
return true;
}
--
GitLab