Merge pull request cms-sw#33876 from dildick/from-CMSSW_12_0_X_2021-05-27-1100-DQM-B904

Updates for CSC L1T DQM following B904 tests on cosmic data

Author: cmsbuild

DQM/L1TMonitor/interface/L1TdeCSCTPG.h

@@ -30,6 +30,7 @@ class L1TdeCSCTPG : public DQMEDAnalyzer {
   edm::EDGetTokenT<CSCCorrelatedLCTDigiCollection> emulLCT_token_;
   std::string monitorDir_;
 
+  // ME1/1 combines trigger data from ME1/a and ME1/b
   std::vector<std::string> chambers_;
   std::vector<std::string> dataEmul_;
 
@@ -47,6 +48,15 @@ class L1TdeCSCTPG : public DQMEDAnalyzer {
   std::vector<double> clctMaxBin_;
   std::vector<double> lctMaxBin_;
 
+  /*
+    When set to True, we assume that the data comes from
+    the Building 904 CSC test-stand. This test-stand is a single
+    ME1/1 chamber.
+  */
+  bool B904Setup_;
+
+  bool isRun3_;
+
   // first key is the chamber number
   // second key is the variable
   std::map<uint32_t, std::map<std::string, MonitorElement*> > chamberHistos;

DQM/L1TMonitor/python/L1TEmulatorMonitor_cff.py

@@ -46,8 +46,6 @@
 l1TdeRCTfromRCT.rctSourceData = 'rctDigis'
 l1TdeRCTfromRCT.HistFolder = cms.untracked.string('L1TEMU/L1TdeRCT_FromRCT')
 
-from DQM.L1TMonitor.L1TdeCSCTPG_cfi import *
-
 from DQM.L1TMonitor.L1TdeCSCTF_cfi import *
 
 from DQM.L1TMonitor.L1GtHwValidation_cff import *
@@ -81,7 +79,6 @@
 
 l1ExpertDataVsEmulator = cms.Sequence(
     l1TdeGCT +
-    l1tdeCSCTPG +
     l1TdeCSCTF +
     l1GtHwValidation +
     l1TdeRCTRun1

DQM/L1TMonitor/python/L1TdeCSCTPG_cfi.py

@@ -3,22 +3,33 @@
 
 l1tdeCSCTPGCommon = cms.PSet(
     monitorDir = cms.string('L1TEMU/L1TdeCSCTPG'),
-    chambers = cms.vstring("ME1a", "ME1b", "ME12", "ME13", "ME21", "ME22",
+    ## ME1/1 combines trigger data from ME1/a and ME1/b
+    chambers = cms.vstring("ME11", "ME12", "ME13", "ME21", "ME22",
                            "ME31", "ME32", "ME41", "ME42"),
     alctVars = cms.vstring("quality", "wiregroup", "bx"),
     alctNBin = cms.vuint32(6, 116, 20),
     alctMinBin = cms.vdouble(0, 0, 0),
     alctMaxBin = cms.vdouble(6, 116, 20),
-    clctVars = cms.vstring("quality", "halfstrip",
-                           "pattern", "bend", "quartstrip","eightstrip"),
-    clctNBin = cms.vuint32(16, 240, 16, 2, 2, 2),
-    clctMinBin = cms.vdouble(0, 0, 0, 0, 0, 0),
-    clctMaxBin = cms.vdouble(16, 240, 16, 2, 2, 2),
-    lctVars = cms.vstring( "quality", "wiregroup", "halfstrip",
-                           "pattern", "bend", "quartstrip","eightstrip"),
-    lctNBin = cms.vuint32(16, 116, 240, 16, 2, 2, 2),
-    lctMinBin = cms.vdouble(0, 0, 0, 0, 0, 0, 0),
-    lctMaxBin = cms.vdouble(16, 116, 240, 16, 2, 2, 2),
+    clctVars = cms.vstring(
+        # For Run-2 eras
+        "quality", "halfstrip", "pattern", "bend",
+        # Added in Run-3 eras
+        "quartstrip", "eighthstrip", "run3pattern",
+        "slope", "compcode", "quartstripbit", "eighthstripbit"),
+    clctNBin = cms.vuint32(16, 224, 16, 2, 448, 896, 5, 16, 410, 2, 2),
+    clctMinBin = cms.vdouble(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+    clctMaxBin = cms.vdouble(16, 224, 16, 2, 448, 896, 5, 16, 410, 2, 2),
+    lctVars = cms.vstring(
+        # For Run-2 eras
+        "quality", "wiregroup", "halfstrip", "pattern", "bend",
+        # Added in Run-3 eras
+        "quartstrip", "eighthstrip", "run3pattern",
+        "slope", "quartstripbit", "eighthstripbit"),
+    lctNBin = cms.vuint32(16, 116, 224, 16, 2, 448, 896, 5, 16, 2, 2),
+    lctMinBin = cms.vdouble(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+    lctMaxBin = cms.vdouble(16, 116, 224, 16, 2, 448, 896, 5, 16, 2, 2),
+    B904Setup = cms.bool(False),
+    isRun3 = cms.bool(False),
 )
 
 l1tdeCSCTPG = DQMEDAnalyzer(
@@ -32,3 +43,8 @@
     emulLCT = cms.InputTag("valCscStage2Digis", "MPCSORTED"),
     dataEmul = cms.vstring("data","emul"),
 )
+
+# enable comparisons for Run-3 data members
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify( l1tdeCSCTPG,
+                      isRun3 = True)

DQM/L1TMonitor/python/L1TdeGEMTPG_cfi.py

@@ -1,10 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
-l1tdeGEMTPG = DQMEDAnalyzer(
-    "L1TdeGEMTPG",
-    data = cms.InputTag("valMuonGEMPadDigiClusters"),
-    emul = cms.InputTag("valMuonGEMPadDigiClusters"),
+l1tdeGEMTPGCommon = cms.PSet(
     monitorDir = cms.string("L1TEMU/L1TdeGEMTPG"),
     verbose = cms.bool(False),
     ## when multiple chambers are enabled, order them by station number!
@@ -15,3 +11,11 @@
     clusterMinBin = cms.vdouble(-0.5,-0.5,-4.5),
     clusterMaxBin = cms.vdouble(19.5,383.5,5.5),
 )
+
+from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
+l1tdeGEMTPG = DQMEDAnalyzer(
+    "L1TdeGEMTPG",
+    l1tdeGEMTPGCommon,
+    data = cms.InputTag("valMuonGEMPadDigiClusters"),
+    emul = cms.InputTag("valMuonGEMPadDigiClusters"),
+)

DQM/L1TMonitor/src/L1TdeCSCTPG.cc

@@ -16,25 +16,43 @@ L1TdeCSCTPG::L1TdeCSCTPG(const edm::ParameterSet& ps)
 
       // variables
       alctVars_(ps.getParameter<std::vector<std::string>>("alctVars")),
-      clctVars_(ps.getParameter<std::vector<std::string>>("lctVars")),
+      clctVars_(ps.getParameter<std::vector<std::string>>("clctVars")),
       lctVars_(ps.getParameter<std::vector<std::string>>("lctVars")),
 
       // binning
       alctNBin_(ps.getParameter<std::vector<unsigned>>("alctNBin")),
-      clctNBin_(ps.getParameter<std::vector<unsigned>>("lctNBin")),
+      clctNBin_(ps.getParameter<std::vector<unsigned>>("clctNBin")),
       lctNBin_(ps.getParameter<std::vector<unsigned>>("lctNBin")),
       alctMinBin_(ps.getParameter<std::vector<double>>("alctMinBin")),
-      clctMinBin_(ps.getParameter<std::vector<double>>("lctMinBin")),
+      clctMinBin_(ps.getParameter<std::vector<double>>("clctMinBin")),
       lctMinBin_(ps.getParameter<std::vector<double>>("lctMinBin")),
       alctMaxBin_(ps.getParameter<std::vector<double>>("alctMaxBin")),
-      clctMaxBin_(ps.getParameter<std::vector<double>>("lctMaxBin")),
-      lctMaxBin_(ps.getParameter<std::vector<double>>("lctMaxBin")) {}
+      clctMaxBin_(ps.getParameter<std::vector<double>>("clctMaxBin")),
+      lctMaxBin_(ps.getParameter<std::vector<double>>("lctMaxBin")),
+      B904Setup_(ps.getParameter<bool>("B904Setup")),
+      isRun3_(ps.getParameter<bool>("isRun3")) {}
 
 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 B904Setup is set to true
+  if (B904Setup_) {
+    chambers_.resize(1);
+  }
+  // do not analyze the 1/4-strip bit, 1/8-strip bit
+  else {
+    clctVars_.resize(9);
+    lctVars_.resize(9);
+  }
+
   // chamber type
   for (unsigned iType = 0; iType < chambers_.size(); iType++) {
     // data vs emulator
@@ -46,6 +64,7 @@ void L1TdeCSCTPG::bookHistograms(DQMStore::IBooker& iBooker, const edm::Run&, co
         const std::string histTitle(chambers_[iType] + " ALCT " + alctVars_[iVar] + " (" + dataEmul_[iData] + ") ");
         chamberHistos[iType][key] =
             iBooker.book1D(histName, histTitle, alctNBin_[iVar], alctMinBin_[iVar], alctMaxBin_[iVar]);
+        chamberHistos[iType][key]->getTH1()->SetMinimum(0);
       }
 
       // clct variable
@@ -55,6 +74,7 @@ void L1TdeCSCTPG::bookHistograms(DQMStore::IBooker& iBooker, const edm::Run&, co
         const std::string histTitle(chambers_[iType] + " CLCT " + clctVars_[iVar] + " (" + dataEmul_[iData] + ") ");
         chamberHistos[iType][key] =
             iBooker.book1D(histName, histTitle, clctNBin_[iVar], clctMinBin_[iVar], clctMaxBin_[iVar]);
+        chamberHistos[iType][key]->getTH1()->SetMinimum(0);
       }
 
       // lct variable
@@ -64,6 +84,7 @@ void L1TdeCSCTPG::bookHistograms(DQMStore::IBooker& iBooker, const edm::Run&, co
         const std::string histTitle(chambers_[iType] + " LCT " + lctVars_[iVar] + " (" + dataEmul_[iData] + ") ");
         chamberHistos[iType][key] =
             iBooker.book1D(histName, histTitle, lctNBin_[iVar], lctMinBin_[iVar], lctMaxBin_[iVar]);
+        chamberHistos[iType][key]->getTH1()->SetMinimum(0);
       }
     }
   }
@@ -87,67 +108,139 @@ void L1TdeCSCTPG::analyze(const edm::Event& e, const edm::EventSetup& c) {
 
   for (auto it = dataALCTs->begin(); it != dataALCTs->end(); it++) {
     auto range = dataALCTs->get((*it).first);
-    const int type = ((*it).first).iChamberType() - 1;
+    const int type = ((*it).first).iChamberType() - 2;
+    // ignore non-ME1/1 chambers when using B904 test-stand data
+    if (B904Setup_ and !((*it).first).isME11())
+      continue;
     for (auto alct = range.first; alct != range.second; alct++) {
-      chamberHistos[type]["alct_quality_data"]->Fill(alct->getQuality());
-      chamberHistos[type]["alct_wiregroup_data"]->Fill(alct->getKeyWG());
-      chamberHistos[type]["alct_bx_data"]->Fill(alct->getBX());
+      if (alct->isValid()) {
+        chamberHistos[type]["alct_quality_data"]->Fill(alct->getQuality());
+        chamberHistos[type]["alct_wiregroup_data"]->Fill(alct->getKeyWG());
+        chamberHistos[type]["alct_bx_data"]->Fill(alct->getBX());
+      }
     }
   }
 
   for (auto it = emulALCTs->begin(); it != emulALCTs->end(); it++) {
     auto range = emulALCTs->get((*it).first);
-    const int type = ((*it).first).iChamberType() - 1;
+    const int type = ((*it).first).iChamberType() - 2;
+    // ignore non-ME1/1 chambers when using B904 test-stand data
+    if (B904Setup_ and !((*it).first).isME11())
+      continue;
     for (auto alct = range.first; alct != range.second; alct++) {
-      chamberHistos[type]["alct_quality_emul"]->Fill(alct->getQuality());
-      chamberHistos[type]["alct_wiregroup_emul"]->Fill(alct->getKeyWG());
-      chamberHistos[type]["alct_bx_emul"]->Fill(alct->getBX());
+      if (alct->isValid()) {
+        chamberHistos[type]["alct_quality_emul"]->Fill(alct->getQuality());
+        chamberHistos[type]["alct_wiregroup_emul"]->Fill(alct->getKeyWG());
+        chamberHistos[type]["alct_bx_emul"]->Fill(alct->getBX());
+      }
     }
   }
 
   for (auto it = dataCLCTs->begin(); it != dataCLCTs->end(); it++) {
     auto range = dataCLCTs->get((*it).first);
-    const int type = ((*it).first).iChamberType() - 1;
+    const int type = ((*it).first).iChamberType() - 2;
+    // ignore non-ME1/1 chambers when using B904 test-stand data
+    if (B904Setup_ and !((*it).first).isME11())
+      continue;
     for (auto clct = range.first; clct != range.second; clct++) {
-      chamberHistos[type]["clct_pattern_data"]->Fill(clct->getPattern());
-      chamberHistos[type]["clct_quality_data"]->Fill(clct->getQuality());
-      chamberHistos[type]["clct_halfstrip_data"]->Fill(clct->getKeyStrip());
-      chamberHistos[type]["clct_bend_data"]->Fill(clct->getBend());
+      if (clct->isValid()) {
+        chamberHistos[type]["clct_pattern_data"]->Fill(clct->getPattern());
+        chamberHistos[type]["clct_quality_data"]->Fill(clct->getQuality());
+        chamberHistos[type]["clct_halfstrip_data"]->Fill(clct->getKeyStrip());
+        chamberHistos[type]["clct_bend_data"]->Fill(clct->getBend());
+        if (isRun3_) {
+          chamberHistos[type]["clct_run3pattern_data"]->Fill(clct->getRun3Pattern());
+          chamberHistos[type]["clct_quartstrip_data"]->Fill(clct->getKeyStrip(4));
+          chamberHistos[type]["clct_eighthstrip_data"]->Fill(clct->getKeyStrip(8));
+          chamberHistos[type]["clct_slope_data"]->Fill(clct->getSlope());
+          chamberHistos[type]["clct_compcode_data"]->Fill(clct->getCompCode());
+          if (B904Setup_) {
+            chamberHistos[type]["clct_quartstripbit_data"]->Fill(clct->getQuartStripBit());
+            chamberHistos[type]["clct_eighthstripbit_data"]->Fill(clct->getEighthStripBit());
+          }
+        }
+      }
     }
   }
 
   for (auto it = emulCLCTs->begin(); it != emulCLCTs->end(); it++) {
     auto range = emulCLCTs->get((*it).first);
-    const int type = ((*it).first).iChamberType() - 1;
+    const int type = ((*it).first).iChamberType() - 2;
+    // ignore non-ME1/1 chambers when using B904 test-stand data
+    if (B904Setup_ and !((*it).first).isME11())
+      continue;
     for (auto clct = range.first; clct != range.second; clct++) {
-      chamberHistos[type]["clct_pattern_emul"]->Fill(clct->getPattern());
-      chamberHistos[type]["clct_quality_emul"]->Fill(clct->getQuality());
-      chamberHistos[type]["clct_halfstrip_emul"]->Fill(clct->getKeyStrip());
-      chamberHistos[type]["clct_bend_emul"]->Fill(clct->getBend());
+      if (clct->isValid()) {
+        chamberHistos[type]["clct_pattern_emul"]->Fill(clct->getPattern());
+        chamberHistos[type]["clct_quality_emul"]->Fill(clct->getQuality());
+        chamberHistos[type]["clct_halfstrip_emul"]->Fill(clct->getKeyStrip());
+        chamberHistos[type]["clct_bend_emul"]->Fill(clct->getBend());
+        if (isRun3_) {
+          chamberHistos[type]["clct_run3pattern_emul"]->Fill(clct->getRun3Pattern());
+          chamberHistos[type]["clct_quartstrip_emul"]->Fill(clct->getKeyStrip(4));
+          chamberHistos[type]["clct_eighthstrip_emul"]->Fill(clct->getKeyStrip(8));
+          chamberHistos[type]["clct_slope_emul"]->Fill(clct->getSlope());
+          chamberHistos[type]["clct_compcode_emul"]->Fill(clct->getCompCode());
+          if (B904Setup_) {
+            chamberHistos[type]["clct_quartstripbit_emul"]->Fill(clct->getQuartStripBit());
+            chamberHistos[type]["clct_eighthstripbit_emul"]->Fill(clct->getEighthStripBit());
+          }
+        }
+      }
     }
   }
 
   for (auto it = dataLCTs->begin(); it != dataLCTs->end(); it++) {
     auto range = dataLCTs->get((*it).first);
-    const int type = ((*it).first).iChamberType() - 1;
+    const int type = ((*it).first).iChamberType() - 2;
+    // ignore non-ME1/1 chambers when using B904 test-stand data
+    if (B904Setup_ and !((*it).first).isME11())
+      continue;
     for (auto lct = range.first; lct != range.second; lct++) {
-      chamberHistos[type]["lct_pattern_data"]->Fill(lct->getCLCTPattern());
-      chamberHistos[type]["lct_quality_data"]->Fill(lct->getQuality());
-      chamberHistos[type]["lct_wiregroup_data"]->Fill(lct->getKeyWG());
-      chamberHistos[type]["lct_halfstrip_data"]->Fill(lct->getStrip());
-      chamberHistos[type]["lct_bend_data"]->Fill(lct->getBend());
+      if (lct->isValid()) {
+        chamberHistos[type]["lct_pattern_data"]->Fill(lct->getPattern());
+        chamberHistos[type]["lct_quality_data"]->Fill(lct->getQuality());
+        chamberHistos[type]["lct_wiregroup_data"]->Fill(lct->getKeyWG());
+        chamberHistos[type]["lct_halfstrip_data"]->Fill(lct->getStrip());
+        chamberHistos[type]["lct_bend_data"]->Fill(lct->getBend());
+        if (isRun3_) {
+          chamberHistos[type]["lct_run3pattern_data"]->Fill(lct->getRun3Pattern());
+          chamberHistos[type]["lct_slope_data"]->Fill(lct->getSlope());
+          chamberHistos[type]["lct_quartstrip_data"]->Fill(lct->getStrip(4));
+          chamberHistos[type]["lct_eighthstrip_data"]->Fill(lct->getStrip(8));
+          if (B904Setup_) {
+            chamberHistos[type]["lct_quartstripbit_data"]->Fill(lct->getQuartStripBit());
+            chamberHistos[type]["lct_eighthstripbit_data"]->Fill(lct->getEighthStripBit());
+          }
+        }
+      }
     }
   }
 
   for (auto it = emulLCTs->begin(); it != emulLCTs->end(); it++) {
     auto range = emulLCTs->get((*it).first);
-    const int type = ((*it).first).iChamberType() - 1;
+    const int type = ((*it).first).iChamberType() - 2;
+    // ignore non-ME1/1 chambers when using B904 test-stand data
+    if (B904Setup_ and !((*it).first).isME11())
+      continue;
     for (auto lct = range.first; lct != range.second; lct++) {
-      chamberHistos[type]["lct_pattern_emul"]->Fill(lct->getCLCTPattern());
-      chamberHistos[type]["lct_quality_emul"]->Fill(lct->getQuality());
-      chamberHistos[type]["lct_wiregroup_emul"]->Fill(lct->getKeyWG());
-      chamberHistos[type]["lct_halfstrip_emul"]->Fill(lct->getStrip());
-      chamberHistos[type]["lct_bend_emul"]->Fill(lct->getBend());
+      if (lct->isValid()) {
+        chamberHistos[type]["lct_pattern_emul"]->Fill(lct->getPattern());
+        chamberHistos[type]["lct_quality_emul"]->Fill(lct->getQuality());
+        chamberHistos[type]["lct_wiregroup_emul"]->Fill(lct->getKeyWG());
+        chamberHistos[type]["lct_halfstrip_emul"]->Fill(lct->getStrip());
+        chamberHistos[type]["lct_bend_emul"]->Fill(lct->getBend());
+        if (isRun3_) {
+          chamberHistos[type]["lct_run3pattern_emul"]->Fill(lct->getRun3Pattern());
+          chamberHistos[type]["lct_slope_emul"]->Fill(lct->getSlope());
+          chamberHistos[type]["lct_quartstrip_emul"]->Fill(lct->getStrip(4));
+          chamberHistos[type]["lct_eighthstrip_emul"]->Fill(lct->getStrip(8));
+          if (B904Setup_) {
+            chamberHistos[type]["lct_quartstripbit_emul"]->Fill(lct->getQuartStripBit());
+            chamberHistos[type]["lct_eighthstripbit_emul"]->Fill(lct->getEighthStripBit());
+          }
+        }
+      }
     }
   }
 }

DQM/L1TMonitor/src/L1TdeGEMTPG.cc

@@ -36,6 +36,7 @@ void L1TdeGEMTPG::bookHistograms(DQMStore::IBooker& iBooker, const edm::Run&, co
                                     ")");
         chamberHistos[iType][key] =
             iBooker.book1D(histName, histTitle, clusterNBin_[iVar], clusterMinBin_[iVar], clusterMaxBin_[iVar]);
+        chamberHistos[iType][key]->getTH1()->SetMinimum(0);
       }
     }
   }

DQM/L1TMonitorClient/interface/L1TdeCSCTPGClient.h

@@ -31,6 +31,7 @@ class L1TdeCSCTPGClient : public DQMEDHarvester {
 
   std::string monitorDir_;
 
+  // ME1/1 combines trigger data from ME1/a and ME1/b
   std::vector<std::string> chambers_;
 
   std::vector<std::string> alctVars_;
@@ -47,6 +48,15 @@ class L1TdeCSCTPGClient : public DQMEDHarvester {
   std::vector<double> clctMaxBin_;
   std::vector<double> lctMaxBin_;
 
+  /*
+    When set to True, we assume that the data comes from
+    the Building 904 CSC test-stand. This test-stand is a single
+    ME1/1 chamber.
+  */
+  bool B904Setup_;
+
+  bool isRun3_;
+
   // first key is the chamber number
   // second key is the variable
   std::map<uint32_t, std::map<std::string, MonitorElement *> > chamberHistos_;