Merge pull request #17832 from jfernan2/changesToOnlineDTDQM

Changes to online DT DQM
cms-sw · Mar 28, 2017 · b2618b6 · b2618b6
2 parents 61ed2fc + 9008333
commit b2618b6
Show file tree

Hide file tree

Showing 30 changed files with 405 additions and 155 deletions.
diff --git a/DQM/DTMonitorClient/python/dtFineDelayCorr_cfi.py b/DQM/DTMonitorClient/python/dtFineDelayCorr_cfi.py
@@ -36,3 +36,6 @@
 )
 
 
+from Configuration.Eras.Modifier_run2_common_cff import run2_common
+run2_common.toModify( dtFineDelayCorr, hwSources = cms.untracked.vstring('TM'))
+
diff --git a/DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py b/DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py
@@ -13,6 +13,7 @@
     folderRoot = cms.untracked.string('')
 )
 
-from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific
-run2_25ns_specific.toModify( triggerEfficiencyTest,hwSources = cms.untracked.vstring('TM') )
+from Configuration.Eras.Modifier_run2_common_cff import run2_common
+run2_common.toModify( triggerEfficiencyTest, hwSources = cms.untracked.vstring('TM'))
+
 
diff --git a/DQM/DTMonitorClient/python/dtLocalTriggerLutTest_cfi.py b/DQM/DTMonitorClient/python/dtLocalTriggerLutTest_cfi.py
@@ -15,4 +15,6 @@
     folderRoot = cms.untracked.string('')
 )
 
+from Configuration.Eras.Modifier_run2_common_cff import run2_common
+run2_common.toModify( triggerLutTest, hwSources = cms.untracked.vstring('TM'))
 
diff --git a/DQM/DTMonitorClient/python/dtLocalTriggerSynchTest_cfi.py b/DQM/DTMonitorClient/python/dtLocalTriggerSynchTest_cfi.py
@@ -27,3 +27,6 @@
 )
 
 
+from Configuration.Eras.Modifier_run2_common_cff import run2_common
+run2_common.toModify( triggerSynchTest, hwSources = cms.untracked.vstring('TM'))
+
diff --git a/DQM/DTMonitorClient/python/dtLocalTriggerTest_TP_cfi.py b/DQM/DTMonitorClient/python/dtLocalTriggerTest_TP_cfi.py
@@ -13,4 +13,6 @@
     folderRoot = cms.untracked.string(''),
 )
 
+from Configuration.Eras.Modifier_run2_common_cff import run2_common
+run2_common.toModify( dtTPTriggerTest, hwSources = cms.untracked.vstring('TM'))
 
diff --git a/DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py b/DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py
@@ -25,6 +25,6 @@
 
 )
 
-from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific
-run2_25ns_specific.toModify( triggerTest,hwSources = cms.untracked.vstring('TM') )
+from Configuration.Eras.Modifier_run2_common_cff import run2_common
+run2_common.toModify( triggerTest, hwSources = cms.untracked.vstring('TM'))
 
diff --git a/DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py b/DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py
@@ -15,6 +15,6 @@
     detailedAnalysis = cms.untracked.bool(False)                                  
 )
 
-from Configuration.Eras.Modifier_run2_25ns_specific_cff import run2_25ns_specific
-run2_25ns_specific.toModify( triggerEffTest,hwSources = cms.untracked.vstring('TM') )
+from Configuration.Eras.Modifier_run2_common_cff import run2_common
+run2_common.toModify( triggerEffTest, hwSources = cms.untracked.vstring('TM'))
 
