diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx
index 7466786c74d0542b6f65d564aae7c4b0e7977cde..9d549720a64503c0d581165898a2d9412eceaffe 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/CalorimeterL1CaloMon.cxx
@@ -241,9 +241,9 @@ StatusCode CalorimeterL1CaloMon::bookHistogramsRecurrent()
     // book histograms that are only relevant for cosmics data...
   }
 
-  if ( newLumiBlock) { }
+  //if ( newLumiBlockFlag()) { }
 
-  if ( newRun ) {	
+  if ( newRunFlag() ) {	
 
     MgmtAttr_t attr = ATTRIB_UNMANAGED;
     MonGroup Calo( this, m_PathInRootFile+"/CalorimeterData", run, attr );
@@ -1175,9 +1175,9 @@ StatusCode CalorimeterL1CaloMon::fillHistograms()
 StatusCode CalorimeterL1CaloMon::procHistograms()
 /*---------------------------------------------------------*/
 {
-  if ( endOfLumiBlock ) { }
+  //if ( endOfLumiBlockFlag() ) { }
 	
-  if ( endOfRun ) { }
+  //if ( endOfRunFlag() ) { }
   
   return StatusCode::SUCCESS;
 }
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx
index 1a62eff9442e55aa5ceba6280ed75d36c82ff1ec..001076f45a18228aa7fbe41f981c004dcc2321b9 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloCTPMon.cxx
@@ -158,9 +158,9 @@ StatusCode L1CaloCTPMon::bookHistogramsRecurrent()
     // book histograms that are only relevant for cosmics data...
   }
   
-  if( newLumiBlock ) {}
+  //if( newLumiBlockFlag() ) {}
 
-  if( newRun ) {	
+  if( newRunFlag() ) {	
 
     MgmtAttr_t attr = ATTRIB_UNMANAGED;
     MonGroup L1CaloCTP( this, m_PathInRootFile, run, attr );
@@ -564,9 +564,9 @@ StatusCode L1CaloCTPMon::fillHistograms()
 StatusCode L1CaloCTPMon::procHistograms()
 /*---------------------------------------------------------*/
 {
-  if( endOfLumiBlock ) { }
+  //if( endOfLumiBlockFlag() ) { }
 	
-  if( endOfRun ) { }
+  //if( endOfRunFlag() ) { }
   
   return StatusCode::SUCCESS;
 }
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
index 9f7b06681cd613d248073716f84b68f5c3d91f29..24e8734d41be6aa8bd60fcffe7c1597d49466f23 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloHVScalesMon.cxx
@@ -215,9 +215,9 @@ StatusCode L1CaloHVScalesMon::bookHistogramsRecurrent()
     // book histograms that are only relevant for cosmics data...
   }
 
-  if ( newLumiBlock) { }
+  //if ( newLumiBlockFlag()) { }
 
-  if ( newRun ) {	
+  if ( newRunFlag() ) {	
 
     MgmtAttr_t attr = ATTRIB_UNMANAGED;
     MonGroup Calo_HVCorr( this, m_PathInRootFile+"/HVCorrections",
@@ -734,9 +734,9 @@ StatusCode L1CaloHVScalesMon::fillHistograms()
 StatusCode L1CaloHVScalesMon::procHistograms()
 /*---------------------------------------------------------*/
 {
-  if ( endOfLumiBlock ) { }
+  //if ( endOfLumiBlockFlag() ) { }
 	
-  if ( endOfRun ) { }
+  //if ( endOfRunFlag() ) { }
   
   return StatusCode::SUCCESS;
 }
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
index 70303804eeacc795d91da41dfada85e506001c05..efbfbdedabb4fd65cd2aeeb125e5acf87c9a4f73 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloL1TopoMon.cxx
@@ -191,9 +191,9 @@ StatusCode L1CaloL1TopoMon::bookHistogramsRecurrent()
     // book histograms that are only relevant for cosmics data...
   }
 
-  if ( newLumiBlock ) {}
+  //if ( newLumiBlockFlag() ) {}
 
-  if ( newRun ) {
+  if ( newRunFlag() ) {
 
     MgmtAttr_t attr = ATTRIB_UNMANAGED;
     MonGroup L1CaloL1Topo( this, m_PathInRootFile, run, attr );
@@ -858,11 +858,11 @@ StatusCode L1CaloL1TopoMon::fillHistograms()
 StatusCode L1CaloL1TopoMon::procHistograms()
 /*---------------------------------------------------------*/
 {
-  if ( endOfLumiBlock ) { }  
-  if ( endOfRun ) { }
+  //if ( endOfLumiBlockFlag() ) { }  
+  //if ( endOfRunFlag() ) { }
   
-  if ( endOfLumiBlock || endOfRun ) {
-    int eor=(endOfRun ? 1 : 0);
+  if ( endOfLumiBlockFlag() || endOfRunFlag() ) {
+    int eor=(endOfRunFlag() ? 1 : 0);
     for (int cpu=0; cpu<=3; ++cpu) {
       for (int item=1; item<=32; ++item) {
 	for (int bc=1; bc<=3; ++bc) {
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx
index 773ed0dc736d83f2c80d2da61d4801179999ef6f..09f379b0ff84abedc25fba1732350ef435783384 100755
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloLevel2Mon.cxx
@@ -127,9 +127,9 @@ StatusCode L1CaloLevel2Mon::bookHistogramsRecurrent()
     // book histograms that are only relevant for cosmics data...
   }
 
-  if( newLumiBlock ) { }
+  //if( newLumiBlockFlag() ) { }
   
-  if( newRun ) {	
+  if( newRunFlag() ) {	
 
     MgmtAttr_t attr = ATTRIB_UNMANAGED;
     MonGroup L1CaloLevel2( this, m_PathInRootFile, run, attr );
@@ -575,9 +575,9 @@ StatusCode L1CaloLevel2Mon::fillHistograms()
 StatusCode L1CaloLevel2Mon::procHistograms()
 /*---------------------------------------------------------*/
 {
-  if( endOfLumiBlock ) { }
+  //if( endOfLumiBlockFlag() ) { }
 	
-  if( endOfRun ) { }
+  //if( endOfRunFlag ) { }
   
   return StatusCode::SUCCESS;
 }
diff --git a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx
index 73325ec7653b19d8c30b00b3e8c493e57dcb91a1..b7c056b1961f5aa04ef9387a142e97eb4158949b 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx
+++ b/Trigger/TrigT1/TrigT1Monitoring/src/L1CaloPMTScoresMon.cxx
@@ -169,9 +169,9 @@ StatusCode L1CaloPMTScoresMon::bookHistogramsRecurrent()
     // book histograms that are only relevant for cosmics data...
   }
 
-  if ( newLumiBlock) { }
+  //if ( newLumiBlockFlag()) { }
 
-  if ( newRun ) {	
+  if ( newRunFlag() ) {	
 
     MgmtAttr_t attr = ATTRIB_UNMANAGED;
     MonGroup Calo_PMTScore( this, m_PathInRootFile+"/PMTGainScores",
@@ -328,9 +328,9 @@ StatusCode L1CaloPMTScoresMon::fillHistograms()
 StatusCode L1CaloPMTScoresMon::procHistograms()
 /*---------------------------------------------------------*/
 {
-  if ( endOfLumiBlock ) { }
+  //if ( endOfLumiBlockFlag() ) { }
 	
-  if ( endOfRun ) { }
+  //if ( endOfRunFlag() ) { }
   
   return StatusCode::SUCCESS;
 }