Expand L1T Shower data vs emulator comparison DQM

DQM/L1TMonitor/interface/L1TStage2Shower.h → DQM/L1TMonitor/interface/L1TStage2RegionalShower.h

@@ -1,5 +1,5 @@
-#ifndef DQM_L1TMonitor_L1TStage2Shower_h
-#define DQM_L1TMonitor_L1TStage2Shower_h
+#ifndef DQM_L1TMonitor_L1TStage2RegionalShower_h
+#define DQM_L1TMonitor_L1TStage2RegionalShower_h
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -15,10 +15,10 @@
 #include "DataFormats/CSCDigi/interface/CSCShowerDigiCollection.h"
 #include "DataFormats/L1TMuon/interface/RegionalMuonShower.h"
 
-class L1TStage2Shower : public DQMOneEDAnalyzer<> {
+class L1TStage2RegionalShower : public DQMOneEDAnalyzer<> {
 public:
-  L1TStage2Shower(const edm::ParameterSet& ps);
-  ~L1TStage2Shower() override;
+  L1TStage2RegionalShower(const edm::ParameterSet& ps);
+  ~L1TStage2RegionalShower() override;
 
 protected:
   void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override;

DQM/L1TMonitor/interface/L1TdeCSCTPGShower.h

@@ -31,19 +31,33 @@ class L1TdeCSCTPGShower : public DQMEDAnalyzer {
 
   std::string monitorDir_;
 
-  MonitorElement* lctShowerDataSummary_denom_;
-  MonitorElement* lctShowerDataSummary_num_;
-  MonitorElement* alctShowerDataSummary_denom_;
-  MonitorElement* alctShowerDataSummary_num_;
-  MonitorElement* clctShowerDataSummary_denom_;
-  MonitorElement* clctShowerDataSummary_num_;
-
-  MonitorElement* lctShowerEmulSummary_denom_;
-  MonitorElement* lctShowerEmulSummary_num_;
-  MonitorElement* alctShowerEmulSummary_denom_;
-  MonitorElement* alctShowerEmulSummary_num_;
-  MonitorElement* clctShowerEmulSummary_denom_;
-  MonitorElement* clctShowerEmulSummary_num_;
+  MonitorElement* lctShowerDataNomSummary_denom_;
+  MonitorElement* lctShowerDataNomSummary_num_;
+  MonitorElement* alctShowerDataNomSummary_denom_;
+  MonitorElement* alctShowerDataNomSummary_num_;
+  MonitorElement* clctShowerDataNomSummary_denom_;
+  MonitorElement* clctShowerDataNomSummary_num_;
+
+  MonitorElement* lctShowerEmulNomSummary_denom_;
+  MonitorElement* lctShowerEmulNomSummary_num_;
+  MonitorElement* alctShowerEmulNomSummary_denom_;
+  MonitorElement* alctShowerEmulNomSummary_num_;
+  MonitorElement* clctShowerEmulNomSummary_denom_;
+  MonitorElement* clctShowerEmulNomSummary_num_;
+
+  MonitorElement* lctShowerDataTightSummary_denom_;
+  MonitorElement* lctShowerDataTightSummary_num_;
+  MonitorElement* alctShowerDataTightSummary_denom_;
+  MonitorElement* alctShowerDataTightSummary_num_;
+  MonitorElement* clctShowerDataTightSummary_denom_;
+  MonitorElement* clctShowerDataTightSummary_num_;
+
+  MonitorElement* lctShowerEmulTightSummary_denom_;
+  MonitorElement* lctShowerEmulTightSummary_num_;
+  MonitorElement* alctShowerEmulTightSummary_denom_;
+  MonitorElement* alctShowerEmulTightSummary_num_;
+  MonitorElement* clctShowerEmulTightSummary_denom_;
+  MonitorElement* clctShowerEmulTightSummary_num_;
 };
 
 #endif

DQM/L1TMonitor/interface/L1TdeStage2Shower.h → DQM/L1TMonitor/interface/L1TdeStage2RegionalShower.h

@@ -1,5 +1,5 @@
-#ifndef DQM_L1TMonitor_L1TdeStage2Shower_h
-#define DQM_L1TMonitor_L1TdeStage2Shower_h
+#ifndef DQM_L1TMonitor_L1TdeStage2RegionalShower_h
+#define DQM_L1TMonitor_L1TdeStage2RegionalShower_h
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -10,10 +10,10 @@
 
 #include "DataFormats/L1TMuon/interface/RegionalMuonShower.h"
 
-class L1TdeStage2Shower : public DQMEDAnalyzer {
+class L1TdeStage2RegionalShower : public DQMEDAnalyzer {
 public:
-  L1TdeStage2Shower(const edm::ParameterSet& ps);
-  ~L1TdeStage2Shower() override;
+  L1TdeStage2RegionalShower(const edm::ParameterSet& ps);
+  ~L1TdeStage2RegionalShower() override;
 
 protected:
   void bookHistograms(DQMStore::IBooker&, const edm::Run&, const edm::EventSetup&) override;

DQM/L1TMonitor/plugins/SealModule.cc

@@ -60,8 +60,8 @@ DEFINE_FWK_MODULE(L1TStage2OMTF);
 #include "DQM/L1TMonitor/interface/L1TStage2EMTF.h"
 DEFINE_FWK_MODULE(L1TStage2EMTF);
 
-#include "DQM/L1TMonitor/interface/L1TStage2Shower.h"
-DEFINE_FWK_MODULE(L1TStage2Shower);
+#include "DQM/L1TMonitor/interface/L1TStage2RegionalShower.h"
+DEFINE_FWK_MODULE(L1TStage2RegionalShower);
 
 #include "DQM/L1TMonitor/interface/L1TMP7ZeroSupp.h"
 DEFINE_FWK_MODULE(L1TMP7ZeroSupp);
@@ -113,8 +113,8 @@ DEFINE_FWK_MODULE(L1TdeCSCTF);
 #include "DQM/L1TMonitor/interface/L1TdeStage2EMTF.h"
 DEFINE_FWK_MODULE(L1TdeStage2EMTF);
 
-#include "DQM/L1TMonitor/interface/L1TdeStage2Shower.h"
-DEFINE_FWK_MODULE(L1TdeStage2Shower);
+#include "DQM/L1TMonitor/interface/L1TdeStage2RegionalShower.h"
+DEFINE_FWK_MODULE(L1TdeStage2RegionalShower);
 
 //#include "DQM/L1TMonitor/interface/L1GtHwValidation.h"
 //DEFINE_FWK_MODULE(L1GtHwValidation);

DQM/L1TMonitor/python/L1TStage2Emulator_cff.py

@@ -130,9 +130,8 @@
 _run3_Stage2L1HardwareValidation = Stage2L1HardwareValidation.copy()
 run3_GEM.toReplaceWith( Stage2L1HardwareValidation, cms.Sequence( valMuonGEMPadDigis + valMuonGEMPadDigiClusters + _run3_Stage2L1HardwareValidation) )
 
-from Configuration.Eras.Modifier_run3_common_cff import run3_common
 _run3Shower_Stage2L1HardwareValidation = Stage2L1HardwareValidation.copy()
-run3_common.toReplaceWith( Stage2L1HardwareValidation, cms.Sequence(_run3Shower_Stage2L1HardwareValidation + valEmtfStage2Showers) )
+run3_GEM.toReplaceWith( Stage2L1HardwareValidation, cms.Sequence(_run3Shower_Stage2L1HardwareValidation + valEmtfStage2Showers) )
 
 Stage2L1HardwareValidationForValidationEvents = cms.Sequence(
     valCaloStage2Layer2Digis
@@ -193,9 +192,8 @@
 from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
 run3_GEM.toReplaceWith( l1tStage2EmulatorOnlineDQM, _run3_l1tStage2EmulatorOnlineDQM )
 
-from Configuration.Eras.Modifier_run3_common_cff import run3_common
 _run3shower_l1tStage2EmulatorOnlineDQM = l1tStage2EmulatorOnlineDQM.copy()
-run3_common.toReplaceWith( l1tStage2EmulatorOnlineDQM, cms.Sequence(_run3shower_l1tStage2EmulatorOnlineDQM + l1tdeCSCTPGShower) )
+run3_GEM.toReplaceWith( l1tStage2EmulatorOnlineDQM, cms.Sequence(_run3shower_l1tStage2EmulatorOnlineDQM + l1tdeCSCTPGShower) )
 
 # sequence to run only for validation events
 l1tStage2EmulatorOnlineDQMValidationEvents = cms.Sequence(

DQM/L1TMonitor/python/L1TStage2Shower_cfi.py → DQM/L1TMonitor/python/L1TStage2RegionalShower_cfi.py

@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
-l1tStage2Shower = DQMEDAnalyzer(
-    "L1TStage2Shower",
+l1tStage2RegionalShower = DQMEDAnalyzer(
+    "L1TStage2RegionalShower",
     emtfSource = cms.InputTag("emtfStage2Digis"),                   ## EMTF unpacker tag
     cscSource = cms.InputTag("muonCSCDigis", "MuonCSCShowerDigi"),  ## CSC  unpacker tag
 #    emtfSource = cms.InputTag("simEmtfShowers", "EMTF"),           ## EMTF emulator tag

DQM/L1TMonitor/python/L1TStage2_cff.py

@@ -19,7 +19,7 @@
 from DQM.L1TMonitor.L1TStage2EMTF_cfi import *
 
 # Shower
-from DQM.L1TMonitor.L1TStage2Shower_cfi import *
+from DQM.L1TMonitor.L1TStage2RegionalShower_cfi import *
 
 # uGMT
 from DQM.L1TMonitor.L1TStage2uGMT_cff import *
@@ -42,7 +42,7 @@
     l1tStage2Emtf +
 # Do not include shower DQM module in the sequence because there is no EMTF shower unpacker (as of CMSSW_12_2_0_pre2).
 # It will be enabled once the EMTF shower unpacker is ready.
-#    l1tStage2Shower +  
+#    l1tStage2RegionalShower +  
     l1tStage2uGMTOnlineDQMSeq +
     l1tObjectsTiming +
     l1tStage2uGTOnlineDQMSeq

DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQM.L1TMonitor.L1TdeStage2EMTF_cfi import *
-from DQM.L1TMonitor.L1TdeStage2Shower_cfi import *
+from DQM.L1TMonitor.L1TdeStage2RegionalShower_cfi import *
 
 # List of bins to ignore
 ignoreBinsDeStage2Emtf = [1]
@@ -28,6 +28,6 @@
     l1tdeStage2EmtfComp
 )
 
-from Configuration.Eras.Modifier_run3_common_cff import run3_common
+from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
 _run3shower_l1tdeStage2EmtfOnlineDQMSeq = l1tdeStage2EmtfOnlineDQMSeq.copy()
-run3_common.toReplaceWith(l1tdeStage2EmtfOnlineDQMSeq, cms.Sequence(_run3shower_l1tdeStage2EmtfOnlineDQMSeq + l1tdeStage2Shower))
+run3_GEM.toReplaceWith(l1tdeStage2EmtfOnlineDQMSeq, cms.Sequence(_run3shower_l1tdeStage2EmtfOnlineDQMSeq + l1tdeStage2RegionalShower))

DQM/L1TMonitor/python/L1TdeStage2Shower_cfi.py → DQM/L1TMonitor/python/L1TdeStage2RegionalShower_cfi.py

@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
 from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
-l1tdeStage2Shower = DQMEDAnalyzer(
-    "L1TdeStage2Shower",
+l1tdeStage2RegionalShower = DQMEDAnalyzer(
+    "L1TdeStage2RegionalShower",
     # EMTF Showers not in data yet. Use Emul for both
     # Once Run 3 firmware are implemented, should change data tags to 
     # cms.InputTag("emtfStage2Digis")

DQM/L1TMonitor/src/L1TStage2Shower.cc → DQM/L1TMonitor/src/L1TStage2RegionalShower.cc

@@ -3,17 +3,17 @@
 #include <iostream>
 #include <map>
 
-#include "DQM/L1TMonitor/interface/L1TStage2Shower.h"
+#include "DQM/L1TMonitor/interface/L1TStage2RegionalShower.h"
 
-L1TStage2Shower::L1TStage2Shower(const edm::ParameterSet& ps)
+L1TStage2RegionalShower::L1TStage2RegionalShower(const edm::ParameterSet& ps)
     : EMTFShowerToken(consumes<l1t::RegionalMuonShowerBxCollection>(ps.getParameter<edm::InputTag>("emtfSource"))),
       CSCShowerToken(consumes<CSCShowerDigiCollection>(ps.getParameter<edm::InputTag>("cscSource"))),
       monitorDir(ps.getUntrackedParameter<std::string>("monitorDir", "")),
       verbose(ps.getUntrackedParameter<bool>("verbose", false)) {}
 
-L1TStage2Shower::~L1TStage2Shower() {}
+L1TStage2RegionalShower::~L1TStage2RegionalShower() {}
 
-void L1TStage2Shower::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) {
+void L1TStage2RegionalShower::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&, const edm::EventSetup&) {
   ibooker.setCurrentFolder(monitorDir);
 
   const std::array<std::string, 9> suffix_label{{"4/2", "4/1", "3/2", "3/1", " 2/2", "2/1", "1/3", "1/2", "1/1"}};
@@ -75,7 +75,7 @@ void L1TStage2Shower::bookHistograms(DQMStore::IBooker& ibooker, const edm::Run&
   emtfShowerTypeOccupancy->setBinLabel(1, "ME- Tight", 2);
 }
 
-void L1TStage2Shower::analyze(const edm::Event& e, const edm::EventSetup& c) {
+void L1TStage2RegionalShower::analyze(const edm::Event& e, const edm::EventSetup& c) {
   l1t::RegionalMuonShowerBxCollection const& EmtfShowers = e.get(EMTFShowerToken);
   CSCShowerDigiCollection const& CscShowers = e.get(CSCShowerToken);