diff --git a/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_Run2.py b/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_Run2.py
index 9be51b2a57a8aa184ae0ac4e33c633648af586c0..9a4003ea341a44fa8762b536eefdb6948bb37712 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_Run2.py
+++ b/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_Run2.py
@@ -106,7 +106,7 @@ if l1caloRawMon:
ToolSvc += L1CaloPMTScoresMonTool
L1Man.AthenaMonTools += [ L1CaloPMTScoresMonTool ]
- if isData and DQMonFlags.doCTPMon(): # KW this is not set in online environment! Investigate!
+ if isData: #and DQMonFlags.doCTPMon(): # KW this is not set in online environment! Investigate! # GP doCTPMon() commented out for now
####################### L1Calo->CTP ################################
from IOVDbSvc.CondDB import conddb
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx
index 7a03f561ad97fe6299a879e40f28c9d54d0ae079..7466786c74d0542b6f65d564aae7c4b0e7977cde 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx
@@ -181,7 +181,7 @@ StatusCode CalorimeterL1CaloMon:: initialize()
/*---------------------------------------------------------*/
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc;
@@ -190,28 +190,28 @@ StatusCode CalorimeterL1CaloMon:: initialize()
sc = m_ttTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to locate tool L1TriggerTowerTool" << endreq;
+ msg(MSG::ERROR) << "Unable to locate tool L1TriggerTowerTool" << endmsg;
return sc;
}
sc = m_errorTool.retrieve();
if( sc.isFailure() ) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloMonErrorTool"
- << endreq;
+ << endmsg;
return sc;
}
sc = m_histTool.retrieve();
if (sc.isFailure()) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloLWHistogramTool"
- << endreq;
+ << endmsg;
return sc;
}
sc = m_caloTool.retrieve();
if (sc.isFailure()) {
msg(MSG::ERROR) << "Unable to locate Tool L1CaloMonitoringCaloTool"
- << endreq;
+ << endmsg;
return sc;
}
@@ -231,7 +231,7 @@ StatusCode CalorimeterL1CaloMon::bookHistogramsRecurrent()
/*---------------------------------------------------------*/
{
- msg(MSG::DEBUG) << "in CalorimeterL1CaloMon::bookHistograms" << endreq;
+ msg(MSG::DEBUG) << "in CalorimeterL1CaloMon::bookHistograms" << endmsg;
if( m_environment == AthenaMonManager::online ) {
// book histograms that are only made in the online environment...
@@ -628,7 +628,7 @@ StatusCode CalorimeterL1CaloMon::bookHistogramsRecurrent()
StatusCode sc = m_ttTool->retrieveConditions();
if(!sc.isSuccess()) {
- msg(MSG::WARNING) << "Conditions not retrieved " << endreq;
+ msg(MSG::WARNING) << "Conditions not retrieved " << endmsg;
}
}
@@ -642,17 +642,17 @@ StatusCode CalorimeterL1CaloMon::fillHistograms()
/*---------------------------------------------------------*/
{
const bool debug = msgLvl(MSG::DEBUG);
- if (debug) msg(MSG::DEBUG) << "in fillHistograms()" << endreq;
+ if (debug) msg(MSG::DEBUG) << "in fillHistograms()" << endmsg;
if (!m_histBooked) {
- if (debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endreq;
+ if (debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endmsg;
return StatusCode::SUCCESS;
}
// Skip events believed to be corrupt
if (m_errorTool->corrupt()) {
- if (debug) msg(MSG::DEBUG) << "Skipping corrupt event" << endreq;
+ if (debug) msg(MSG::DEBUG) << "Skipping corrupt event" << endmsg;
return StatusCode::SUCCESS;
}
@@ -663,12 +663,12 @@ StatusCode CalorimeterL1CaloMon::fillHistograms()
const CaloCellContainer* caloCellContainer = 0;
sc = evtStore()->retrieve(caloCellContainer, m_caloCellContainerName);
if(!sc.isSuccess() || !caloCellContainer) {
- msg(MSG::WARNING) << "No CaloCellContainer found at AllCalo" << endreq;
+ msg(MSG::WARNING) << "No CaloCellContainer found at AllCalo" << endmsg;
return StatusCode::SUCCESS;
}
sc = m_caloTool->loadCaloCells();
if(!sc.isSuccess()) {
- msg(MSG::WARNING) << "Could not load CaloCells" << endreq;
+ msg(MSG::WARNING) << "Could not load CaloCells" << endmsg;
return StatusCode::SUCCESS;
}
@@ -715,7 +715,7 @@ StatusCode CalorimeterL1CaloMon::fillHistograms()
sc = evtStore()->retrieve(triggerTowerTES, m_xAODTriggerTowerContainerName);
if(sc==StatusCode::FAILURE || !triggerTowerTES) {
msg(MSG::INFO) << "No xAODTriggerTower found in TES at "
- << m_xAODTriggerTowerContainerName << endreq ;
+ << m_xAODTriggerTowerContainerName << endmsg ;
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx
index 1c6fa4116d1178c744ace46e0d6c67eaf131da75..1a62eff9442e55aa5ceba6280ed75d36c82ff1ec 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx
@@ -48,6 +48,11 @@
namespace LVL1 {
// ============================================================================
+// Number of jet thresholds
+const int max_JET_2bit_Threshold_Number = 15;
+const int max_JET_3bit_Threshold_Number = 10;
+
+
// *********************************************************************
// Public Methods
// *********************************************************************
@@ -66,13 +71,13 @@ L1CaloCTPMon::L1CaloCTPMon( const std::string & type, const std::string & name,
m_h_ctp_1d_TIPMatches(0),
m_h_ctp_1d_HitNoTIPMismatch(0),
m_h_ctp_1d_TIPNoHitMismatch(0),
- m_h_ctp_2d_MismatchEvents(0),
- m_h_ctp_1d_EM_HitNoTIPMismatch(0),
- m_h_ctp_1d_TAU_HitNoTIPMismatch(0),
- m_h_ctp_1d_JET_HitNoTIPMismatch(0),
- m_h_ctp_1d_TE_HitNoTIPMismatch(0),
- m_h_ctp_1d_XE_HitNoTIPMismatch(0),
- m_h_ctp_1d_XS_HitNoTIPMismatch(0)
+ m_h_ctp_2d_MismatchEvents(0)
+ //m_h_ctp_1d_EM_HitNoTIPMismatch(0),
+ //m_h_ctp_1d_TAU_HitNoTIPMismatch(0),
+ //m_h_ctp_1d_JET_HitNoTIPMismatch(0),
+ //m_h_ctp_1d_TE_HitNoTIPMismatch(0),
+ //m_h_ctp_1d_XE_HitNoTIPMismatch(0),
+ //m_h_ctp_1d_XS_HitNoTIPMismatch(0)
/*---------------------------------------------------------*/
{
// This is how you declare the parameters to Gaudi so that
@@ -105,7 +110,7 @@ StatusCode L1CaloCTPMon::initialize()
/*---------------------------------------------------------*/
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
m_debug = msgLvl(MSG::DEBUG);
StatusCode sc = ManagedMonitorToolBase::initialize();
@@ -116,23 +121,23 @@ StatusCode L1CaloCTPMon::initialize()
sc = m_configSvc.retrieve();
if ( sc.isFailure() ) {
msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName()
- << endreq;
+ << endmsg;
return sc;
} else {
- msg(MSG::INFO) << "Connected to " << m_configSvc.typeAndName() << endreq;
+ msg(MSG::INFO) << "Connected to " << m_configSvc.typeAndName() << endmsg;
}
sc = m_errorTool.retrieve();
if( sc.isFailure() ) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloMonErrorTool"
- << endreq;
+ << endmsg;
return sc;
}
sc = m_histTool.retrieve();
if( sc.isFailure() ) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloLWHistogramTool"
- << endreq;
+ << endmsg;
return sc;
}
@@ -143,7 +148,7 @@ StatusCode L1CaloCTPMon::initialize()
StatusCode L1CaloCTPMon::bookHistogramsRecurrent()
/*---------------------------------------------------------*/
{
- msg(MSG::DEBUG) << "in L1CaloCTPMon::bookHistograms" << endreq;
+ msg(MSG::DEBUG) << "in L1CaloCTPMon::bookHistograms" << endmsg;
if( m_environment == AthenaMonManager::online ) {
// book histograms that are only made in the online environment...
@@ -203,10 +208,10 @@ StatusCode L1CaloCTPMon::bookHistogramsRecurrent()
msg(MSG::DEBUG) << "Max threshold number = EM: " << def.max_EM_Threshold_Number() << " JET (3-bit): " << max_JET_3bit_Threshold_Number
<< " JET (2-bit): " << max_JET_2bit_Threshold_Number << " TE: " << def.max_TE_Threshold_Number()
- << " XE: " << def.max_XE_Threshold_Number() << " XS: " << def.max_XS_Threshold_Number() << endreq;
+ << " XE: " << def.max_XE_Threshold_Number() << " XS: " << def.max_XS_Threshold_Number() << endmsg;
m_tipMap.clear();
- msg(MSG::DEBUG) << "Number of l1calo bits: " << l1caloBits << endreq;
+ msg(MSG::DEBUG) << "Number of l1calo bits: " << l1caloBits << endmsg;
m_tipMap.assign(l1caloBits, std::make_pair(" ", -1));
if (m_configSvc->ctpConfig()) {
@@ -214,7 +219,7 @@ StatusCode L1CaloCTPMon::bookHistogramsRecurrent()
const std::vector<TrigConf::TriggerThreshold*>&
thresholds(m_configSvc->ctpConfig()->menu().thresholdVector());
std::vector<TrigConf::TriggerThreshold*>::const_iterator it;
- msg(MSG::DEBUG) << "Size of thresholds vector: " << thresholds.size() << endreq;
+ msg(MSG::DEBUG) << "Size of thresholds vector: " << thresholds.size() << endmsg;
for (it = thresholds.begin(); it != thresholds.end(); ++it) {
int offset = 0;
@@ -278,14 +283,14 @@ StatusCode L1CaloCTPMon::bookHistogramsRecurrent()
offset + fixedThreshNumber*nbits));
msg(MSG::DEBUG) << "threshMap: name, offset, threshNumber, nbits "
<< (*it)->name() << " " << offset << " "
- << fixedThreshNumber << " " << nbits << endreq;
+ << fixedThreshNumber << " " << nbits << endmsg;
} // End loop over thresholds vector
- msg(MSG::DEBUG) << "Size of threshMap = " << threshMap.size() << endreq;
- msg(MSG::DEBUG) << "Size of tipMap = " << m_tipMap.size() << endreq;
+ msg(MSG::DEBUG) << "Size of threshMap = " << threshMap.size() << endmsg;
+ msg(MSG::DEBUG) << "Size of tipMap = " << m_tipMap.size() << endmsg;
const std::vector<TrigConf::TIP*>&
tips(m_configSvc->ctpConfig()->menu().tipVector());
- msg(MSG::DEBUG) << "Size of tipVector = " << tips.size() << endreq;
+ msg(MSG::DEBUG) << "Size of tipVector = " << tips.size() << endmsg;
int count = 0;
std::vector<TrigConf::TIP*>::const_iterator itp;
@@ -298,20 +303,20 @@ StatusCode L1CaloCTPMon::bookHistogramsRecurrent()
if (pos < l1caloBits) {
m_tipMap[pos] = std::make_pair((*itp)->thresholdName(), (*itp)->tipNumber());
count++;
- } else msg(MSG::WARNING) << "Error setting up TIP map" << endreq;
+ } else msg(MSG::WARNING) << "Error setting up TIP map" << endmsg;
} else msg(MSG::DEBUG) << "TIP name " << (*itp)->thresholdName()
- << " not found in threshMap" << endreq;
+ << " not found in threshMap" << endmsg;
} // End loop over tips
- msg(MSG::DEBUG) << "Entries in tipMap = " << count << endreq;
+ msg(MSG::DEBUG) << "Entries in tipMap = " << count << endmsg;
if (m_debug) {
int icount = 0;
for ( auto it = m_tipMap.begin(); it != m_tipMap.end(); ++it) {
- msg(MSG::DEBUG) << "tipmap[" << icount << "] " << (*it).first << " TIP number: " << (*it).second << endreq;
+ msg(MSG::DEBUG) << "tipmap[" << icount << "] " << (*it).first << " TIP number: " << (*it).second << endmsg;
icount++;
}
}
- } else msg(MSG::WARNING) << "No ctpConfig found" << endreq; // End if ctpConfig
+ } else msg(MSG::WARNING) << "No ctpConfig found" << endmsg; // End if ctpConfig
}
return StatusCode::SUCCESS;
}
@@ -321,17 +326,17 @@ StatusCode L1CaloCTPMon::bookHistogramsRecurrent()
StatusCode L1CaloCTPMon::fillHistograms()
/*---------------------------------------------------------*/
{
- if (m_debug) msg(MSG::DEBUG) << "in L1CaloCTPMon::fillHistograms" << endreq;
+ if (m_debug) msg(MSG::DEBUG) << "in L1CaloCTPMon::fillHistograms" << endmsg;
if (!m_histBooked) {
- if (m_debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endreq;
+ if (m_debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endmsg;
return StatusCode::SUCCESS;
}
// Skip events believed to be corrupt or with ROB errors
if (m_errorTool->corrupt() || m_errorTool->robOrUnpackingError()) {
- if (m_debug) msg(MSG::DEBUG) << "Skipping corrupt event" << endreq;
+ if (m_debug) msg(MSG::DEBUG) << "Skipping corrupt event" << endmsg;
return StatusCode::SUCCESS;
}
@@ -344,7 +349,7 @@ StatusCode L1CaloCTPMon::fillHistograms()
StatusCode sc = evtStore()->retrieve(cmxCpHitsTES, m_cmxCpHitsLocation);
if (sc == StatusCode::FAILURE || !cmxCpHitsTES) {
msg(MSG::INFO) << "No CMX CP Hits found in TES at " << m_cmxCpHitsLocation
- << endreq;
+ << endmsg;
return StatusCode::SUCCESS;
}
@@ -386,7 +391,7 @@ StatusCode L1CaloCTPMon::fillHistograms()
sc = evtStore()->retrieve(cmxJetHitsTES, m_cmxJetHitsLocation);
if (sc == StatusCode::FAILURE || !cmxJetHitsTES) {
msg(MSG::INFO) << "No CMX Jet Hits found in TES at " << m_cmxJetHitsLocation
- << endreq;
+ << endmsg;
return StatusCode::SUCCESS;
}
@@ -423,7 +428,7 @@ StatusCode L1CaloCTPMon::fillHistograms()
sc = evtStore()->retrieve(cmxEtSumsTES, m_cmxEtSumsLocation);
if (sc == StatusCode::FAILURE || !cmxEtSumsTES) {
msg(MSG::INFO) << "No CMXEtSums found in TES at " << m_cmxEtSumsLocation
- << endreq;
+ << endmsg;
return StatusCode::SUCCESS;
}
@@ -474,7 +479,7 @@ StatusCode L1CaloCTPMon::fillHistograms()
sc = evtStore()->retrieve(ctpRDO, m_CTPRDOLocation);
if (sc == StatusCode::FAILURE || !ctpRDO) {
msg(MSG::INFO) << "No CTP_RDO found in TES at " << m_CTPRDOLocation
- << endreq;
+ << endmsg;
return StatusCode::SUCCESS;
}
@@ -483,11 +488,11 @@ StatusCode L1CaloCTPMon::fillHistograms()
const uint16_t l1aPos = ctpRDO->getL1AcceptBunchPosition();
if (l1aPos >= ctp.getBunchCrossings().size()) {
- msg(MSG::WARNING) << "Invalid l1aPos" << endreq;
+ msg(MSG::WARNING) << "Invalid l1aPos" << endmsg;
return StatusCode::SUCCESS;
}
if (m_debug) msg(MSG::DEBUG) << "l1aPos, size : " << l1aPos << ", "
- << ctp.getBunchCrossings().size() << endreq;
+ << ctp.getBunchCrossings().size() << endmsg;
const CTP_BC& bunch = ctp.getBunchCrossings().at(l1aPos);
@@ -501,7 +506,7 @@ StatusCode L1CaloCTPMon::fillHistograms()
int offset = 0;
int threshBits = 3;
int totalBits = threshBits*def.max_EM_Threshold_Number()/2;
- msg(MSG::DEBUG) << "totalBits = " << totalBits << endreq;
+ msg(MSG::DEBUG) << "totalBits = " << totalBits << endmsg;
compare(bunch, EMHits0, totalBits, offset, EM1Type); // Cable EM1
@@ -574,14 +579,14 @@ void L1CaloCTPMon::compare(const CTP_BC& bunch, int hits, int totalBits,
int offset, L1CaloCTPHitTypes type)
{
if (m_debug) {
- msg(MSG::DEBUG) << "offset: " << offset << " totalBits: " << totalBits << endreq;
+ msg(MSG::DEBUG) << "offset: " << offset << " totalBits: " << totalBits << endmsg;
std::string name(m_h_ctp_1d_L1CaloNeCTPSummary->GetXaxis()->GetBinLabel(1+type));
std::string subdet((type == EM1Type || type == EM2Type ||
type == Tau1Type || type == Tau2Type) ? " CP: "
: " JEP: ");
msg(MSG::DEBUG) << name << subdet
<< m_histTool->thresholdString(hits, totalBits)
- << endreq;
+ << endmsg;
msg(MSG::DEBUG) << name << " CTP: ";
}
@@ -607,7 +612,7 @@ void L1CaloCTPMon::compare(const CTP_BC& bunch, int hits, int totalBits,
else m_h_ctp_1d_TIPNoHitMismatch->Fill(TIPid);
}
}
- if (m_debug) msg(MSG::DEBUG) << endreq;
+ if (m_debug) msg(MSG::DEBUG) << endmsg;
if (tipHits != (hits&mask)) {
m_h_ctp_1d_L1CaloNeCTPSummary->Fill(type);
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.h b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.h
index 12f620ef17cdc9e7cb673bba6c0285f3287b30d4..e5e4e01e609b70327cf7830888cc81455d1309fe 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.h
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.h
@@ -174,10 +174,6 @@ private:
/// Number of TIP bits (CTP input)
const int m_nTIP = 512;
- // Number of jet thresholds
- const int max_JET_2bit_Threshold_Number = 15;
- const int max_JET_3bit_Threshold_Number = 10;
-
/** Histos */
// Data transmission checks
TH1F_LW* m_h_ctp_1d_L1CaloNeCTPSummary; ///< Transmission Errors between L1Calo and CTP
@@ -186,12 +182,12 @@ private:
TH1F_LW* m_h_ctp_1d_HitNoTIPMismatch; ///< L1Calo Hit but no CTP TIP Mismatches
TH1F_LW* m_h_ctp_1d_TIPNoHitMismatch; ///< CTP TIP but no L1Calo Hit Mismatches
TH2I_LW* m_h_ctp_2d_MismatchEvents; ///< Transmission Errors between L1Calo and CTP Event Numbers
- TH1F_LW* m_h_ctp_1d_EM_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (EM thresholds
- TH1F_LW* m_h_ctp_1d_TAU_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (TAU thresholds)
- TH1F_LW* m_h_ctp_1d_JET_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (JET thresholds)
- TH1F_LW* m_h_ctp_1d_TE_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (TE thresholds)
- TH1F_LW* m_h_ctp_1d_XE_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (XE thresholds)
- TH1F_LW* m_h_ctp_1d_XS_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (XS thresholds)
+ //TH1F_LW* m_h_ctp_1d_EM_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (EM thresholds
+ //TH1F_LW* m_h_ctp_1d_TAU_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (TAU thresholds)
+ //TH1F_LW* m_h_ctp_1d_JET_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (JET thresholds)
+ //TH1F_LW* m_h_ctp_1d_TE_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (TE thresholds)
+ //TH1F_LW* m_h_ctp_1d_XE_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (XE thresholds)
+ //TH1F_LW* m_h_ctp_1d_XS_HitNoTIPMismatch; ///< L1Calo hit but no CTP TIP mismatches (XS thresholds)
};
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
index 6310be771fa419901031b98179ceba9bdf2f408e..9f7b06681cd613d248073716f84b68f5c3d91f29 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
@@ -53,9 +53,6 @@
#include "L1CaloHVScalesMon.h"
// ============================================================================
-const int L1CaloHVScalesMon::s_numEmHVPlots;
-const int L1CaloHVScalesMon::s_numHadHVPlots;
-// ============================================================================
namespace LVL1 {
// ============================================================================
L1CaloHVScalesMon::L1CaloHVScalesMon(const std::string & type,
@@ -113,7 +110,7 @@ StatusCode L1CaloHVScalesMon:: initialize()
/*---------------------------------------------------------*/
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc;
@@ -122,45 +119,45 @@ StatusCode L1CaloHVScalesMon:: initialize()
sc = m_cells2tt.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to locate tool L1CaloCells2TriggerTowers" << endreq;
+ msg(MSG::ERROR) << "Unable to locate tool L1CaloCells2TriggerTowers" << endmsg;
return sc;
}
sc = m_larEnergy.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to locate tool L1CaloLArTowerEnergy" << endreq;
+ msg(MSG::ERROR) << "Unable to locate tool L1CaloLArTowerEnergy" << endmsg;
return sc;
}
sc = m_ttIdTools.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to locate tool L1CaloTTIdTools" << endreq;
+ msg(MSG::ERROR) << "Unable to locate tool L1CaloTTIdTools" << endmsg;
return sc;
}
sc = m_ttTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to locate tool L1TriggerTowerTool" << endreq;
+ msg(MSG::ERROR) << "Unable to locate tool L1TriggerTowerTool" << endmsg;
return sc;
}
sc = m_errorTool.retrieve();
if( sc.isFailure() ) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloMonErrorTool"
- << endreq;
+ << endmsg;
return sc;
}
sc = m_histTool.retrieve();
if (sc.isFailure()) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloLWHistogramTool"
- << endreq;
+ << endmsg;
return sc;
}
sc = m_LArHVCorrTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to locate Tool LArHVCorrTool" << endreq;
+ msg(MSG::ERROR) << "Unable to locate Tool LArHVCorrTool" << endmsg;
return sc;
}
@@ -168,11 +165,11 @@ StatusCode L1CaloHVScalesMon:: initialize()
const CaloLVL1_ID* lvl1_id = 0;
sc = detStore()->retrieve(lvl1_id, "CaloLVL1_ID");
if (sc.isFailure() || !lvl1_id) {
- msg(MSG::ERROR) << "Could not get CaloLVL1_ID helper !" << endreq;
+ msg(MSG::ERROR) << "Could not get CaloLVL1_ID helper !" << endmsg;
return sc;
}
else {
- //msg(MSG::DEBUG) << " Found the CaloLVL1_ID helper. " << endreq;
+ //msg(MSG::DEBUG) << " Found the CaloLVL1_ID helper. " << endmsg;
m_lvl1Helper = (CaloLVL1_ID*) lvl1_id;
}
@@ -180,14 +177,14 @@ StatusCode L1CaloHVScalesMon:: initialize()
// L1Calo conditions service
sc = m_l1CondSvc.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve L1CaloCondSvc" << endreq;
+ msg(MSG::ERROR) << "Could not retrieve L1CaloCondSvc" << endmsg;
return sc;
}
// Retrieve cabling & tt services
sc = m_ttSvc.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not retrieve CaloTriggerTowerService Tool" << endreq;
+ msg(MSG::ERROR) << "Could not retrieve CaloTriggerTowerService Tool" << endmsg;
return sc;
}
}
@@ -208,7 +205,7 @@ StatusCode L1CaloHVScalesMon::bookHistogramsRecurrent()
/*---------------------------------------------------------*/
{
- msg(MSG::DEBUG) << "in L1CaloHVScalesMon::bookHistograms" << endreq;
+ msg(MSG::DEBUG) << "in L1CaloHVScalesMon::bookHistograms" << endmsg;
if( m_environment == AthenaMonManager::online ) {
// book histograms that are only made in the online environment...
@@ -373,7 +370,7 @@ StatusCode L1CaloHVScalesMon::bookHistogramsRecurrent()
StatusCode sc = m_ttTool->retrieveConditions();
if(!sc.isSuccess()) {
- msg(MSG::WARNING) << "Conditions not retrieved " << endreq;
+ msg(MSG::WARNING) << "Conditions not retrieved " << endmsg;
}
}
@@ -388,17 +385,17 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
if (m_events > 0) return StatusCode::SUCCESS;
const bool debug = msgLvl(MSG::DEBUG);
- if (debug) msg(MSG::DEBUG) << "in fillHistograms()" << endreq;
+ if (debug) msg(MSG::DEBUG) << "in fillHistograms()" << endmsg;
if (!m_histBooked) {
- if (debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endreq;
+ if (debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endmsg;
return StatusCode::SUCCESS;
}
// Skip events believed to be corrupt
if (m_errorTool->corrupt()) {
- if (debug) msg(MSG::DEBUG) << "Skipping corrupt event" << endreq;
+ if (debug) msg(MSG::DEBUG) << "Skipping corrupt event" << endmsg;
return StatusCode::SUCCESS;
}
@@ -409,7 +406,7 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
const CaloCellContainer* caloCellContainer = 0;
sc = evtStore()->retrieve(caloCellContainer, m_caloCellContainerName);
if(!sc.isSuccess() || !caloCellContainer) {
- msg(MSG::WARNING) << "No CaloCellContainer found at AllCalo" << endreq;
+ msg(MSG::WARNING) << "No CaloCellContainer found at AllCalo" << endmsg;
return StatusCode::SUCCESS;
}
@@ -421,11 +418,11 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
if (m_hvDifference) {
sc = m_l1CondSvc->retrieve(hvCorrectionsContainer);
if (sc.isFailure() || !hvCorrectionsContainer) {
- msg(MSG::WARNING) << "Could not retrieve HVCorrectionsContainer" << endreq;
+ msg(MSG::WARNING) << "Could not retrieve HVCorrectionsContainer" << endmsg;
}
sc = m_l1CondSvc->retrieve(rxLayersContainer);
if (sc.isFailure() || !rxLayersContainer) {
- msg(MSG::WARNING) << "Could not retrieve RxLayersContainer" << endreq;
+ msg(MSG::WARNING) << "Could not retrieve RxLayersContainer" << endmsg;
}
}
@@ -459,7 +456,7 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
const double scale = m_LArHVCorrTool->Scale(cellId);
if (debug && scale < 1.) {
msg(MSG::DEBUG) << " Current Mean Scale " << scale << " for sampling " << sampling
- << " eta/phi " << eta << "/" << phi << endreq;
+ << " eta/phi " << eta << "/" << phi << endmsg;
}
if (layer == 0) {
m_histTool->fillPPMEmEtaVsPhi(m_h_emHVScale, eta, phi, scale);
@@ -540,7 +537,7 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
sc = evtStore()->retrieve(triggerTowerTES, m_xAODTriggerTowerContainerName);
if(sc==StatusCode::FAILURE || !triggerTowerTES) {
msg(MSG::INFO) << "No xAODTriggerTower found in TES at "
- << m_xAODTriggerTowerContainerName << endreq ;
+ << m_xAODTriggerTowerContainerName << endmsg ;
return StatusCode::SUCCESS;
}
@@ -628,7 +625,7 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
currentMean = m_h_emHVScale->GetBinContent(binx, biny);
currentNCells = m_h_emHVEntry->GetBinContent(binx, biny);
if (debug && currentNCells != n1+n2) {
- msg(MSG::DEBUG) << "NCells differ at eta/phi " << eta << "/" << phi << endreq;
+ msg(MSG::DEBUG) << "NCells differ at eta/phi " << eta << "/" << phi << endmsg;
}
diffMean = (currentNCells == n1+n2) ? (currentMean - refMean)/refMean : 0.;
if (diffMean != 0.) {
@@ -640,7 +637,7 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
currentMean = m_h_hadHVScale->GetBinContent(binx, biny);
currentNCells = m_h_hadHVEntry->GetBinContent(binx, biny);
if (debug && currentNCells != n1+n2) {
- msg(MSG::DEBUG) << "NCells differ at eta/phi " << eta << "/" << phi << endreq;
+ msg(MSG::DEBUG) << "NCells differ at eta/phi " << eta << "/" << phi << endmsg;
}
diffMean = (currentNCells == n1+n2) ? (currentMean - refMean)/refMean : 0.;
if (diffMean != 0.) {
@@ -677,7 +674,7 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
const int sampling = *it;
if (debug && refMean < 1.) {
msg(MSG::DEBUG) << " Reference Mean Scale " << refMean << " for sampling " << sampling
- << " eta/phi " << eta << "/" << phi << endreq;
+ << " eta/phi " << eta << "/" << phi << endmsg;
}
int sample = sampling%4;
if (layer == 0) {
@@ -691,7 +688,7 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
diffMean = (currentNCells == (*ic)) ? (currentMean - refMean)/refMean : 0.;
if (debug && currentNCells != (*ic)) {
msg(MSG::DEBUG) << "NCells differ for sampling " << sampling
- << " eta/phi " << eta << "/" << phi << endreq;
+ << " eta/phi " << eta << "/" << phi << endmsg;
}
if (diffMean != 0.) {
m_histTool->fillPPMEmEtaVsPhi(m_v_emHVScalesDif[sample], eta, phi, diffMean);
@@ -706,7 +703,7 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
currentNCells = m_v_hadHVEntries[sample]->GetBinContent(binx, biny);
if (debug && currentNCells != (*ic)) {
msg(MSG::DEBUG) << "NCells differ for sampling " << sampling
- << " eta/phi " << eta << "/" << phi << endreq;
+ << " eta/phi " << eta << "/" << phi << endmsg;
}
diffMean = (currentNCells == (*ic)) ? (currentMean - refMean)/refMean : 0.;
if (diffMean != 0.) {
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
index f1b73b88962465b0028da24c28832a756d065f8c..70303804eeacc795d91da41dfada85e506001c05 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
@@ -143,7 +143,7 @@ StatusCode L1CaloL1TopoMon::initialize()
/*---------------------------------------------------------*/
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
m_debug = msgLvl(MSG::DEBUG);
StatusCode sc = ManagedMonitorToolBase::initialize();
@@ -152,23 +152,23 @@ StatusCode L1CaloL1TopoMon::initialize()
sc = m_configSvc.retrieve();
if ( sc.isFailure() ) {
msg(MSG::ERROR) << "Couldn't connect to " << m_configSvc.typeAndName()
- << endreq;
+ << endmsg;
return sc;
} else {
- msg(MSG::INFO) << "Connected to " << m_configSvc.typeAndName() << endreq;
+ msg(MSG::INFO) << "Connected to " << m_configSvc.typeAndName() << endmsg;
}
sc = m_errorTool.retrieve();
if ( sc.isFailure() ) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloMonErrorTool"
- << endreq;
+ << endmsg;
return sc;
}
sc = m_histTool.retrieve();
if ( sc.isFailure() ) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloLWHistogramTool"
- << endreq;
+ << endmsg;
return sc;
}
@@ -181,7 +181,7 @@ StatusCode L1CaloL1TopoMon::bookHistogramsRecurrent()
{
- msg(MSG::DEBUG) << "in L1CaloL1TopoMon::bookHistograms" << endreq;
+ msg(MSG::DEBUG) << "in L1CaloL1TopoMon::bookHistograms" << endmsg;
if ( m_environment == AthenaMonManager::online ) {
// book histograms that are only made in the online environment...
@@ -405,10 +405,10 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
{
if (m_debug) msg(MSG::DEBUG) << "in L1CaloL1TopoMon::fillHistograms"
- << endreq;
+ << endmsg;
if (!m_histBooked) {
- if (m_debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endreq;
+ if (m_debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endmsg;
return StatusCode::SUCCESS;
}
@@ -420,7 +420,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
// Validate properly unpacked input from L1Calo
if (m_errorTool->corrupt() || m_errorTool->robOrUnpackingError()) {
- if (m_debug) msg(MSG::DEBUG) << "Corrupt L1Calo event" << endreq;
+ if (m_debug) msg(MSG::DEBUG) << "Corrupt L1Calo event" << endmsg;
m_h_l1topo_1d_Errors->Fill(CALO_CONV);
}
@@ -482,7 +482,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
}
else {
ATH_MSG_DEBUG( "Found CMXCPTobCollection, looping on TOBs ..." );
- for (auto & t : *cmxcptob) {
+ for (const xAOD::CMXCPTob* t : *cmxcptob) {
if (t->energy()) {
for (int clone=0;clone<4;++clone) {
if (t->cmx()==0)
@@ -499,7 +499,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
//m_h_l1topo_1d_CMXCPTobs->Fill(std::min((int)cmxtobs.size(),MAXTOBS-1));
}
- std::vector<xAOD::CMXJetTob*> cmxtobs;
+ std::vector<const xAOD::CMXJetTob*> cmxtobs;
// Retrieve CMX jet tobs
const DataHandle<xAOD::CMXJetTobContainer> cmxtob = 0;
sc = evtStore()->retrieve(cmxtob);
@@ -509,7 +509,7 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
}
else {
ATH_MSG_DEBUG( "Found CMXJetTobCollection, looping on TOBs ..." );
- for (auto & t : *cmxtob) {
+ for (const xAOD::CMXJetTob* t : *cmxtob) {
if (t->energyLarge()) cmxtobs.push_back(t);
for (int clone=0;clone<4;++clone) {
if (t->energyLarge())
@@ -599,11 +599,11 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
std::vector<uint32_t> vFibreSizes;
std::vector<uint32_t> vFibreStatus;
- for (auto & rdo : *rdos){
+ for (const L1TopoRDO* rdo : *rdos) {
ATH_MSG_VERBOSE( *rdo );
ATH_MSG_DEBUG( "Found DAQ RDO with source ID "
<< L1Topo::formatHex8(rdo->getSourceID()) );
- auto errors = rdo->getErrors();
+ std::vector<L1Topo::Error> errors = rdo->getErrors();
if (! errors.empty()){
ATH_MSG_WARNING( "Converter errors reported: " << errors );
m_h_l1topo_1d_Errors->Fill(DAQ_CONV);
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx
index dc110c478e74e58ce157b1cf44926de3ffcd8e03..773ed0dc736d83f2c80d2da61d4801179999ef6f 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx
@@ -91,7 +91,7 @@ StatusCode L1CaloLevel2Mon::initialize()
/*---------------------------------------------------------*/
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc = ManagedMonitorToolBase::initialize();
if (sc.isFailure()) return sc;
@@ -99,14 +99,14 @@ StatusCode L1CaloLevel2Mon::initialize()
sc = m_errorTool.retrieve();
if( sc.isFailure() ) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloMonErrorTool"
- << endreq;
+ << endmsg;
return sc;
}
sc = m_histTool.retrieve();
if( sc.isFailure() ) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloLWHistogramTool"
- << endreq;
+ << endmsg;
return sc;
}
@@ -117,7 +117,7 @@ StatusCode L1CaloLevel2Mon::initialize()
StatusCode L1CaloLevel2Mon::bookHistogramsRecurrent()
/*---------------------------------------------------------*/
{
- msg(MSG::DEBUG) << "in L1CaloLevel2Mon::bookHistograms" << endreq;
+ msg(MSG::DEBUG) << "in L1CaloLevel2Mon::bookHistograms" << endmsg;
if( m_environment == AthenaMonManager::online ) {
// book histograms that are only made in the online environment...
@@ -179,17 +179,17 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
/*---------------------------------------------------------*/
{
const bool debug = msgLvl(MSG::DEBUG);
- if (debug) msg(MSG::DEBUG) << "in L1CaloLevel2Mon::fillHistograms" << endreq;
+ if (debug) msg(MSG::DEBUG) << "in L1CaloLevel2Mon::fillHistograms" << endmsg;
if (!m_histBooked) {
- if (debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endreq;
+ if (debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endmsg;
return StatusCode::SUCCESS;
}
// Skip events believed to be corrupt or with ROB errors
if (m_errorTool->corrupt() || m_errorTool->robOrUnpackingError()) {
- if (debug) msg(MSG::DEBUG) << "Skipping corrupt event" << endreq;
+ if (debug) msg(MSG::DEBUG) << "Skipping corrupt event" << endmsg;
return StatusCode::SUCCESS;
}
@@ -197,7 +197,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
const ROIB::RoIBResult* roib_rdo = 0;
StatusCode sc = evtStore()->retrieve(roib_rdo, m_L2_RoIBResultLocation);
if ( sc.isFailure() || !roib_rdo ) {
- msg(MSG::WARNING) << "ERROR retrieving RoIB RDO from store!" << endreq;
+ msg(MSG::WARNING) << "ERROR retrieving RoIB RDO from store!" << endmsg;
return sc;
}
@@ -210,7 +210,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
sc = evtStore()->retrieve(L1Calo_JEMRoI, m_L1Calo_JEMRoILocation);
if (sc == StatusCode::FAILURE || !L1Calo_JEMRoI) {
msg(MSG::INFO) << "No JEMRoI found in TES at " << m_L1Calo_JEMRoILocation
- << endreq;
+ << endmsg;
return StatusCode::SUCCESS;
}
@@ -245,7 +245,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
<< " location " << roi->location()
<< " RoI "
<< m_histTool->thresholdString(roi->hits(), nthresh)
- << endreq;
+ << endmsg;
}
} else if (roIType == LVL1::TrigT1CaloDefs::JetEtRoIWordType) {
L2_JetEtHits = it2->jetEt();
@@ -285,7 +285,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
<< " RoI "
<< m_histTool->thresholdString(
(*it_L1Calo_JEMRoI)->hits(), nthresh)
- << endreq;
+ << endmsg;
}
}
@@ -326,7 +326,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
<< m_histTool->thresholdString(hits, nthresh)
<< " L2: RoI "
<< m_histTool->thresholdString(hitsL2, nthresh)
- << endreq;
+ << endmsg;
}
m_h_l2_1d_L1NeL2Summary->Fill(JetType);
m_h_l2_2d_JEMRoIErrors->Fill(jem, crate);
@@ -352,7 +352,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
<< " L2: RoI "
<< m_histTool->thresholdString(
(*it_L2_JEMRoI)->hits(), nthresh)
- << endreq;
+ << endmsg;
}
m_h_l2_1d_L1NeL2Summary->Fill(JetType);
m_h_l2_2d_JEMRoIErrors->Fill((*it_L2_JEMRoI)->jem(),
@@ -367,7 +367,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
sc = evtStore()->retrieve (L1Calo_CR, m_L1Calo_CMMRoILocation);
if (sc == StatusCode::FAILURE || !L1Calo_CR) {
msg(MSG::INFO) << "No L1Calo CMM RoI found in TES at "
- << m_L1Calo_CMMRoILocation << endreq;
+ << m_L1Calo_CMMRoILocation << endmsg;
return StatusCode::SUCCESS;
}
@@ -420,7 +420,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
sc = evtStore()->retrieve(L1Calo_CPMRoI, m_L1Calo_CPMRoILocation);
if (sc == StatusCode::FAILURE || !L1Calo_CPMRoI) {
msg(MSG::INFO) << "No CPMRoI found in TES at " << m_L1Calo_CPMRoILocation
- << endreq;
+ << endmsg;
return StatusCode::SUCCESS;
}
@@ -447,7 +447,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
<< " location " << roi->location()
<< " RoI "
<< m_histTool->thresholdString(roi->hits(), nthresh)
- << endreq;
+ << endmsg;
}
}
}
@@ -469,7 +469,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
<< " RoI "
<< m_histTool->thresholdString(
(*it_L1Calo_CPMRoI)->hits(), nthresh)
- << endreq;
+ << endmsg;
}
}
@@ -511,7 +511,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
<< m_histTool->thresholdString(hits, nthresh)
<< " L2: RoI "
<< m_histTool->thresholdString(hitsL2, nthresh)
- << endreq;
+ << endmsg;
}
const int hitsEmL2 = hitsL2 & 0xff;
const int hitsTauL2 = (hitsL2 >> 8) & 0xff;
@@ -552,7 +552,7 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
<< m_histTool->thresholdString(hitsL1, nthresh)
<< " L2: RoI "
<< m_histTool->thresholdString(hits, nthresh)
- << endreq;
+ << endmsg;
}
if (hitsEm) {
m_h_l2_1d_L1NeL2Summary->Fill(EMType);
@@ -596,4 +596,4 @@ void L1CaloLevel2Mon::setLabels(LWHist* hist, bool xAxis)
}
// ============================================================================
} // end namespace
-// ============================================================================
\ No newline at end of file
+// ============================================================================
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx
index 4827d2f4bdcb475e04d04d388e78cea5d159e0e7..73325ec7653b19d8c30b00b3e8c493e57dcb91a1 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx
@@ -93,7 +93,7 @@ StatusCode L1CaloPMTScoresMon:: initialize()
/*---------------------------------------------------------*/
{
msg(MSG::INFO) << "Initializing " << name() << " - package version "
- << PACKAGE_VERSION << endreq;
+ << PACKAGE_VERSION << endmsg;
StatusCode sc;
@@ -102,44 +102,44 @@ StatusCode L1CaloPMTScoresMon:: initialize()
sc = m_cells2tt.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to locate tool L1CaloCells2TriggerTowers" << endreq;
+ msg(MSG::ERROR) << "Unable to locate tool L1CaloCells2TriggerTowers" << endmsg;
return sc;
}
sc = m_ttIdTools.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to locate tool L1CaloTTIdTools" << endreq;
+ msg(MSG::ERROR) << "Unable to locate tool L1CaloTTIdTools" << endmsg;
return sc;
}
sc = m_ttTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to locate tool L1TriggerTowerTool" << endreq;
+ msg(MSG::ERROR) << "Unable to locate tool L1TriggerTowerTool" << endmsg;
return sc;
}
sc = m_errorTool.retrieve();
if( sc.isFailure() ) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloMonErrorTool"
- << endreq;
+ << endmsg;
return sc;
}
sc = m_histTool.retrieve();
if (sc.isFailure()) {
msg(MSG::ERROR) << "Unable to locate Tool TrigT1CaloLWHistogramTool"
- << endreq;
+ << endmsg;
return sc;
}
sc = detStore()->retrieve(m_tileHWID);
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Unable to retrieve TileHWID helper from DetectorStore" << endreq;
+ msg(MSG::ERROR) << "Unable to retrieve TileHWID helper from DetectorStore" << endmsg;
return sc;
}
sc = m_tileBadChanTool.retrieve();
if (sc.isFailure()) {
- msg(MSG::ERROR) << "Could not access tileBadChanTool" << endreq;
+ msg(MSG::ERROR) << "Could not access tileBadChanTool" << endmsg;
return sc;
}
@@ -159,7 +159,7 @@ StatusCode L1CaloPMTScoresMon::bookHistogramsRecurrent()
/*---------------------------------------------------------*/
{
- msg(MSG::DEBUG) << "in L1CaloPMTScoresMon::bookHistograms" << endreq;
+ msg(MSG::DEBUG) << "in L1CaloPMTScoresMon::bookHistograms" << endmsg;
if( m_environment == AthenaMonManager::online ) {
// book histograms that are only made in the online environment...
@@ -203,7 +203,7 @@ StatusCode L1CaloPMTScoresMon::bookHistogramsRecurrent()
StatusCode sc = m_ttTool->retrieveConditions();
if(!sc.isSuccess()) {
- msg(MSG::WARNING) << "Conditions not retrieved " << endreq;
+ msg(MSG::WARNING) << "Conditions not retrieved " << endmsg;
}
}
@@ -218,17 +218,17 @@ StatusCode L1CaloPMTScoresMon::fillHistograms()
if (m_events > 0) return StatusCode::SUCCESS;
const bool debug = msgLvl(MSG::DEBUG);
- if (debug) msg(MSG::DEBUG) << "in fillHistograms()" << endreq;
+ if (debug) msg(MSG::DEBUG) << "in fillHistograms()" << endmsg;
if (!m_histBooked) {
- if (debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endreq;
+ if (debug) msg(MSG::DEBUG) << "Histogram(s) not booked" << endmsg;
return StatusCode::SUCCESS;
}
// Skip events believed to be corrupt
if (m_errorTool->corrupt()) {
- if (debug) msg(MSG::DEBUG) << "Skipping corrupt event" << endreq;
+ if (debug) msg(MSG::DEBUG) << "Skipping corrupt event" << endmsg;
return StatusCode::SUCCESS;
}
@@ -239,7 +239,7 @@ StatusCode L1CaloPMTScoresMon::fillHistograms()
const CaloCellContainer* caloCellContainer = 0;
sc = evtStore()->retrieve(caloCellContainer, m_caloCellContainerName);
if(!sc.isSuccess() || !caloCellContainer) {
- msg(MSG::WARNING) << "No CaloCellContainer found at AllCalo" << endreq;
+ msg(MSG::WARNING) << "No CaloCellContainer found at AllCalo" << endmsg;
return StatusCode::SUCCESS;
}
@@ -260,7 +260,7 @@ StatusCode L1CaloPMTScoresMon::fillHistograms()
const CaloDetDescrElement* caloDDE = caloCell->caloDDE();
if (!caloDDE->is_tile()) continue;
- const Identifier cellId(caloCell->ID());
+ //const Identifier cellId(caloCell->ID());
const Identifier invalidId(0);
Identifier ttId1(0);
Identifier ttId2(0);
@@ -300,7 +300,7 @@ StatusCode L1CaloPMTScoresMon::fillHistograms()
sc = evtStore()->retrieve(triggerTowerTES, m_xAODTriggerTowerContainerName);
if(sc==StatusCode::FAILURE || !triggerTowerTES) {
msg(MSG::INFO) << "No xAODTriggerTower found in TES at "
- << m_xAODTriggerTowerContainerName << endreq ;
+ << m_xAODTriggerTowerContainerName << endmsg ;
return StatusCode::SUCCESS;
}