diff --git a/DQM/DTMonitorClient/src/DTDataIntegrityTest.cc b/DQM/DTMonitorClient/src/DTDataIntegrityTest.cc
@@ -141,14 +141,12 @@ DTDataIntegrityTest::~DTDataIntegrityTest(){
 	for(int rosNumber = 1; rosNumber <= 12; ++rosNumber) { // loop on the ROS
 	  int wheelNumber, sectorNumber;
 	  if (!readOutToGeometry(dduId,rosNumber,wheelNumber,sectorNumber)) {
-	    int result = -2;
 	    float nErrors  = histoFEDSummary->Integral(1,14,rosNumber,rosNumber);
-	    nErrors += histoROSStatus->Integral(2,8,rosNumber,rosNumber);
-	    if(nErrors == 0) { // no errors
-	      result = 0;
-	    } else { // there are errors
-	      result = 2;
-	    }
+	    float nROBErrors = histoROSStatus->Integral(2,8,rosNumber,rosNumber);
+	    nErrors += nROBErrors;
+	    float result =0.;
+	    if(nFEDEvts!=0) 
+		result =  max((float)0., ((float)nFEDEvts-nROBErrors)/(float)nFEDEvts); 
 	    summaryHisto->setBinContent(sectorNumber,wheelNumber+3,result);
 	    int tdcResult = -2;
 	    float nTDCErrors = histoFEDSummary->Integral(15,15,rosNumber,rosNumber); 
@@ -164,7 +162,7 @@ DTDataIntegrityTest::~DTDataIntegrityTest(){
 
 	    if(fedNotReadout) {
 	      // no data in this FED: it is off
-	      summaryHisto->setBinContent(sectorNumber,wheelNumber+3,1);
+	      summaryHisto->setBinContent(sectorNumber,wheelNumber+3,0);
 	      summaryTDCHisto->setBinContent(sectorNumber,wheelNumber+3,1);
 	      glbSummaryHisto->setBinContent(sectorNumber,wheelNumber+3,0);
 	    }
@@ -175,7 +173,7 @@ DTDataIntegrityTest::~DTDataIntegrityTest(){
 	for(int rosNumber = 1; rosNumber <= 12; ++rosNumber) {
 	  int wheelNumber, sectorNumber;
 	  if (!readOutToGeometry(dduId,rosNumber,wheelNumber,sectorNumber)) {
-	    summaryHisto->setBinContent(sectorNumber,wheelNumber+3,1);
+	    summaryHisto->setBinContent(sectorNumber,wheelNumber+3,0);
 	    summaryTDCHisto->setBinContent(sectorNumber,wheelNumber+3,1);
 	    glbSummaryHisto->setBinContent(sectorNumber,wheelNumber+3,0);
 	  } 

diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerEfficiencyTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerEfficiencyTest.cc
@@ -128,7 +128,7 @@ void DTLocalTriggerEfficiencyTest::runClientDiagnostic(DQMStore::IBooker & ibook
 	for (int wh=-2; wh<=2; ++wh){
 	  for (int sect=1; sect<=12; ++sect){
 	    DTChamberId chId(wh,stat,sect);
-	    int sector_id = (wh+3)+(sect-1)*5;
+	    int sector_id = (wh+wheelArrayShift)+(sect-1)*5;
 	    uint32_t indexCh = chId.rawId();
 
 

diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerEfficiencyTest.h b/DQM/DTMonitorClient/src/DTLocalTriggerEfficiencyTest.h
@@ -49,6 +49,8 @@ class DTLocalTriggerEfficiencyTest: public DTLocalTriggerBaseTest{
   void runClientDiagnostic(DQMStore::IBooker &, DQMStore::IGetter &);
   void Bookings(DQMStore::IBooker &, DQMStore::IGetter &);
 
+  const int wheelArrayShift = 3;
+
  private:
 
   std::map<uint32_t,std::map<std::string,MonitorElement*> > chambME;

diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerLutTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerLutTest.cc
@@ -311,8 +311,8 @@ void DTLocalTriggerLutTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQM
 	  }
 	  if (phiNoData == 4)  phiErr  = 5;
 	  if (phibNoData == 3) phibErr = 5;  // MB3 has no phib information
-	  cmsME.find(fullName("PhiLutSummary"))->second->setBinContent(sect,wh+3,phiErr);
-	  cmsME.find(fullName("PhibLutSummary"))->second->setBinContent(sect,wh+3,phibErr);
+	  cmsME.find(fullName("PhiLutSummary"))->second->setBinContent(sect,wh+wheelArrayShift,phiErr);
+	  cmsME.find(fullName("PhibLutSummary"))->second->setBinContent(sect,wh+wheelArrayShift,phibErr);
 	}
       }
     }

diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerLutTest.h b/DQM/DTMonitorClient/src/DTLocalTriggerLutTest.h
@@ -38,6 +38,8 @@ class DTLocalTriggerLutTest: public DTLocalTriggerBaseTest{
   void runClientDiagnostic(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter);
   void Bookings(DQMStore::IBooker &, DQMStore::IGetter &);
 
+  const int wheelArrayShift = 3;
+
  private:
 
   /// Perform Lut Test logical operations