Merge pull request #35641 from dildick/from-CMSSW_12_1_X_2021-09-30-2…

…300-fix-empty-histograms Fix empty histograms in CSC L1T DQM
cms-sw · Oct 13, 2021 · 0af0a40 · 0af0a40
2 parents d34e72b + 8b51767
commit 0af0a40
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/DQM/L1TMonitor/src/L1TdeCSCTPG.cc b/DQM/L1TMonitor/src/L1TdeCSCTPG.cc
@@ -43,12 +43,6 @@ L1TdeCSCTPG::~L1TdeCSCTPG() {}
 void L1TdeCSCTPG::bookHistograms(DQMStore::IBooker& iBooker, const edm::Run&, const edm::EventSetup&) {
   iBooker.setCurrentFolder(monitorDir_);
 
-  // do not analyze Run-3 properties in Run-1 and Run-2 eras
-  if (!isRun3_) {
-    clctVars_.resize(4);
-    lctVars_.resize(5);
-  }
-
   // remove the non-ME1/1 chambers from the list when useB904ME11 is set to true
   if (useB904ME11_) {
     chambers_.resize(1);
@@ -65,12 +59,16 @@ void L1TdeCSCTPG::bookHistograms(DQMStore::IBooker& iBooker, const edm::Run&, co
     chambers_.resize(1);
     chambers_[0] = temp;
   }
-
-  // do not analyze the 1/4-strip bit, 1/8-strip bit
-  else {
+  // collision data in Run-3
+  else if (isRun3_) {
     clctVars_.resize(9);
     lctVars_.resize(9);
   }
+  // do not analyze Run-3 properties in Run-1 and Run-2 eras
+  else {
+    clctVars_.resize(4);
+    lctVars_.resize(5);
+  }
 
   // chamber type
   for (unsigned iType = 0; iType < chambers_.size(); iType++) {

diff --git a/DQM/L1TMonitorClient/src/L1TdeCSCTPGClient.cc b/DQM/L1TMonitorClient/src/L1TdeCSCTPGClient.cc
@@ -53,12 +53,6 @@ void L1TdeCSCTPGClient::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter
 void L1TdeCSCTPGClient::book(DQMStore::IBooker &iBooker) {
   iBooker.setCurrentFolder(monitorDir_);
 
-  // do not analyze Run-3 properties in Run-1 and Run-2 eras
-  if (!isRun3_) {
-    clctVars_.resize(4);
-    lctVars_.resize(5);
-  }
-
   // remove the non-ME1/1 chambers from the list when useB904ME11 is set to true
   if (useB904ME11_) {
     chambers_.resize(1);
@@ -75,11 +69,16 @@ void L1TdeCSCTPGClient::book(DQMStore::IBooker &iBooker) {
     chambers_.resize(1);
     chambers_[0] = temp;
   }
-  // do not analyze the 1/4-strip bit, 1/8-strip bit
-  else {
+  // collision data in Run-3
+  else if (isRun3_) {
     clctVars_.resize(9);
     lctVars_.resize(9);
   }
+  // do not analyze Run-3 properties in Run-1 and Run-2 eras
+  else {
+    clctVars_.resize(4);
+    lctVars_.resize(5);
+  }
 
   // chamber type
   for (unsigned iType = 0; iType < chambers_.size(); iType++) {