diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/CMMMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/CMMMon.cxx
index 0fb63b2fa68dc8fd0076546b0604d8d3d245e13b..de979b2e82bfc1795f7ba64ee2b23607bf0f67fa 100755
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/CMMMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/CMMMon.cxx
@@ -159,7 +159,7 @@ StatusCode CMMMon::bookHistogramsRecurrent()
//if ( newLumiBlock ) { }
- if ( newRun ) {
+ if ( newRunFlag() ) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
MonGroup CMM_inputThresh( this, m_PathInRootFile+"/Input/Thresholds",
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPMSimBSMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPMSimBSMon.cxx
index e89581c1806ca4dd601025e4581f55393423ccd0..632cfcd302f9507744ee2c2fef21aa34f8a82c29 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPMSimBSMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPMSimBSMon.cxx
@@ -213,7 +213,7 @@ StatusCode CPMSimBSMon::bookHistogramsRecurrent()
//if ( newLumiBlock ) { }
- if ( newRun ) {
+ if ( newRunFlag() ) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
std::string dir1(m_rootDir + "/CPM/Errors/Transmission_Simulation");
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPMon.cxx
index 60370b8562dafddede64327c9a92130d017f38ee..44e17a65ce2af21129a1f6f5fba7a4ac612e3d8a 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPMon.cxx
@@ -229,7 +229,7 @@ StatusCode CPMon::bookHistogramsRecurrent()
MgmtAttr_t attr = ATTRIB_UNMANAGED;
- if ( newRun ) {
+ if ( newRunFlag() ) {
std::string errorDir(m_rootDir + "/Errors/Hardware");
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPSimMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPSimMon.cxx
index 9428826b78772cdd988e55b113f259c0bb0fd6be..6f5fb1e20346b734dfc6217202817a92fa169de1 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPSimMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/CPSimMon.cxx
@@ -239,7 +239,7 @@ StatusCode CPSimMon::bookHistogramsRecurrent() {
//if (newEventsBlock || newLumiBlock) {
//}
- if (newRun) {
+ if (newRunFlag()) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
std::string dir1(m_rootDir + "/Errors/Transmission_Simulation");
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEMMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEMMon.cxx
index 3287cf3d37ce506233f6a5ae7d72951453499b2a..b71edf1fb6585437f17eaacdf90597e79404dff6 100755
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEMMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEMMon.cxx
@@ -159,7 +159,7 @@ StatusCode JEMMon::bookHistogramsRecurrent()
// if ( newLumiBlock) { }
- if (newRun) {
+ if (newRunFlag()) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
MonGroup JetElements_expert(this, m_PathInRootFile + "/Input", run, attr);
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPCMXMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPCMXMon.cxx
index e6b34dd85a0959827224496e694cc7d488cd77ed..d5fd082bb0d2ad847118450afd63392e255476b0 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPCMXMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPCMXMon.cxx
@@ -191,7 +191,7 @@ StatusCode JEPCMXMon::bookHistogramsRecurrent()
//if ( newEventsBlock || newLumiBlock) { }
- if ( newRun ) {
+ if ( newRunFlag() ) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
MonGroup CMX_inputJet( this, m_rootDir + "/Input/Jet", run, attr );
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPJEMMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPJEMMon.cxx
index a1474d138c1bfb6e1c81323702dfd23961916f8d..97b44b64b97eb07b6cb57c865f6831c4016472ae 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPJEMMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPJEMMon.cxx
@@ -162,7 +162,7 @@ StatusCode JEPJEMMon::bookHistogramsRecurrent()
//if ( newEventsBlock || newLumiBlock) { }
- if ( newRun ) {
+ if ( newRunFlag() ) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
MonGroup JetElements_expert(this, m_rootDir + "/Input", run, attr);
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx
index 222bc0dbbb97d6d061bbdb29f8c86fe6f6683586..59d0c0cee73ee76183989c066e5d32cafeff5b2e 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx
@@ -343,7 +343,7 @@ StatusCode JEPSimMon::bookHistogramsRecurrent()
// if (newEventsBlock || newLumiBlock) {
//}
- if (newRun)
+ if (newRunFlag())
{
MgmtAttr_t attr = ATTRIB_UNMANAGED;
std::string dir1(m_rootDir + "/Errors/Transmission_Simulation");
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficienciesMonTool.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficienciesMonTool.cxx
index e08470fe23faa64c49e093f6803f7c171062a3fa..ae9002ba5cd3de823950c6060585c6fd2c34ae59 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficienciesMonTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficienciesMonTool.cxx
@@ -289,7 +289,7 @@ StatusCode JetEfficienciesMonTool::bookHistogramsRecurrent()
//if (newLumiBlock) {
//}
- if (newRun) {
+ if (newRunFlag()) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
std::string dir(m_rootDir + "/Reco/JetEfficiencies");
@@ -651,7 +651,7 @@ StatusCode JetEfficienciesMonTool::procHistograms()
//if (endOfLumiBlock) {
//}
- if (endOfRun) {
+ if (endOfRunFlag()) {
msg(MSG::DEBUG) << "Number of offline jets = " << m_numOffJets << endmsg;
msg(MSG::DEBUG) << "Number of events = " << m_numEvents << endmsg;
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/OverviewMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/OverviewMon.cxx
index 9fd78f62a9bf0b19e34035931fa890721ff665d0..6f30064dd0ce1c428abad418fe62ca1ee0a8ab02 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/OverviewMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/OverviewMon.cxx
@@ -159,7 +159,7 @@ StatusCode OverviewMon::bookHistogramsRecurrent()
bool online = (m_onlineTest || m_environment == AthenaMonManager::online);
- if (newRun || newLumiBlock) {
+ if (newRunFlag() || newLumiBlockFlag()) {
// Get lumiblock number
m_lumiNo = 0;
@@ -170,9 +170,9 @@ StatusCode OverviewMon::bookHistogramsRecurrent()
}
}
- if ((newLumiBlock && !online) || newRun) {
+ if ((newLumiBlockFlag() && !online) || newRunFlag()) {
std::string dir(m_rootDir + "/Errors");
- MonGroup monGlobal(this, dir, (newLumiBlock && !online) ? lumiBlock : run,
+ MonGroup monGlobal(this, dir, (newLumiBlockFlag() && !online) ? lumiBlock : run,
ATTRIB_UNMANAGED);
// Global Error Overview
@@ -225,7 +225,7 @@ StatusCode OverviewMon::bookHistogramsRecurrent()
m_lumipos = 0;
m_luminumbers[m_lumipos] = m_lumiNo;
}
- } else if (newLumiBlock && online) {
+ } else if (newLumiBlockFlag() && online) {
// Update last few lumiblocks plots
m_lumipos = -1;
@@ -257,12 +257,12 @@ StatusCode OverviewMon::bookHistogramsRecurrent()
} // end if ((newLumiBlock && ...
- if (newRun || newLumiBlock) {
+ if (newRunFlag() || newLumiBlockFlag()) {
// Errors by lumiblock/time plots
// On Tier0 only kept if non-empty
if (m_lumiNo) {
- if (newRun) {
+ if (newRunFlag()) {
std::string dir(m_rootDir + "/Errors");
MonGroup monLumi(this, dir, run, ATTRIB_UNMANAGED);
if (online)
@@ -346,7 +346,7 @@ StatusCode OverviewMon::bookHistogramsRecurrent()
// Total events processed and total rejected as corrupt
- if (newRun) {
+ if (newRunFlag()) {
MonGroup monEvents(this, m_rootDir, run, ATTRIB_UNMANAGED);
m_histTool->setMonGroup(&monEvents);
int bins = (m_errorTool->flagCorruptEvents() == "None") ? 1 : 2;
@@ -730,7 +730,7 @@ StatusCode OverviewMon::procHistograms()
//}
bool online = (m_onlineTest || m_environment == AthenaMonManager::online);
- if (endOfRun && !online) {
+ if (endOfRunFlag() && !online) {
if (m_h_l1calo_1d_ErrorsByLumiblock &&
m_h_l1calo_1d_ErrorsByLumiblock->GetEntries() == 0.) {
delete m_h_l1calo_1d_ErrorsByLumiblock;
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.cxx
index 1986aff423d7e9ccbad584bf9f078494d329c976..393a3f6ddb87559ede65b1e6b4a63dc555123c96 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.cxx
@@ -135,7 +135,7 @@ StatusCode PPMSimBSMon::bookHistogramsRecurrent()
//if ( newLumiBlock ) { }
- if ( newRun ) {
+ if ( newRunFlag() ) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
std::string dir(m_rootDir + "/PPM/Errors/Data_Simulation");
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPrMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPrMon.cxx
index 47a502e2d4c4467906b2762a5b9c07d1453c17ef..fe36f1962adafc1c8306a8306386364313e7daac 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPrMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPrMon.cxx
@@ -165,7 +165,7 @@ StatusCode PPrMon::bookHistogramsRecurrent()
MgmtAttr_t attr = ATTRIB_UNMANAGED;
- if (newRun) {
+ if (newRunFlag()) {
MonGroup TT_LutCpHitMaps(this, m_PathInRootFile + "/LUT-CP/EtaPhiMaps", run,
attr);
@@ -584,7 +584,7 @@ StatusCode PPrMon::bookHistogramsRecurrent()
m_histTool->numbers(m_h_ppm_had_1d_tt_adc_TriggeredSlice, 0, m_SliceNo - 1);
}
- if (newLumiBlock) {
+ if (newLumiBlockFlag()) {
//---------------------------- LUT-CP Hitmaps per threshold
//-----------------
@@ -652,7 +652,7 @@ StatusCode PPrMon::bookHistogramsRecurrent()
}
m_histTool->unsetMonGroup();
- if (newRun)
+ if (newRunFlag())
m_histBooked = true;
//---------------------------- LUT-JEP Hitmaps per threshold
@@ -721,7 +721,7 @@ StatusCode PPrMon::bookHistogramsRecurrent()
}
m_histTool->unsetMonGroup();
- if (newRun)
+ if (newRunFlag())
m_histBooked = true;
}
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPrSpareMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPrSpareMon.cxx
index 2b2aa16b0069fab2572e9889e3aca1639496c7a9..668c31b51ec86314048a2f7d65f8c0fb6ad65a8d 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPrSpareMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPrSpareMon.cxx
@@ -124,7 +124,7 @@ StatusCode PPrSpareMon::bookHistogramsRecurrent()
//if ( newLumiBlock) { }
- if ( newRun ) {
+ if ( newRunFlag() ) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
MonGroup TT_ADC(this, m_PathInRootFile+"/ADC", run, attr);
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/RODMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/RODMon.cxx
index 13596b3dde259636f48652514953feda76ce9e61..42eb34b19c532cefaa71f82c539ea1a269bff273 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/RODMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/RODMon.cxx
@@ -146,7 +146,7 @@ StatusCode RODMon::bookHistogramsRecurrent()
//if ( newEventsBlock || newLumiBlock ) { }
- if ( newRun ) {
+ if ( newRunFlag() ) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/RODMonV1.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/RODMonV1.cxx
index 47beb79f4b9a700e3907ed449135c4901d5cf11c..5a3156daec66f64ccdf94ff7eb1948f30704f503 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/RODMonV1.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/RODMonV1.cxx
@@ -138,7 +138,7 @@ StatusCode RODMonV1::bookHistogramsRecurrent()
//if ( newLumiBlock ) { }
- if ( newRun ) {
+ if ( newRunFlag() ) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
std::string dir1(m_rootDir + "/ROD");
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/TagProbeEfficiencyMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/TagProbeEfficiencyMon.cxx
index 3bf4034a632e1b94cd2fe9a88d099338979f9d6a..515d036453a8c3aa233c3f17192bbfee0d3659a1 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/TagProbeEfficiencyMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/TagProbeEfficiencyMon.cxx
@@ -156,7 +156,7 @@ StatusCode TagProbeEfficiencyMon::bookHistogramsRecurrent()
MgmtAttr_t attr = ATTRIB_UNMANAGED;
- if (newRun) {
+ if (newRunFlag()) {
// Create the directories & MonGroups for the histograms
// Each directory has its own MonGroup
@@ -429,7 +429,7 @@ StatusCode TagProbeEfficiencyMon::procHistograms()
msg(MSG::DEBUG) << "procHistograms entered" << endmsg;
- if (endOfLumiBlock) {
+ if (endOfLumiBlockFlag()) {
// At the end of each lumiblock add all the information to *_lumib_int* histograms, for use at end of run
// Currently brute forcing this, however this is mostly what is done underneath TH1::Add
TrigConf::L1DataDef def;
@@ -485,7 +485,7 @@ StatusCode TagProbeEfficiencyMon::procHistograms()
}
}
}
- if (endOfRun){
+ if (endOfRunFlag()){
TrigConf::L1DataDef def;
if (m_configSvc->ctpConfig()) {
const std::vector<TrigConf::TriggerThreshold*>& end_thresholds(m_configSvc->ctpConfig()->menu().thresholdVector());
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/TrigT1CaloCpmMonTool.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/TrigT1CaloCpmMonTool.cxx
index d09ea41db8f2227987ff82888cac4a4186f532ec..dfe5d4c94a77caf4b31b8b9bc514ecd2c43b35b6 100755
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/TrigT1CaloCpmMonTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/TrigT1CaloCpmMonTool.cxx
@@ -186,7 +186,7 @@ StatusCode TrigT1CaloCpmMonTool::bookHistogramsRecurrent()
//if ( newLumiBlock ) { }
- if ( newRun ) {
+ if ( newRunFlag() ) {
MgmtAttr_t attr = ATTRIB_UNMANAGED;
std::string dir1(m_rootDir + "/CPM");
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/TrigT1CaloGlobalMonTool.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/TrigT1CaloGlobalMonTool.cxx
index a66184b8ba9729759c234c9afa5a6ffd1f4a8d7c..265c2636f0023930c7b85e4424088d2ea89eae54 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/TrigT1CaloGlobalMonTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/TrigT1CaloGlobalMonTool.cxx
@@ -134,7 +134,7 @@ StatusCode TrigT1CaloGlobalMonTool::bookHistogramsRecurrent()
bool online = (m_onlineTest || m_environment == AthenaMonManager::online);
MgmtAttr_t attr = ATTRIB_UNMANAGED;
- if ( newRun || newLumiBlock ) {
+ if ( newRunFlag() || newLumiBlockFlag() ) {
// Get lumiblock number
@@ -146,11 +146,11 @@ StatusCode TrigT1CaloGlobalMonTool::bookHistogramsRecurrent()
}
}
- if ((newLumiBlock && !online) || newRun ) {
+ if ((newLumiBlockFlag() && !online) || newRunFlag() ) {
std::string dir(m_rootDir + "/Overview/Errors");
MonGroup monGlobal( this, dir,
- ((newLumiBlock && !online) ? lumiBlock : run), attr );
+ ((newLumiBlockFlag() && !online) ? lumiBlock : run), attr );
// Global Error Overview
@@ -200,7 +200,7 @@ StatusCode TrigT1CaloGlobalMonTool::bookHistogramsRecurrent()
m_lumipos = 0;
m_luminumbers[m_lumipos] = m_lumiNo;
}
- } else if (newLumiBlock && online) {
+ } else if (newLumiBlockFlag() && online) {
// Update last few lumiblocks plots
@@ -227,13 +227,13 @@ StatusCode TrigT1CaloGlobalMonTool::bookHistogramsRecurrent()
} // end if ((newLumiBlock && ...
- if ( newRun || newLumiBlock ) {
+ if ( newRunFlag() || newLumiBlockFlag() ) {
// Errors by lumiblock/time plots
// On Tier0 only kept if non-empty
if( m_lumiNo ) {
- if (newRun) {
+ if (newRunFlag()) {
std::string dir(m_rootDir + "/Overview/Errors");
MonGroup monLumi( this, dir, run, attr);
if (online) m_histTool->setMonGroup(&monLumi);
@@ -306,7 +306,7 @@ StatusCode TrigT1CaloGlobalMonTool::bookHistogramsRecurrent()
// Total events processed and total rejected as corrupt
- if ( newRun ) {
+ if ( newRunFlag() ) {
std::string dir(m_rootDir + "/Overview");
MonGroup monEvents( this, dir, run, attr);
m_histTool->setMonGroup(&monEvents);
@@ -642,7 +642,7 @@ StatusCode TrigT1CaloGlobalMonTool::procHistograms()
//}
bool online = (m_onlineTest || m_environment == AthenaMonManager::online);
- if (endOfRun && !online) {
+ if (endOfRunFlag() && !online) {
if (m_h_l1calo_1d_ErrorsByLumiblock && m_h_l1calo_1d_ErrorsByLumiblock->GetEntries() == 0.) {
delete m_h_l1calo_1d_ErrorsByLumiblock;
m_h_l1calo_1d_ErrorsByLumiblock = 0;