From ef1992999480f78e81a6b97ba1bf95dab7db3b47 Mon Sep 17 00:00:00 2001 From: Xunwu Zuo Date: Sun, 19 Dec 2021 17:02:42 +0100 Subject: [PATCH 1/5] separate shower comparison DQM plots for nominal and tight --- DQM/L1TMonitor/interface/L1TdeCSCTPGShower.h | 40 +- .../python/L1TStage2Emulator_cff.py | 6 +- DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py | 4 +- DQM/L1TMonitor/src/L1TdeCSCTPGShower.cc | 490 ++++++++++++------ DQM/L1TMonitor/src/L1TdeStage2Shower.cc | 67 ++- .../interface/L1TdeCSCTPGShowerClient.h | 19 +- .../python/L1TStage2EMTFEmulatorClient_cff.py | 4 +- .../L1TStage2EmulatorMonitorClient_cff.py | 3 +- .../src/L1TdeCSCTPGShowerClient.cc | 256 +++++---- .../src/L1TdeStage2ShowerClient.cc | 16 +- 10 files changed, 597 insertions(+), 308 deletions(-) diff --git a/DQM/L1TMonitor/interface/L1TdeCSCTPGShower.h b/DQM/L1TMonitor/interface/L1TdeCSCTPGShower.h index fbca0013ac00a..88d9c641ac9b3 100644 --- a/DQM/L1TMonitor/interface/L1TdeCSCTPGShower.h +++ b/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 diff --git a/DQM/L1TMonitor/python/L1TStage2Emulator_cff.py b/DQM/L1TMonitor/python/L1TStage2Emulator_cff.py index 61a04b04016a5..8c3dab0baf29a 100644 --- a/DQM/L1TMonitor/python/L1TStage2Emulator_cff.py +++ b/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( diff --git a/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py b/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py index dd2d3e482bc60..b5c71022167b2 100644 --- a/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py +++ b/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py @@ -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 + l1tdeStage2Shower)) diff --git a/DQM/L1TMonitor/src/L1TdeCSCTPGShower.cc b/DQM/L1TMonitor/src/L1TdeCSCTPGShower.cc index 5428c83380a51..9ef0a9bf2dc83 100644 --- a/DQM/L1TMonitor/src/L1TdeCSCTPGShower.cc +++ b/DQM/L1TMonitor/src/L1TdeCSCTPGShower.cc @@ -18,93 +18,175 @@ void L1TdeCSCTPGShower::bookHistograms(DQMStore::IBooker& iBooker, const edm::Ru iBooker.setCurrentFolder(monitorDir_); // 2D summary plots - lctShowerDataSummary_denom_ = - iBooker.book2D("lct_cscshower_data_summary_denom", "Data LCT Shower All", 36, 1, 37, 18, 0, 18); - lctShowerDataSummary_num_ = - iBooker.book2D("lct_cscshower_data_summary_num", "Data LCT Shower Emul Matched", 36, 1, 37, 18, 0, 18); - alctShowerDataSummary_denom_ = - iBooker.book2D("alct_cscshower_data_summary_denom", "Data ALCT Shower All", 36, 1, 37, 18, 0, 18); - alctShowerDataSummary_num_ = - iBooker.book2D("alct_cscshower_data_summary_num", "Data ALCT Shower Emul Matched", 36, 1, 37, 18, 0, 18); - clctShowerDataSummary_denom_ = - iBooker.book2D("clct_cscshower_data_summary_denom", "Data CLCT Shower All", 36, 1, 37, 18, 0, 18); - clctShowerDataSummary_num_ = - iBooker.book2D("clct_cscshower_data_summary_num", "Data CLCT Shower Emul Matched", 36, 1, 37, 18, 0, 18); - - lctShowerEmulSummary_denom_ = - iBooker.book2D("lct_cscshower_emul_summary_denom", "Emul LCT Shower All", 36, 1, 37, 18, 0, 18); - lctShowerEmulSummary_num_ = - iBooker.book2D("lct_cscshower_emul_summary_num", "Emul LCT Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); - alctShowerEmulSummary_denom_ = - iBooker.book2D("alct_cscshower_emul_summary_denom", "Emul ALCT Shower All", 36, 1, 37, 18, 0, 18); - alctShowerEmulSummary_num_ = - iBooker.book2D("alct_cscshower_emul_summary_num", "Emul ALCT Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); - clctShowerEmulSummary_denom_ = - iBooker.book2D("clct_cscshower_emul_summary_denom", "Emul CLCT Shower All", 36, 1, 37, 18, 0, 18); - clctShowerEmulSummary_num_ = - iBooker.book2D("clct_cscshower_emul_summary_num", "Emul CLCT Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + lctShowerDataNomSummary_denom_ = + iBooker.book2D("lct_cscshower_data_nom_summary_denom", "Data LCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); + lctShowerDataNomSummary_num_ = + iBooker.book2D("lct_cscshower_data_nom_summary_num", "Data LCT Nominal Only Shower Emul Matched", 36, 1, 37, 18, 0, 18); + alctShowerDataNomSummary_denom_ = + iBooker.book2D("alct_cscshower_data_nom_summary_denom", "Data ALCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); + alctShowerDataNomSummary_num_ = + iBooker.book2D("alct_cscshower_data_nom_summary_num", "Data ALCT Nominal Only Shower Emul Matched", 36, 1, 37, 18, 0, 18); + clctShowerDataNomSummary_denom_ = + iBooker.book2D("clct_cscshower_data_nom_summary_denom", "Data CLCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); + clctShowerDataNomSummary_num_ = + iBooker.book2D("clct_cscshower_data_nom_summary_num", "Data CLCT Nominal Only Shower Emul Matched", 36, 1, 37, 18, 0, 18); + + lctShowerEmulNomSummary_denom_ = + iBooker.book2D("lct_cscshower_emul_nom_summary_denom", "Emul LCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); + lctShowerEmulNomSummary_num_ = + iBooker.book2D("lct_cscshower_emul_nom_summary_num", "Emul LCT Nominal Only Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + alctShowerEmulNomSummary_denom_ = + iBooker.book2D("alct_cscshower_emul_nom_summary_denom", "Emul ALCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); + alctShowerEmulNomSummary_num_ = + iBooker.book2D("alct_cscshower_emul_nom_summary_num", "Emul ALCT Nominal Only Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + clctShowerEmulNomSummary_denom_ = + iBooker.book2D("clct_cscshower_emul_nom_summary_denom", "Emul CLCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); + clctShowerEmulNomSummary_num_ = + iBooker.book2D("clct_cscshower_emul_nom_summary_num", "Emul CLCT Nominal Only Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + + lctShowerDataTightSummary_denom_ = + iBooker.book2D("lct_cscshower_data_tight_summary_denom", "Data LCT Tight Shower All", 36, 1, 37, 18, 0, 18); + lctShowerDataTightSummary_num_ = + iBooker.book2D("lct_cscshower_data_tight_summary_num", "Data LCT Tight Shower Emul Matched", 36, 1, 37, 18, 0, 18); + alctShowerDataTightSummary_denom_ = + iBooker.book2D("alct_cscshower_data_tight_summary_denom", "Data ALCT Tight Shower All", 36, 1, 37, 18, 0, 18); + alctShowerDataTightSummary_num_ = + iBooker.book2D("alct_cscshower_data_tight_summary_num", "Data ALCT Tight Shower Emul Matched", 36, 1, 37, 18, 0, 18); + clctShowerDataTightSummary_denom_ = + iBooker.book2D("clct_cscshower_data_tight_summary_denom", "Data CLCT Tight Shower All", 36, 1, 37, 18, 0, 18); + clctShowerDataTightSummary_num_ = + iBooker.book2D("clct_cscshower_data_tight_summary_num", "Data CLCT Tight Shower Emul Matched", 36, 1, 37, 18, 0, 18); + + lctShowerEmulTightSummary_denom_ = + iBooker.book2D("lct_cscshower_emul_tight_summary_denom", "Emul LCT Tight Shower All", 36, 1, 37, 18, 0, 18); + lctShowerEmulTightSummary_num_ = + iBooker.book2D("lct_cscshower_emul_tight_summary_num", "Emul LCT Tight Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + alctShowerEmulTightSummary_denom_ = + iBooker.book2D("alct_cscshower_emul_tight_summary_denom", "Emul ALCT Tight Shower All", 36, 1, 37, 18, 0, 18); + alctShowerEmulTightSummary_num_ = + iBooker.book2D("alct_cscshower_emul_tight_summary_num", "Emul ALCT Tight Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + clctShowerEmulTightSummary_denom_ = + iBooker.book2D("clct_cscshower_emul_tight_summary_denom", "Emul CLCT Tight Shower All", 36, 1, 37, 18, 0, 18); + clctShowerEmulTightSummary_num_ = + iBooker.book2D("clct_cscshower_emul_tight_summary_num", "Emul CLCT Tight Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); // x labels - lctShowerDataSummary_denom_->setAxisTitle("Chamber", 1); - lctShowerDataSummary_num_->setAxisTitle("Chamber", 1); - alctShowerDataSummary_denom_->setAxisTitle("Chamber", 1); - alctShowerDataSummary_num_->setAxisTitle("Chamber", 1); - clctShowerDataSummary_denom_->setAxisTitle("Chamber", 1); - clctShowerDataSummary_num_->setAxisTitle("Chamber", 1); - - lctShowerEmulSummary_denom_->setAxisTitle("Chamber", 1); - lctShowerEmulSummary_num_->setAxisTitle("Chamber", 1); - alctShowerEmulSummary_denom_->setAxisTitle("Chamber", 1); - alctShowerEmulSummary_num_->setAxisTitle("Chamber", 1); - clctShowerEmulSummary_denom_->setAxisTitle("Chamber", 1); - clctShowerEmulSummary_num_->setAxisTitle("Chamber", 1); + lctShowerDataNomSummary_denom_->setAxisTitle("Chamber", 1); + lctShowerDataNomSummary_num_->setAxisTitle("Chamber", 1); + alctShowerDataNomSummary_denom_->setAxisTitle("Chamber", 1); + alctShowerDataNomSummary_num_->setAxisTitle("Chamber", 1); + clctShowerDataNomSummary_denom_->setAxisTitle("Chamber", 1); + clctShowerDataNomSummary_num_->setAxisTitle("Chamber", 1); + + lctShowerEmulNomSummary_denom_->setAxisTitle("Chamber", 1); + lctShowerEmulNomSummary_num_->setAxisTitle("Chamber", 1); + alctShowerEmulNomSummary_denom_->setAxisTitle("Chamber", 1); + alctShowerEmulNomSummary_num_->setAxisTitle("Chamber", 1); + clctShowerEmulNomSummary_denom_->setAxisTitle("Chamber", 1); + clctShowerEmulNomSummary_num_->setAxisTitle("Chamber", 1); + + lctShowerDataTightSummary_denom_->setAxisTitle("Chamber", 1); + lctShowerDataTightSummary_num_->setAxisTitle("Chamber", 1); + alctShowerDataTightSummary_denom_->setAxisTitle("Chamber", 1); + alctShowerDataTightSummary_num_->setAxisTitle("Chamber", 1); + clctShowerDataTightSummary_denom_->setAxisTitle("Chamber", 1); + clctShowerDataTightSummary_num_->setAxisTitle("Chamber", 1); + + lctShowerEmulTightSummary_denom_->setAxisTitle("Chamber", 1); + lctShowerEmulTightSummary_num_->setAxisTitle("Chamber", 1); + alctShowerEmulTightSummary_denom_->setAxisTitle("Chamber", 1); + alctShowerEmulTightSummary_num_->setAxisTitle("Chamber", 1); + clctShowerEmulTightSummary_denom_->setAxisTitle("Chamber", 1); + clctShowerEmulTightSummary_num_->setAxisTitle("Chamber", 1); // plotting option - lctShowerDataSummary_denom_->setOption("colz"); - lctShowerDataSummary_num_->setOption("colz"); - alctShowerDataSummary_denom_->setOption("colz"); - alctShowerDataSummary_num_->setOption("colz"); - clctShowerDataSummary_denom_->setOption("colz"); - clctShowerDataSummary_num_->setOption("colz"); - - lctShowerEmulSummary_denom_->setOption("colz"); - lctShowerEmulSummary_num_->setOption("colz"); - alctShowerEmulSummary_denom_->setOption("colz"); - alctShowerEmulSummary_num_->setOption("colz"); - clctShowerEmulSummary_denom_->setOption("colz"); - clctShowerEmulSummary_num_->setOption("colz"); + lctShowerDataNomSummary_denom_->setOption("colz"); + lctShowerDataNomSummary_num_->setOption("colz"); + alctShowerDataNomSummary_denom_->setOption("colz"); + alctShowerDataNomSummary_num_->setOption("colz"); + clctShowerDataNomSummary_denom_->setOption("colz"); + clctShowerDataNomSummary_num_->setOption("colz"); + + lctShowerEmulNomSummary_denom_->setOption("colz"); + lctShowerEmulNomSummary_num_->setOption("colz"); + alctShowerEmulNomSummary_denom_->setOption("colz"); + alctShowerEmulNomSummary_num_->setOption("colz"); + clctShowerEmulNomSummary_denom_->setOption("colz"); + clctShowerEmulNomSummary_num_->setOption("colz"); + + lctShowerDataTightSummary_denom_->setOption("colz"); + lctShowerDataTightSummary_num_->setOption("colz"); + alctShowerDataTightSummary_denom_->setOption("colz"); + alctShowerDataTightSummary_num_->setOption("colz"); + clctShowerDataTightSummary_denom_->setOption("colz"); + clctShowerDataTightSummary_num_->setOption("colz"); + + lctShowerEmulTightSummary_denom_->setOption("colz"); + lctShowerEmulTightSummary_num_->setOption("colz"); + alctShowerEmulTightSummary_denom_->setOption("colz"); + alctShowerEmulTightSummary_num_->setOption("colz"); + clctShowerEmulTightSummary_denom_->setOption("colz"); + clctShowerEmulTightSummary_num_->setOption("colz"); const std::array suffix_label{{"4/2", "4/1", "3/2", "3/1", " 2/2", "2/1", "1/3", "1/2", "1/1"}}; // y labels for (int ybin = 1; ybin <= 9; ++ybin) { - lctShowerDataSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - lctShowerDataSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - alctShowerDataSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - alctShowerDataSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - clctShowerDataSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - clctShowerDataSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - - lctShowerEmulSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - lctShowerEmulSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - alctShowerEmulSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - alctShowerEmulSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - clctShowerEmulSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - clctShowerEmulSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - - lctShowerDataSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - lctShowerDataSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - alctShowerDataSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - alctShowerDataSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - clctShowerDataSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - clctShowerDataSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - - lctShowerEmulSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - lctShowerEmulSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - alctShowerEmulSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - alctShowerEmulSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - clctShowerEmulSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - clctShowerEmulSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + lctShowerDataNomSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + lctShowerDataNomSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerDataNomSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerDataNomSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerDataNomSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerDataNomSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + + lctShowerEmulNomSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + lctShowerEmulNomSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerEmulNomSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerEmulNomSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerEmulNomSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerEmulNomSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + + lctShowerDataNomSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + lctShowerDataNomSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerDataNomSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerDataNomSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerDataNomSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerDataNomSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + + lctShowerEmulNomSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + lctShowerEmulNomSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerEmulNomSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerEmulNomSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerEmulNomSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerEmulNomSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + + lctShowerDataTightSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + lctShowerDataTightSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerDataTightSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerDataTightSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerDataTightSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerDataTightSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + + lctShowerEmulTightSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + lctShowerEmulTightSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerEmulTightSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerEmulTightSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerEmulTightSummary_denom_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerEmulTightSummary_num_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + + lctShowerDataTightSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + lctShowerDataTightSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerDataTightSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerDataTightSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerDataTightSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerDataTightSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + + lctShowerEmulTightSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + lctShowerEmulTightSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerEmulTightSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerEmulTightSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerEmulTightSummary_denom_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerEmulTightSummary_num_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); } } @@ -175,33 +257,60 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { auto range_emulALCT = emulALCTshs->get(detid); for (auto dalct = range_dataALCT.first; dalct != range_dataALCT.second; dalct++) { - if (dalct->isValid()) { - if (chamber20) { - alctShowerDataSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); - alctShowerDataSummary_denom_->Fill(chamber * 2, sr, 0.5); - } else - alctShowerDataSummary_denom_->Fill(chamber, sr); + if (dalct->isValid() and dalct->isNominalInTime()) { + if (dalct->isTightInTime()) { + if (chamber20) { + alctShowerDataTightSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + alctShowerDataTightSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + alctShowerDataTightSummary_denom_->Fill(chamber, sr); + } + else { + if (chamber20) { + alctShowerDataNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + alctShowerDataNomSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + alctShowerDataNomSummary_denom_->Fill(chamber, sr); + } // check for least one matching ALCT for (auto ealct = range_emulALCT.first; ealct != range_emulALCT.second; ealct++) { if (ealct->isValid() and areSameShowers(*dalct, *ealct)) { - if (chamber20) { - alctShowerDataSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); - alctShowerDataSummary_num_->Fill(chamber * 2, sr, 0.5); - } else - alctShowerDataSummary_num_->Fill(chamber, sr); + if (dalct->isTightInTime()) { + if (chamber20) { + alctShowerDataTightSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + alctShowerDataTightSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + alctShowerDataTightSummary_num_->Fill(chamber, sr); + } + else { + if (chamber20) { + alctShowerDataNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + alctShowerDataNomSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + alctShowerDataNomSummary_num_->Fill(chamber, sr); + } } } } - } + } // End of for (auto dalct = range_dataALCT.first; dalct != range_dataALCT.second; dalct++) for (auto ealct = range_emulALCT.first; ealct != range_emulALCT.second; ealct++) { bool isMatched = false; - if (ealct->isValid()) { - if (chamber20) { - alctShowerEmulSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); - alctShowerEmulSummary_denom_->Fill(chamber * 2, sr, 0.5); - } else - alctShowerEmulSummary_denom_->Fill(chamber, sr); + if (ealct->isValid() and ealct->isNominalInTime()) { + if (ealct->isTightInTime()) { + if (chamber20) { + alctShowerEmulTightSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + alctShowerEmulTightSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + alctShowerEmulTightSummary_denom_->Fill(chamber, sr); + } + else { + if (chamber20) { + alctShowerEmulNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + alctShowerEmulNomSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + alctShowerEmulNomSummary_denom_->Fill(chamber, sr); + } // check for least one matching ALCT for (auto dalct = range_dataALCT.first; dalct != range_dataALCT.second; dalct++) { if (areSameShowers(*dalct, *ealct)) @@ -210,47 +319,83 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { // only fill when it is not matched to an ALCT // to understand if the emulator is producing too many ALCTs if (!isMatched) { - if (chamber20) { - alctShowerEmulSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); - alctShowerEmulSummary_num_->Fill(chamber * 2, sr, 0.5); - } else - alctShowerEmulSummary_num_->Fill(chamber, sr); + if (ealct->isTightInTime()) { + if (chamber20) { + alctShowerEmulTightSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + alctShowerEmulTightSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + alctShowerEmulTightSummary_num_->Fill(chamber, sr); + } + else { + if (chamber20) { + alctShowerEmulNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + alctShowerEmulNomSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + alctShowerEmulNomSummary_num_->Fill(chamber, sr); + } } } - } + } // End of for (auto ealct = range_emulALCT.first; ealct != range_emulALCT.second; ealct++) // CLCT analysis auto range_dataCLCT = dataCLCTshs->get(detid); auto range_emulCLCT = emulCLCTshs->get(detid); for (auto dclct = range_dataCLCT.first; dclct != range_dataCLCT.second; dclct++) { - if (dclct->isValid()) { - if (chamber20) { - clctShowerDataSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); - clctShowerDataSummary_denom_->Fill(chamber * 2, sr, 0.5); - } else - clctShowerDataSummary_denom_->Fill(chamber, sr); + if (dclct->isValid() and dclct->isNominalInTime()) { + if (dclct->isTightInTime()) { + if (chamber20) { + clctShowerDataTightSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + clctShowerDataTightSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + clctShowerDataTightSummary_denom_->Fill(chamber, sr); + } + else { + if (chamber20) { + clctShowerDataNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + clctShowerDataNomSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + clctShowerDataNomSummary_denom_->Fill(chamber, sr); + } // check for least one matching CLCT for (auto eclct = range_emulCLCT.first; eclct != range_emulCLCT.second; eclct++) { if (eclct->isValid() and areSameShowers(*dclct, *eclct)) { - if (chamber20) { - clctShowerDataSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); - clctShowerDataSummary_num_->Fill(chamber * 2, sr, 0.5); - } else - clctShowerDataSummary_num_->Fill(chamber, sr); + if (dclct->isTightInTime()) { + if (chamber20) { + clctShowerDataTightSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + clctShowerDataTightSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + clctShowerDataTightSummary_num_->Fill(chamber, sr); + } + else { + if (chamber20) { + clctShowerDataNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + clctShowerDataNomSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + clctShowerDataNomSummary_num_->Fill(chamber, sr); + } } } } - } + } // End of for (auto dclct = range_dataCLCT.first; dclct != range_dataCLCT.second; dclct++) for (auto eclct = range_emulCLCT.first; eclct != range_emulCLCT.second; eclct++) { bool isMatched = false; - if (eclct->isValid()) { - if (chamber20) { - clctShowerEmulSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); - clctShowerEmulSummary_denom_->Fill(chamber * 2, sr, 0.5); - } else - clctShowerEmulSummary_denom_->Fill(chamber, sr); + if (eclct->isValid() and eclct->isNominalInTime()) { + if (eclct->isTightInTime()) { + if (chamber20) { + clctShowerEmulTightSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + clctShowerEmulTightSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + clctShowerEmulTightSummary_denom_->Fill(chamber, sr); + } + else { + if (chamber20) { + clctShowerEmulNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + clctShowerEmulNomSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + clctShowerEmulNomSummary_denom_->Fill(chamber, sr); + } // check for least one matching CLCT for (auto dclct = range_dataCLCT.first; dclct != range_dataCLCT.second; dclct++) { if (areSameShowers(*dclct, *eclct)) @@ -259,47 +404,83 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { // only fill when it is not matched to an CLCT // to understand if the emulator is producing too many CLCTs if (!isMatched) { - if (chamber20) { - clctShowerEmulSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); - clctShowerEmulSummary_num_->Fill(chamber * 2, sr, 0.5); - } else - clctShowerEmulSummary_num_->Fill(chamber, sr); + if (eclct->isTightInTime()) { + if (chamber20) { + clctShowerEmulTightSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + clctShowerEmulTightSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + clctShowerEmulTightSummary_num_->Fill(chamber, sr); + } + else { + if (chamber20) { + clctShowerEmulNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + clctShowerEmulNomSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + clctShowerEmulNomSummary_num_->Fill(chamber, sr); + } } } - } + } // End of for (auto eclct = range_emulCLCT.first; eclct != range_emulCLCT.second; eclct++) // LCT analysis auto range_dataLCT = dataLCTshs->get(detid); auto range_emulLCT = emulLCTshs->get(detid); for (auto dlct = range_dataLCT.first; dlct != range_dataLCT.second; dlct++) { - if (dlct->isValid()) { - if (chamber20) { - lctShowerDataSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); - lctShowerDataSummary_denom_->Fill(chamber * 2, sr, 0.5); - } else - lctShowerDataSummary_denom_->Fill(chamber, sr); + if (dlct->isValid() and dlct->isNominalInTime()) { + if (dlct->isTightInTime()) { + if (chamber20) { + lctShowerDataTightSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + lctShowerDataTightSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + lctShowerDataTightSummary_denom_->Fill(chamber, sr); + } + else { + if (chamber20) { + lctShowerDataNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + lctShowerDataNomSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + lctShowerDataNomSummary_denom_->Fill(chamber, sr); + } // check for least one matching LCT for (auto elct = range_emulLCT.first; elct != range_emulLCT.second; elct++) { if (elct->isValid() and areSameShowers(*dlct, *elct)) { - if (chamber20) { - lctShowerDataSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); - lctShowerDataSummary_num_->Fill(chamber * 2, sr, 0.5); - } else - lctShowerDataSummary_num_->Fill(chamber, sr); + if (dlct->isTightInTime()) { + if (chamber20) { + lctShowerDataTightSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + lctShowerDataTightSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + lctShowerDataTightSummary_num_->Fill(chamber, sr); + } + else { + if (chamber20) { + lctShowerDataNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + lctShowerDataNomSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + lctShowerDataNomSummary_num_->Fill(chamber, sr); + } } } } - } + } // End of for (auto dlct = range_dataLCT.first; dlct != range_dataLCT.second; dlct++) for (auto elct = range_emulLCT.first; elct != range_emulLCT.second; elct++) { bool isMatched = false; - if (elct->isValid()) { - if (chamber20) { - lctShowerEmulSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); - lctShowerEmulSummary_denom_->Fill(chamber * 2, sr, 0.5); - } else - lctShowerEmulSummary_denom_->Fill(chamber, sr); + if (elct->isValid() and elct->isNominalInTime()) { + if (elct->isTightInTime()) { + if (chamber20) { + lctShowerEmulTightSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + lctShowerEmulTightSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + lctShowerEmulTightSummary_denom_->Fill(chamber, sr); + } + else { + if (chamber20) { + lctShowerEmulNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); + lctShowerEmulNomSummary_denom_->Fill(chamber * 2, sr, 0.5); + } else + lctShowerEmulNomSummary_denom_->Fill(chamber, sr); + } // check for least one matching LCT for (auto dlct = range_dataLCT.first; dlct != range_dataLCT.second; dlct++) { if (areSameShowers(*dlct, *elct)) @@ -308,14 +489,23 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { // only fill when it is not matched to an LCT // to understand if the emulator is producing too many LCTs if (!isMatched) { - if (chamber20) { - lctShowerEmulSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); - lctShowerEmulSummary_num_->Fill(chamber * 2, sr, 0.5); - } else - lctShowerEmulSummary_num_->Fill(chamber, sr); + if (elct->isTightInTime()) { + if (chamber20) { + lctShowerEmulTightSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + lctShowerEmulTightSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + lctShowerEmulTightSummary_num_->Fill(chamber, sr); + } + else { + if (chamber20) { + lctShowerEmulNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); + lctShowerEmulNomSummary_num_->Fill(chamber * 2, sr, 0.5); + } else + lctShowerEmulNomSummary_num_->Fill(chamber, sr); + } } } - } + } // End of for (auto elct = range_emulLCT.first; elct != range_emulLCT.second; elct++) { } } } diff --git a/DQM/L1TMonitor/src/L1TdeStage2Shower.cc b/DQM/L1TMonitor/src/L1TdeStage2Shower.cc index ad8ee398b4fda..682ca562b82ab 100644 --- a/DQM/L1TMonitor/src/L1TdeStage2Shower.cc +++ b/DQM/L1TMonitor/src/L1TdeStage2Shower.cc @@ -16,13 +16,13 @@ void L1TdeStage2Shower::bookHistograms(DQMStore::IBooker& iBooker, const edm::Ru // 2D summary plots emtfShowerDataSummary_denom_ = - iBooker.book2D("emtf_shower_data_summary_denom", "Data EMTF Shower All", 6, 1, 7, 2, 0, 2); + iBooker.book2D("emtf_shower_data_summary_denom", "Data EMTF Shower All", 6, 1, 7, 4, 0, 4); emtfShowerDataSummary_num_ = - iBooker.book2D("emtf_shower_data_summary_num", "Data EMTF Shower Emul Matched", 6, 1, 7, 2, 0, 2); + iBooker.book2D("emtf_shower_data_summary_num", "Data EMTF Shower Emul Matched", 6, 1, 7, 4, 0, 4); emtfShowerEmulSummary_denom_ = - iBooker.book2D("emtf_shower_emul_summary_denom", "Emul EMTF Shower All", 6, 1, 7, 2, 0, 2); + iBooker.book2D("emtf_shower_emul_summary_denom", "Emul EMTF Shower All", 6, 1, 7, 4, 0, 4); emtfShowerEmulSummary_num_ = - iBooker.book2D("emtf_shower_emul_summary_num", "Emul EMTF Shower Not Matched to Data", 6, 1, 7, 2, 0, 2); + iBooker.book2D("emtf_shower_emul_summary_num", "Emul EMTF Shower Not Matched to Data", 6, 1, 7, 4, 0, 4); // x labels emtfShowerDataSummary_denom_->setAxisTitle("Sector", 1); @@ -37,15 +37,23 @@ void L1TdeStage2Shower::bookHistograms(DQMStore::IBooker& iBooker, const edm::Ru emtfShowerEmulSummary_num_->setOption("colz"); // y labels - emtfShowerDataSummary_denom_->setBinLabel(1, "ME-", 2); - emtfShowerDataSummary_num_->setBinLabel(1, "ME-", 2); - emtfShowerEmulSummary_denom_->setBinLabel(1, "ME-", 2); - emtfShowerEmulSummary_num_->setBinLabel(1, "ME-", 2); + emtfShowerDataSummary_denom_->setBinLabel(1, "ME- Tight", 2); + emtfShowerDataSummary_num_->setBinLabel(1, "ME- Tight", 2); + emtfShowerEmulSummary_denom_->setBinLabel(1, "ME- Tight", 2); + emtfShowerEmulSummary_num_->setBinLabel(1, "ME- Tight", 2); + emtfShowerDataSummary_denom_->setBinLabel(2, "ME- Nom", 2); + emtfShowerDataSummary_num_->setBinLabel(2, "ME- Nom", 2); + emtfShowerEmulSummary_denom_->setBinLabel(2, "ME- Nom", 2); + emtfShowerEmulSummary_num_->setBinLabel(2, "ME- Nom", 2); - emtfShowerDataSummary_denom_->setBinLabel(2, "ME+", 2); - emtfShowerDataSummary_num_->setBinLabel(2, "ME+", 2); - emtfShowerEmulSummary_denom_->setBinLabel(2, "ME+", 2); - emtfShowerEmulSummary_num_->setBinLabel(2, "ME+", 2); + emtfShowerDataSummary_denom_->setBinLabel(3, "ME+ Nom", 2); + emtfShowerDataSummary_num_->setBinLabel(3, "ME+ Nom", 2); + emtfShowerEmulSummary_denom_->setBinLabel(3, "ME+ Nom", 2); + emtfShowerEmulSummary_num_->setBinLabel(3, "ME+ Nom", 2); + emtfShowerDataSummary_denom_->setBinLabel(4, "ME+ Tight", 2); + emtfShowerDataSummary_num_->setBinLabel(4, "ME+ Tight", 2); + emtfShowerEmulSummary_denom_->setBinLabel(4, "ME+ Tight", 2); + emtfShowerEmulSummary_num_->setBinLabel(4, "ME+ Tight", 2); } void L1TdeStage2Shower::analyze(const edm::Event& e, const edm::EventSetup& c) { @@ -56,31 +64,40 @@ void L1TdeStage2Shower::analyze(const edm::Event& e, const edm::EventSetup& c) { e.getByToken(emul_EMTFShower_token_, emulShowers); for (auto dSh = dataShowers->begin(); dSh != dataShowers->end(); ++dSh) { - if (dSh->isValid()) { - emtfShowerDataSummary_denom_->Fill(dSh->processor() + 1, - (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 1.5 : 0.5); + if (dSh->isValid() and dSh->isOneNominalInTime()) { + if (dSh->isOneTightInTime()) + emtfShowerDataSummary_denom_->Fill(dSh->processor() + 1, (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); + else + emtfShowerDataSummary_denom_->Fill(dSh->processor() + 1, (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); for (auto eSh = emulShowers->begin(); eSh != emulShowers->end(); ++eSh) { - if (eSh->isValid() and dSh->processor() == eSh->processor() and - dSh->trackFinderType() == eSh->trackFinderType() and *dSh == *eSh) - emtfShowerDataSummary_num_->Fill(dSh->processor() + 1, - (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 1.5 : 0.5); + if (eSh->isValid() and eSh->isOneNominalInTime() and dSh->processor() == eSh->processor() and + dSh->trackFinderType() == eSh->trackFinderType() and *dSh == *eSh) { + if (dSh->isOneTightInTime()) + emtfShowerDataSummary_num_->Fill(dSh->processor() + 1, (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); + else + emtfShowerDataSummary_num_->Fill(dSh->processor() + 1, (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); + } } } } for (auto eSh = emulShowers->begin(); eSh != emulShowers->end(); ++eSh) { bool isMatched = false; - if (eSh->isValid()) { - emtfShowerEmulSummary_denom_->Fill(eSh->processor() + 1, - (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 1.5 : 0.5); + if (eSh->isValid() and eSh->isOneNominalInTime()) { + if (eSh->isOneTightInTime()) + emtfShowerEmulSummary_denom_->Fill(eSh->processor() + 1, (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); + else + emtfShowerEmulSummary_denom_->Fill(eSh->processor() + 1, (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); for (auto dSh = dataShowers->begin(); dSh != dataShowers->end(); ++dSh) { - if (dSh->isValid() and eSh->processor() == dSh->processor() and + if (dSh->isValid() and dSh->isOneNominalInTime() and eSh->processor() == dSh->processor() and eSh->trackFinderType() == dSh->trackFinderType() and *dSh == *eSh) isMatched = true; } if (not isMatched) { - emtfShowerEmulSummary_num_->Fill(eSh->processor() + 1, - (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 1.5 : 0.5); + if (eSh->isOneTightInTime()) + emtfShowerEmulSummary_num_->Fill(eSh->processor() + 1, (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); + else + emtfShowerEmulSummary_num_->Fill(eSh->processor() + 1, (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); } } } diff --git a/DQM/L1TMonitorClient/interface/L1TdeCSCTPGShowerClient.h b/DQM/L1TMonitorClient/interface/L1TdeCSCTPGShowerClient.h index 88ce9aab6a3a9..5d8192f764afd 100644 --- a/DQM/L1TMonitorClient/interface/L1TdeCSCTPGShowerClient.h +++ b/DQM/L1TMonitorClient/interface/L1TdeCSCTPGShowerClient.h @@ -31,12 +31,19 @@ class L1TdeCSCTPGShowerClient : public DQMEDHarvester { std::string monitorDir_; - MonitorElement *lctShowerDataSummary_eff_; - MonitorElement *alctShowerDataSummary_eff_; - MonitorElement *clctShowerDataSummary_eff_; - MonitorElement *lctShowerEmulSummary_eff_; - MonitorElement *alctShowerEmulSummary_eff_; - MonitorElement *clctShowerEmulSummary_eff_; + MonitorElement *lctShowerDataNomSummary_eff_; + MonitorElement *alctShowerDataNomSummary_eff_; + MonitorElement *clctShowerDataNomSummary_eff_; + MonitorElement *lctShowerEmulNomSummary_eff_; + MonitorElement *alctShowerEmulNomSummary_eff_; + MonitorElement *clctShowerEmulNomSummary_eff_; + + MonitorElement *lctShowerDataTightSummary_eff_; + MonitorElement *alctShowerDataTightSummary_eff_; + MonitorElement *clctShowerDataTightSummary_eff_; + MonitorElement *lctShowerEmulTightSummary_eff_; + MonitorElement *alctShowerEmulTightSummary_eff_; + MonitorElement *clctShowerEmulTightSummary_eff_; }; #endif diff --git a/DQM/L1TMonitorClient/python/L1TStage2EMTFEmulatorClient_cff.py b/DQM/L1TMonitorClient/python/L1TStage2EMTFEmulatorClient_cff.py index 091909224dd15..b5bae3a7b63fd 100644 --- a/DQM/L1TMonitorClient/python/L1TStage2EMTFEmulatorClient_cff.py +++ b/DQM/L1TMonitorClient/python/L1TStage2EMTFEmulatorClient_cff.py @@ -21,6 +21,6 @@ l1tStage2EMTFEmulatorCompRatioClient ) -from Configuration.Eras.Modifier_run3_common_cff import run3_common +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM _run3shower_l1tStage2EMTFEmulatorClient = l1tStage2EMTFEmulatorClient.copy() -run3_common.toReplaceWith(l1tStage2EMTFEmulatorClient, cms.Sequence(_run3shower_l1tStage2EMTFEmulatorClient + l1tdeStage2ShowerClient)) +run3_GEM.toReplaceWith(l1tStage2EMTFEmulatorClient, cms.Sequence(_run3shower_l1tStage2EMTFEmulatorClient + l1tdeStage2ShowerClient)) diff --git a/DQM/L1TMonitorClient/python/L1TStage2EmulatorMonitorClient_cff.py b/DQM/L1TMonitorClient/python/L1TStage2EmulatorMonitorClient_cff.py index 7c60f5729f081..a460dab64c778 100644 --- a/DQM/L1TMonitorClient/python/L1TStage2EmulatorMonitorClient_cff.py +++ b/DQM/L1TMonitorClient/python/L1TStage2EmulatorMonitorClient_cff.py @@ -70,9 +70,8 @@ from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM run3_GEM.toReplaceWith( l1TStage2EmulatorClients, _run3_l1TStage2EmulatorClients ) -from Configuration.Eras.Modifier_run3_common_cff import run3_common _run3shower_l1TStage2EmulatorClients = l1TStage2EmulatorClients.copy() -run3_common.toReplaceWith(l1TStage2EmulatorClients, cms.Sequence(_run3shower_l1TStage2EmulatorClients + l1tdeCSCTPGShowerClient)) +run3_GEM.toReplaceWith(l1TStage2EmulatorClients, cms.Sequence(_run3shower_l1TStage2EmulatorClients + l1tdeCSCTPGShowerClient)) l1tStage2EmulatorMonitorClient = cms.Sequence( l1TStage2EmulatorQualityTests + diff --git a/DQM/L1TMonitorClient/src/L1TdeCSCTPGShowerClient.cc b/DQM/L1TMonitorClient/src/L1TdeCSCTPGShowerClient.cc index 9305d6b53f888..92f082a1f4f34 100644 --- a/DQM/L1TMonitorClient/src/L1TdeCSCTPGShowerClient.cc +++ b/DQM/L1TMonitorClient/src/L1TdeCSCTPGShowerClient.cc @@ -32,121 +32,181 @@ void L1TdeCSCTPGShowerClient::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IG void L1TdeCSCTPGShowerClient::book(DQMStore::IBooker &iBooker) { iBooker.setCurrentFolder(monitorDir_); - lctShowerDataSummary_eff_ = iBooker.book2D( - "lct_cscshower_data_summary_eff", "Efficiency of data LCT shower being correctly emulated", 36, 1, 37, 18, 0, 18); - alctShowerDataSummary_eff_ = iBooker.book2D("alct_cscshower_data_summary_eff", - "Efficiency of data ALCT shower being correctly emulated", - 36, - 1, - 37, - 18, - 0, - 18); - clctShowerDataSummary_eff_ = iBooker.book2D("clct_cscshower_data_summary_eff", - "Efficiency of data CLCT shower being correctly emulated", - 36, - 1, - 37, - 18, - 0, - 18); - - lctShowerEmulSummary_eff_ = iBooker.book2D("lct_cscshower_emul_summary_eff", - "Fraction of emulated LCT shower without matching data LCT", - 36, - 1, - 37, - 18, - 0, - 18); - alctShowerEmulSummary_eff_ = iBooker.book2D("alct_cscshower_emul_summary_eff", - "Fraction of emulated ALCT shower without matching data ALCT", - 36, - 1, - 37, - 18, - 0, - 18); - clctShowerEmulSummary_eff_ = iBooker.book2D("clct_cscshower_emul_summary_eff", - "Fraction of emulated CLCT shower without matching data CLCT", - 36, - 1, - 37, - 18, - 0, - 18); + lctShowerDataNomSummary_eff_ = iBooker.book2D( + "lct_cscshower_data_nom_summary_eff", "Efficiency of data LCT Nominal shower being correctly emulated", + 36, 1, 37, 18, 0, 18); + alctShowerDataNomSummary_eff_ = iBooker.book2D( + "alct_cscshower_data_nom_summary_eff", "Efficiency of data ALCT Nominal shower being correctly emulated", + 36, 1, 37, 18, 0, 18); + clctShowerDataNomSummary_eff_ = iBooker.book2D( + "clct_cscshower_data_nom_summary_eff", "Efficiency of data CLCT Nominal shower being correctly emulated", + 36, 1, 37, 18, 0, 18); + + lctShowerEmulNomSummary_eff_ = iBooker.book2D( + "lct_cscshower_emul_nom_summary_eff", "Fraction of emulated LCT Nominal shower without matching data LCT", + 36, 1, 37, 18, 0, 18); + alctShowerEmulNomSummary_eff_ = iBooker.book2D( + "alct_cscshower_emul_nom_summary_eff", "Fraction of emulated ALCT Nominal shower without matching data ALCT", + 36, 1, 37, 18, 0, 18); + clctShowerEmulNomSummary_eff_ = iBooker.book2D( + "clct_cscshower_emul_nom_summary_eff", "Fraction of emulated CLCT Nominal shower without matching data CLCT", + 36, 1, 37, 18, 0, 18); + + lctShowerDataTightSummary_eff_ = iBooker.book2D( + "lct_cscshower_data_tight_summary_eff", "Efficiency of data LCT Tight shower being correctly emulated", + 36, 1, 37, 18, 0, 18); + alctShowerDataTightSummary_eff_ = iBooker.book2D( + "alct_cscshower_data_tight_summary_eff", "Efficiency of data ALCT Tight shower being correctly emulated", + 36, 1, 37, 18, 0, 18); + clctShowerDataTightSummary_eff_ = iBooker.book2D( + "clct_cscshower_data_tight_summary_eff", "Efficiency of data CLCT Tight shower being correctly emulated", + 36, 1, 37, 18, 0, 18); + + lctShowerEmulTightSummary_eff_ = iBooker.book2D( + "lct_cscshower_emul_tight_summary_eff", "Fraction of emulated LCT Tight shower without matching data LCT", + 36, 1, 37, 18, 0, 18); + alctShowerEmulTightSummary_eff_ = iBooker.book2D( + "alct_cscshower_emul_tight_summary_eff", "Fraction of emulated ALCT Tight shower without matching data ALCT", + 36, 1, 37, 18, 0, 18); + clctShowerEmulTightSummary_eff_ = iBooker.book2D( + "clct_cscshower_emul_tight_summary_eff", "Fraction of emulated CLCT Tight shower without matching data CLCT", + 36, 1, 37, 18, 0, 18); // x labels - lctShowerDataSummary_eff_->setAxisTitle("Chamber", 1); - alctShowerDataSummary_eff_->setAxisTitle("Chamber", 1); - clctShowerDataSummary_eff_->setAxisTitle("Chamber", 1); + lctShowerDataNomSummary_eff_->setAxisTitle("Chamber", 1); + alctShowerDataNomSummary_eff_->setAxisTitle("Chamber", 1); + clctShowerDataNomSummary_eff_->setAxisTitle("Chamber", 1); - lctShowerEmulSummary_eff_->setAxisTitle("Chamber", 1); - alctShowerEmulSummary_eff_->setAxisTitle("Chamber", 1); - clctShowerEmulSummary_eff_->setAxisTitle("Chamber", 1); + lctShowerEmulNomSummary_eff_->setAxisTitle("Chamber", 1); + alctShowerEmulNomSummary_eff_->setAxisTitle("Chamber", 1); + clctShowerEmulNomSummary_eff_->setAxisTitle("Chamber", 1); + + lctShowerDataTightSummary_eff_->setAxisTitle("Chamber", 1); + alctShowerDataTightSummary_eff_->setAxisTitle("Chamber", 1); + clctShowerDataTightSummary_eff_->setAxisTitle("Chamber", 1); + + lctShowerEmulTightSummary_eff_->setAxisTitle("Chamber", 1); + alctShowerEmulTightSummary_eff_->setAxisTitle("Chamber", 1); + clctShowerEmulTightSummary_eff_->setAxisTitle("Chamber", 1); // plotting option - lctShowerDataSummary_eff_->setOption("colz"); - alctShowerDataSummary_eff_->setOption("colz"); - clctShowerDataSummary_eff_->setOption("colz"); + lctShowerDataNomSummary_eff_->setOption("colz"); + alctShowerDataNomSummary_eff_->setOption("colz"); + clctShowerDataNomSummary_eff_->setOption("colz"); + + lctShowerEmulNomSummary_eff_->setOption("colz"); + alctShowerEmulNomSummary_eff_->setOption("colz"); + clctShowerEmulNomSummary_eff_->setOption("colz"); + + lctShowerDataTightSummary_eff_->setOption("colz"); + alctShowerDataTightSummary_eff_->setOption("colz"); + clctShowerDataTightSummary_eff_->setOption("colz"); - lctShowerEmulSummary_eff_->setOption("colz"); - alctShowerEmulSummary_eff_->setOption("colz"); - clctShowerEmulSummary_eff_->setOption("colz"); + lctShowerEmulTightSummary_eff_->setOption("colz"); + alctShowerEmulTightSummary_eff_->setOption("colz"); + clctShowerEmulTightSummary_eff_->setOption("colz"); // summary plots const std::array suffix_label{{"4/2", "4/1", "3/2", "3/1", " 2/2", "2/1", "1/3", "1/2", "1/1"}}; // y labels for (int ybin = 1; ybin <= 9; ++ybin) { - lctShowerDataSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - alctShowerDataSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - clctShowerDataSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + lctShowerDataNomSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerDataNomSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerDataNomSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + + lctShowerEmulNomSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerEmulNomSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerEmulNomSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + + lctShowerDataNomSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerDataNomSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerDataNomSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + + lctShowerEmulNomSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerEmulNomSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerEmulNomSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + + lctShowerDataTightSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerDataTightSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerDataTightSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - lctShowerEmulSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - alctShowerEmulSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - clctShowerEmulSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + lctShowerEmulTightSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + alctShowerEmulTightSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); + clctShowerEmulTightSummary_eff_->setBinLabel(ybin, "ME-" + suffix_label[ybin - 1], 2); - lctShowerDataSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - alctShowerDataSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - clctShowerDataSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + lctShowerDataTightSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerDataTightSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerDataTightSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - lctShowerEmulSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - alctShowerEmulSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); - clctShowerEmulSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + lctShowerEmulTightSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + alctShowerEmulTightSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); + clctShowerEmulTightSummary_eff_->setBinLabel(19 - ybin, "ME+" + suffix_label[ybin - 1], 2); } } void L1TdeCSCTPGShowerClient::processHistograms(DQMStore::IGetter &igetter) { - MonitorElement *lctShowerDataSummary_denom_ = igetter.get(monitorDir_ + "/lct_cscshower_data_summary_denom"); - MonitorElement *lctShowerDataSummary_num_ = igetter.get(monitorDir_ + "/lct_cscshower_data_summary_num"); - MonitorElement *alctShowerDataSummary_denom_ = igetter.get(monitorDir_ + "/alct_cscshower_data_summary_denom"); - MonitorElement *alctShowerDataSummary_num_ = igetter.get(monitorDir_ + "/alct_cscshower_data_summary_num"); - MonitorElement *clctShowerDataSummary_denom_ = igetter.get(monitorDir_ + "/clct_cscshower_data_summary_denom"); - MonitorElement *clctShowerDataSummary_num_ = igetter.get(monitorDir_ + "/clct_cscshower_data_summary_num"); - - MonitorElement *lctShowerEmulSummary_denom_ = igetter.get(monitorDir_ + "/lct_cscshower_emul_summary_denom"); - MonitorElement *lctShowerEmulSummary_num_ = igetter.get(monitorDir_ + "/lct_cscshower_emul_summary_num"); - MonitorElement *alctShowerEmulSummary_denom_ = igetter.get(monitorDir_ + "/alct_cscshower_emul_summary_denom"); - MonitorElement *alctShowerEmulSummary_num_ = igetter.get(monitorDir_ + "/alct_cscshower_emul_summary_num"); - MonitorElement *clctShowerEmulSummary_denom_ = igetter.get(monitorDir_ + "/clct_cscshower_emul_summary_denom"); - MonitorElement *clctShowerEmulSummary_num_ = igetter.get(monitorDir_ + "/clct_cscshower_emul_summary_num"); - - lctShowerDataSummary_eff_->getTH2F()->Divide( - lctShowerDataSummary_num_->getTH2F(), lctShowerDataSummary_denom_->getTH2F(), 1, 1, ""); - alctShowerDataSummary_eff_->getTH2F()->Divide( - alctShowerDataSummary_num_->getTH2F(), alctShowerDataSummary_denom_->getTH2F(), 1, 1, ""); - clctShowerDataSummary_eff_->getTH2F()->Divide( - clctShowerDataSummary_num_->getTH2F(), clctShowerDataSummary_denom_->getTH2F(), 1, 1, ""); - - lctShowerEmulSummary_eff_->getTH2F()->Divide( - lctShowerEmulSummary_num_->getTH2F(), lctShowerEmulSummary_denom_->getTH2F(), 1, 1, ""); - alctShowerEmulSummary_eff_->getTH2F()->Divide( - alctShowerEmulSummary_num_->getTH2F(), alctShowerEmulSummary_denom_->getTH2F(), 1, 1, ""); - clctShowerEmulSummary_eff_->getTH2F()->Divide( - clctShowerEmulSummary_num_->getTH2F(), clctShowerEmulSummary_denom_->getTH2F(), 1, 1, ""); - - lctShowerDataSummary_eff_->getTH2F()->GetZaxis()->SetRangeUser(0.95, 1); - alctShowerDataSummary_eff_->getTH2F()->GetZaxis()->SetRangeUser(0.95, 1); - clctShowerDataSummary_eff_->getTH2F()->GetZaxis()->SetRangeUser(0.95, 1); + MonitorElement *lctShowerDataNomSummary_denom_ = igetter.get(monitorDir_ + "/lct_cscshower_data_nom_summary_denom"); + MonitorElement *lctShowerDataNomSummary_num_ = igetter.get(monitorDir_ + "/lct_cscshower_data_nom_summary_num"); + MonitorElement *alctShowerDataNomSummary_denom_ = igetter.get(monitorDir_ + "/alct_cscshower_data_nom_summary_denom"); + MonitorElement *alctShowerDataNomSummary_num_ = igetter.get(monitorDir_ + "/alct_cscshower_data_nom_summary_num"); + MonitorElement *clctShowerDataNomSummary_denom_ = igetter.get(monitorDir_ + "/clct_cscshower_data_nom_summary_denom"); + MonitorElement *clctShowerDataNomSummary_num_ = igetter.get(monitorDir_ + "/clct_cscshower_data_nom_summary_num"); + + MonitorElement *lctShowerEmulNomSummary_denom_ = igetter.get(monitorDir_ + "/lct_cscshower_emul_nom_summary_denom"); + MonitorElement *lctShowerEmulNomSummary_num_ = igetter.get(monitorDir_ + "/lct_cscshower_emul_nom_summary_num"); + MonitorElement *alctShowerEmulNomSummary_denom_ = igetter.get(monitorDir_ + "/alct_cscshower_emul_nom_summary_denom"); + MonitorElement *alctShowerEmulNomSummary_num_ = igetter.get(monitorDir_ + "/alct_cscshower_emul_nom_summary_num"); + MonitorElement *clctShowerEmulNomSummary_denom_ = igetter.get(monitorDir_ + "/clct_cscshower_emul_nom_summary_denom"); + MonitorElement *clctShowerEmulNomSummary_num_ = igetter.get(monitorDir_ + "/clct_cscshower_emul_nom_summary_num"); + + MonitorElement *lctShowerDataTightSummary_denom_ = igetter.get(monitorDir_ + "/lct_cscshower_data_tight_summary_denom"); + MonitorElement *lctShowerDataTightSummary_num_ = igetter.get(monitorDir_ + "/lct_cscshower_data_tight_summary_num"); + MonitorElement *alctShowerDataTightSummary_denom_ = igetter.get(monitorDir_ + "/alct_cscshower_data_tight_summary_denom"); + MonitorElement *alctShowerDataTightSummary_num_ = igetter.get(monitorDir_ + "/alct_cscshower_data_tight_summary_num"); + MonitorElement *clctShowerDataTightSummary_denom_ = igetter.get(monitorDir_ + "/clct_cscshower_data_tight_summary_denom"); + MonitorElement *clctShowerDataTightSummary_num_ = igetter.get(monitorDir_ + "/clct_cscshower_data_tight_summary_num"); + + MonitorElement *lctShowerEmulTightSummary_denom_ = igetter.get(monitorDir_ + "/lct_cscshower_emul_tight_summary_denom"); + MonitorElement *lctShowerEmulTightSummary_num_ = igetter.get(monitorDir_ + "/lct_cscshower_emul_tight_summary_num"); + MonitorElement *alctShowerEmulTightSummary_denom_ = igetter.get(monitorDir_ + "/alct_cscshower_emul_tight_summary_denom"); + MonitorElement *alctShowerEmulTightSummary_num_ = igetter.get(monitorDir_ + "/alct_cscshower_emul_tight_summary_num"); + MonitorElement *clctShowerEmulTightSummary_denom_ = igetter.get(monitorDir_ + "/clct_cscshower_emul_tight_summary_denom"); + MonitorElement *clctShowerEmulTightSummary_num_ = igetter.get(monitorDir_ + "/clct_cscshower_emul_tight_summary_num"); + + lctShowerDataNomSummary_eff_->getTH2F()->Divide( + lctShowerDataNomSummary_num_->getTH2F(), lctShowerDataNomSummary_denom_->getTH2F(), 1, 1, ""); + alctShowerDataNomSummary_eff_->getTH2F()->Divide( + alctShowerDataNomSummary_num_->getTH2F(), alctShowerDataNomSummary_denom_->getTH2F(), 1, 1, ""); + clctShowerDataNomSummary_eff_->getTH2F()->Divide( + clctShowerDataNomSummary_num_->getTH2F(), clctShowerDataNomSummary_denom_->getTH2F(), 1, 1, ""); + + lctShowerEmulNomSummary_eff_->getTH2F()->Divide( + lctShowerEmulNomSummary_num_->getTH2F(), lctShowerEmulNomSummary_denom_->getTH2F(), 1, 1, ""); + alctShowerEmulNomSummary_eff_->getTH2F()->Divide( + alctShowerEmulNomSummary_num_->getTH2F(), alctShowerEmulNomSummary_denom_->getTH2F(), 1, 1, ""); + clctShowerEmulNomSummary_eff_->getTH2F()->Divide( + clctShowerEmulNomSummary_num_->getTH2F(), clctShowerEmulNomSummary_denom_->getTH2F(), 1, 1, ""); + + lctShowerDataTightSummary_eff_->getTH2F()->Divide( + lctShowerDataTightSummary_num_->getTH2F(), lctShowerDataTightSummary_denom_->getTH2F(), 1, 1, ""); + alctShowerDataTightSummary_eff_->getTH2F()->Divide( + alctShowerDataTightSummary_num_->getTH2F(), alctShowerDataTightSummary_denom_->getTH2F(), 1, 1, ""); + clctShowerDataTightSummary_eff_->getTH2F()->Divide( + clctShowerDataTightSummary_num_->getTH2F(), clctShowerDataTightSummary_denom_->getTH2F(), 1, 1, ""); + + lctShowerEmulTightSummary_eff_->getTH2F()->Divide( + lctShowerEmulTightSummary_num_->getTH2F(), lctShowerEmulTightSummary_denom_->getTH2F(), 1, 1, ""); + alctShowerEmulTightSummary_eff_->getTH2F()->Divide( + alctShowerEmulTightSummary_num_->getTH2F(), alctShowerEmulTightSummary_denom_->getTH2F(), 1, 1, ""); + clctShowerEmulTightSummary_eff_->getTH2F()->Divide( + clctShowerEmulTightSummary_num_->getTH2F(), clctShowerEmulTightSummary_denom_->getTH2F(), 1, 1, ""); + + lctShowerDataNomSummary_eff_->getTH2F()->GetZaxis()->SetRangeUser(0.95, 1); + alctShowerDataNomSummary_eff_->getTH2F()->GetZaxis()->SetRangeUser(0.95, 1); + clctShowerDataNomSummary_eff_->getTH2F()->GetZaxis()->SetRangeUser(0.95, 1); + + lctShowerDataTightSummary_eff_->getTH2F()->GetZaxis()->SetRangeUser(0.95, 1); + alctShowerDataTightSummary_eff_->getTH2F()->GetZaxis()->SetRangeUser(0.95, 1); + clctShowerDataTightSummary_eff_->getTH2F()->GetZaxis()->SetRangeUser(0.95, 1); } diff --git a/DQM/L1TMonitorClient/src/L1TdeStage2ShowerClient.cc b/DQM/L1TMonitorClient/src/L1TdeStage2ShowerClient.cc index e5443316e6b49..4e9a5a2a912d5 100644 --- a/DQM/L1TMonitorClient/src/L1TdeStage2ShowerClient.cc +++ b/DQM/L1TMonitorClient/src/L1TdeStage2ShowerClient.cc @@ -33,9 +33,9 @@ void L1TdeStage2ShowerClient::book(DQMStore::IBooker &iBooker) { iBooker.setCurrentFolder(monitorDir_); emtfShowerDataSummary_eff_ = iBooker.book2D( - "emtf_shower_data_summary_eff", "Efficiency of data EMTF shower being correctly emulated", 6, 1, 7, 2, 0, 2); + "emtf_shower_data_summary_eff", "Efficiency of data EMTF shower being correctly emulated", 6, 1, 7, 4, 0, 4); emtfShowerEmulSummary_eff_ = iBooker.book2D( - "emtf_shower_emul_summary_eff", "Fraction of emulated EMTF shower without matching data shower", 6, 1, 7, 2, 0, 2); + "emtf_shower_emul_summary_eff", "Fraction of emulated EMTF shower without matching data shower", 6, 1, 7, 4, 0, 4); // x labels emtfShowerDataSummary_eff_->setAxisTitle("Chamber", 1); @@ -46,10 +46,14 @@ void L1TdeStage2ShowerClient::book(DQMStore::IBooker &iBooker) { emtfShowerEmulSummary_eff_->setOption("colz"); // y labels - emtfShowerDataSummary_eff_->setBinLabel(1, "ME-", 2); - emtfShowerEmulSummary_eff_->setBinLabel(1, "ME-", 2); - emtfShowerDataSummary_eff_->setBinLabel(2, "ME+", 2); - emtfShowerEmulSummary_eff_->setBinLabel(2, "ME+", 2); + emtfShowerDataSummary_eff_->setBinLabel(1, "ME- Tight", 2); + emtfShowerEmulSummary_eff_->setBinLabel(1, "ME- Tight", 2); + emtfShowerDataSummary_eff_->setBinLabel(2, "ME- Nom", 2); + emtfShowerEmulSummary_eff_->setBinLabel(2, "ME- Nom", 2); + emtfShowerDataSummary_eff_->setBinLabel(3, "ME+ Nom", 2); + emtfShowerEmulSummary_eff_->setBinLabel(3, "ME+ Nom", 2); + emtfShowerDataSummary_eff_->setBinLabel(4, "ME+ Tight", 2); + emtfShowerEmulSummary_eff_->setBinLabel(4, "ME+ Tight", 2); } void L1TdeStage2ShowerClient::processHistograms(DQMStore::IGetter &igetter) { From f667a4e17ffda96a8ef187abc4a9da53a9242543 Mon Sep 17 00:00:00 2001 From: Xunwu Zuo Date: Sun, 19 Dec 2021 17:08:37 +0100 Subject: [PATCH 2/5] minor fix: regional shower processor should be sector - 1 --- L1Trigger/L1TMuonEndCap/src/SectorProcessorShower.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L1Trigger/L1TMuonEndCap/src/SectorProcessorShower.cc b/L1Trigger/L1TMuonEndCap/src/SectorProcessorShower.cc index 671310fb30218..3c2618913483a 100644 --- a/L1Trigger/L1TMuonEndCap/src/SectorProcessorShower.cc +++ b/L1Trigger/L1TMuonEndCap/src/SectorProcessorShower.cc @@ -68,7 +68,7 @@ void SectorProcessorShower::process(const CSCShowerDigiCollection& in_showers, // shower output l1t::RegionalMuonShower out_shower(hasOneNominalInTime, false, hasTwoLooseInTime, false, hasOneTightInTime, false); l1t::tftype tftype = (endcap_ == 1) ? l1t::tftype::emtf_pos : l1t::tftype::emtf_neg; - out_shower.setTFIdentifiers(sector_, tftype); + out_shower.setTFIdentifiers(sector_ - 1, tftype); out_showers.push_back(0, out_shower); } } From ef1db3d819950690a0d7ae9e8363eef1ece01a09 Mon Sep 17 00:00:00 2001 From: Xunwu Zuo Date: Sun, 19 Dec 2021 19:36:14 +0100 Subject: [PATCH 3/5] code-format --- DQM/L1TMonitor/src/L1TdeCSCTPGShower.cc | 114 ++++++------- DQM/L1TMonitor/src/L1TdeStage2Shower.cc | 28 ++-- .../src/L1TdeCSCTPGShowerClient.cc | 156 +++++++++++++----- 3 files changed, 180 insertions(+), 118 deletions(-) diff --git a/DQM/L1TMonitor/src/L1TdeCSCTPGShower.cc b/DQM/L1TMonitor/src/L1TdeCSCTPGShower.cc index 9ef0a9bf2dc83..56da9e5ece5aa 100644 --- a/DQM/L1TMonitor/src/L1TdeCSCTPGShower.cc +++ b/DQM/L1TMonitor/src/L1TdeCSCTPGShower.cc @@ -20,55 +20,55 @@ void L1TdeCSCTPGShower::bookHistograms(DQMStore::IBooker& iBooker, const edm::Ru // 2D summary plots lctShowerDataNomSummary_denom_ = iBooker.book2D("lct_cscshower_data_nom_summary_denom", "Data LCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); - lctShowerDataNomSummary_num_ = - iBooker.book2D("lct_cscshower_data_nom_summary_num", "Data LCT Nominal Only Shower Emul Matched", 36, 1, 37, 18, 0, 18); - alctShowerDataNomSummary_denom_ = - iBooker.book2D("alct_cscshower_data_nom_summary_denom", "Data ALCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); - alctShowerDataNomSummary_num_ = - iBooker.book2D("alct_cscshower_data_nom_summary_num", "Data ALCT Nominal Only Shower Emul Matched", 36, 1, 37, 18, 0, 18); - clctShowerDataNomSummary_denom_ = - iBooker.book2D("clct_cscshower_data_nom_summary_denom", "Data CLCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); - clctShowerDataNomSummary_num_ = - iBooker.book2D("clct_cscshower_data_nom_summary_num", "Data CLCT Nominal Only Shower Emul Matched", 36, 1, 37, 18, 0, 18); + lctShowerDataNomSummary_num_ = iBooker.book2D( + "lct_cscshower_data_nom_summary_num", "Data LCT Nominal Only Shower Emul Matched", 36, 1, 37, 18, 0, 18); + alctShowerDataNomSummary_denom_ = iBooker.book2D( + "alct_cscshower_data_nom_summary_denom", "Data ALCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); + alctShowerDataNomSummary_num_ = iBooker.book2D( + "alct_cscshower_data_nom_summary_num", "Data ALCT Nominal Only Shower Emul Matched", 36, 1, 37, 18, 0, 18); + clctShowerDataNomSummary_denom_ = iBooker.book2D( + "clct_cscshower_data_nom_summary_denom", "Data CLCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); + clctShowerDataNomSummary_num_ = iBooker.book2D( + "clct_cscshower_data_nom_summary_num", "Data CLCT Nominal Only Shower Emul Matched", 36, 1, 37, 18, 0, 18); lctShowerEmulNomSummary_denom_ = iBooker.book2D("lct_cscshower_emul_nom_summary_denom", "Emul LCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); - lctShowerEmulNomSummary_num_ = - iBooker.book2D("lct_cscshower_emul_nom_summary_num", "Emul LCT Nominal Only Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); - alctShowerEmulNomSummary_denom_ = - iBooker.book2D("alct_cscshower_emul_nom_summary_denom", "Emul ALCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); - alctShowerEmulNomSummary_num_ = - iBooker.book2D("alct_cscshower_emul_nom_summary_num", "Emul ALCT Nominal Only Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); - clctShowerEmulNomSummary_denom_ = - iBooker.book2D("clct_cscshower_emul_nom_summary_denom", "Emul CLCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); - clctShowerEmulNomSummary_num_ = - iBooker.book2D("clct_cscshower_emul_nom_summary_num", "Emul CLCT Nominal Only Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + lctShowerEmulNomSummary_num_ = iBooker.book2D( + "lct_cscshower_emul_nom_summary_num", "Emul LCT Nominal Only Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + alctShowerEmulNomSummary_denom_ = iBooker.book2D( + "alct_cscshower_emul_nom_summary_denom", "Emul ALCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); + alctShowerEmulNomSummary_num_ = iBooker.book2D( + "alct_cscshower_emul_nom_summary_num", "Emul ALCT Nominal Only Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + clctShowerEmulNomSummary_denom_ = iBooker.book2D( + "clct_cscshower_emul_nom_summary_denom", "Emul CLCT Nominal Only Shower All", 36, 1, 37, 18, 0, 18); + clctShowerEmulNomSummary_num_ = iBooker.book2D( + "clct_cscshower_emul_nom_summary_num", "Emul CLCT Nominal Only Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); lctShowerDataTightSummary_denom_ = iBooker.book2D("lct_cscshower_data_tight_summary_denom", "Data LCT Tight Shower All", 36, 1, 37, 18, 0, 18); - lctShowerDataTightSummary_num_ = - iBooker.book2D("lct_cscshower_data_tight_summary_num", "Data LCT Tight Shower Emul Matched", 36, 1, 37, 18, 0, 18); + lctShowerDataTightSummary_num_ = iBooker.book2D( + "lct_cscshower_data_tight_summary_num", "Data LCT Tight Shower Emul Matched", 36, 1, 37, 18, 0, 18); alctShowerDataTightSummary_denom_ = iBooker.book2D("alct_cscshower_data_tight_summary_denom", "Data ALCT Tight Shower All", 36, 1, 37, 18, 0, 18); - alctShowerDataTightSummary_num_ = - iBooker.book2D("alct_cscshower_data_tight_summary_num", "Data ALCT Tight Shower Emul Matched", 36, 1, 37, 18, 0, 18); + alctShowerDataTightSummary_num_ = iBooker.book2D( + "alct_cscshower_data_tight_summary_num", "Data ALCT Tight Shower Emul Matched", 36, 1, 37, 18, 0, 18); clctShowerDataTightSummary_denom_ = iBooker.book2D("clct_cscshower_data_tight_summary_denom", "Data CLCT Tight Shower All", 36, 1, 37, 18, 0, 18); - clctShowerDataTightSummary_num_ = - iBooker.book2D("clct_cscshower_data_tight_summary_num", "Data CLCT Tight Shower Emul Matched", 36, 1, 37, 18, 0, 18); + clctShowerDataTightSummary_num_ = iBooker.book2D( + "clct_cscshower_data_tight_summary_num", "Data CLCT Tight Shower Emul Matched", 36, 1, 37, 18, 0, 18); lctShowerEmulTightSummary_denom_ = iBooker.book2D("lct_cscshower_emul_tight_summary_denom", "Emul LCT Tight Shower All", 36, 1, 37, 18, 0, 18); - lctShowerEmulTightSummary_num_ = - iBooker.book2D("lct_cscshower_emul_tight_summary_num", "Emul LCT Tight Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + lctShowerEmulTightSummary_num_ = iBooker.book2D( + "lct_cscshower_emul_tight_summary_num", "Emul LCT Tight Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); alctShowerEmulTightSummary_denom_ = iBooker.book2D("alct_cscshower_emul_tight_summary_denom", "Emul ALCT Tight Shower All", 36, 1, 37, 18, 0, 18); - alctShowerEmulTightSummary_num_ = - iBooker.book2D("alct_cscshower_emul_tight_summary_num", "Emul ALCT Tight Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + alctShowerEmulTightSummary_num_ = iBooker.book2D( + "alct_cscshower_emul_tight_summary_num", "Emul ALCT Tight Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); clctShowerEmulTightSummary_denom_ = iBooker.book2D("clct_cscshower_emul_tight_summary_denom", "Emul CLCT Tight Shower All", 36, 1, 37, 18, 0, 18); - clctShowerEmulTightSummary_num_ = - iBooker.book2D("clct_cscshower_emul_tight_summary_num", "Emul CLCT Tight Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); + clctShowerEmulTightSummary_num_ = iBooker.book2D( + "clct_cscshower_emul_tight_summary_num", "Emul CLCT Tight Shower Not Matched to Data", 36, 1, 37, 18, 0, 18); // x labels lctShowerDataNomSummary_denom_->setAxisTitle("Chamber", 1); @@ -264,8 +264,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { alctShowerDataTightSummary_denom_->Fill(chamber * 2, sr, 0.5); } else alctShowerDataTightSummary_denom_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { alctShowerDataNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); alctShowerDataNomSummary_denom_->Fill(chamber * 2, sr, 0.5); @@ -281,8 +280,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { alctShowerDataTightSummary_num_->Fill(chamber * 2, sr, 0.5); } else alctShowerDataTightSummary_num_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { alctShowerDataNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); alctShowerDataNomSummary_num_->Fill(chamber * 2, sr, 0.5); @@ -292,7 +290,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { } } } - } // End of for (auto dalct = range_dataALCT.first; dalct != range_dataALCT.second; dalct++) + } // End of for (auto dalct = range_dataALCT.first; dalct != range_dataALCT.second; dalct++) for (auto ealct = range_emulALCT.first; ealct != range_emulALCT.second; ealct++) { bool isMatched = false; @@ -303,8 +301,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { alctShowerEmulTightSummary_denom_->Fill(chamber * 2, sr, 0.5); } else alctShowerEmulTightSummary_denom_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { alctShowerEmulNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); alctShowerEmulNomSummary_denom_->Fill(chamber * 2, sr, 0.5); @@ -325,8 +322,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { alctShowerEmulTightSummary_num_->Fill(chamber * 2, sr, 0.5); } else alctShowerEmulTightSummary_num_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { alctShowerEmulNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); alctShowerEmulNomSummary_num_->Fill(chamber * 2, sr, 0.5); @@ -335,7 +331,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { } } } - } // End of for (auto ealct = range_emulALCT.first; ealct != range_emulALCT.second; ealct++) + } // End of for (auto ealct = range_emulALCT.first; ealct != range_emulALCT.second; ealct++) // CLCT analysis auto range_dataCLCT = dataCLCTshs->get(detid); @@ -349,8 +345,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { clctShowerDataTightSummary_denom_->Fill(chamber * 2, sr, 0.5); } else clctShowerDataTightSummary_denom_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { clctShowerDataNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); clctShowerDataNomSummary_denom_->Fill(chamber * 2, sr, 0.5); @@ -360,14 +355,13 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { // check for least one matching CLCT for (auto eclct = range_emulCLCT.first; eclct != range_emulCLCT.second; eclct++) { if (eclct->isValid() and areSameShowers(*dclct, *eclct)) { - if (dclct->isTightInTime()) { + if (dclct->isTightInTime()) { if (chamber20) { clctShowerDataTightSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); clctShowerDataTightSummary_num_->Fill(chamber * 2, sr, 0.5); } else clctShowerDataTightSummary_num_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { clctShowerDataNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); clctShowerDataNomSummary_num_->Fill(chamber * 2, sr, 0.5); @@ -377,7 +371,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { } } } - } // End of for (auto dclct = range_dataCLCT.first; dclct != range_dataCLCT.second; dclct++) + } // End of for (auto dclct = range_dataCLCT.first; dclct != range_dataCLCT.second; dclct++) for (auto eclct = range_emulCLCT.first; eclct != range_emulCLCT.second; eclct++) { bool isMatched = false; @@ -388,8 +382,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { clctShowerEmulTightSummary_denom_->Fill(chamber * 2, sr, 0.5); } else clctShowerEmulTightSummary_denom_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { clctShowerEmulNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); clctShowerEmulNomSummary_denom_->Fill(chamber * 2, sr, 0.5); @@ -410,8 +403,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { clctShowerEmulTightSummary_num_->Fill(chamber * 2, sr, 0.5); } else clctShowerEmulTightSummary_num_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { clctShowerEmulNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); clctShowerEmulNomSummary_num_->Fill(chamber * 2, sr, 0.5); @@ -420,7 +412,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { } } } - } // End of for (auto eclct = range_emulCLCT.first; eclct != range_emulCLCT.second; eclct++) + } // End of for (auto eclct = range_emulCLCT.first; eclct != range_emulCLCT.second; eclct++) // LCT analysis auto range_dataLCT = dataLCTshs->get(detid); @@ -434,8 +426,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { lctShowerDataTightSummary_denom_->Fill(chamber * 2, sr, 0.5); } else lctShowerDataTightSummary_denom_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { lctShowerDataNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); lctShowerDataNomSummary_denom_->Fill(chamber * 2, sr, 0.5); @@ -451,8 +442,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { lctShowerDataTightSummary_num_->Fill(chamber * 2, sr, 0.5); } else lctShowerDataTightSummary_num_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { lctShowerDataNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); lctShowerDataNomSummary_num_->Fill(chamber * 2, sr, 0.5); @@ -462,7 +452,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { } } } - } // End of for (auto dlct = range_dataLCT.first; dlct != range_dataLCT.second; dlct++) + } // End of for (auto dlct = range_dataLCT.first; dlct != range_dataLCT.second; dlct++) for (auto elct = range_emulLCT.first; elct != range_emulLCT.second; elct++) { bool isMatched = false; @@ -473,8 +463,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { lctShowerEmulTightSummary_denom_->Fill(chamber * 2, sr, 0.5); } else lctShowerEmulTightSummary_denom_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { lctShowerEmulNomSummary_denom_->Fill(chamber * 2 - 1, sr, 0.5); lctShowerEmulNomSummary_denom_->Fill(chamber * 2, sr, 0.5); @@ -495,8 +484,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { lctShowerEmulTightSummary_num_->Fill(chamber * 2, sr, 0.5); } else lctShowerEmulTightSummary_num_->Fill(chamber, sr); - } - else { + } else { if (chamber20) { lctShowerEmulNomSummary_num_->Fill(chamber * 2 - 1, sr, 0.5); lctShowerEmulNomSummary_num_->Fill(chamber * 2, sr, 0.5); @@ -505,7 +493,7 @@ void L1TdeCSCTPGShower::analyze(const edm::Event& e, const edm::EventSetup& c) { } } } - } // End of for (auto elct = range_emulLCT.first; elct != range_emulLCT.second; elct++) { + } // End of for (auto elct = range_emulLCT.first; elct != range_emulLCT.second; elct++) { } } } diff --git a/DQM/L1TMonitor/src/L1TdeStage2Shower.cc b/DQM/L1TMonitor/src/L1TdeStage2Shower.cc index 682ca562b82ab..0eb7cd7009be6 100644 --- a/DQM/L1TMonitor/src/L1TdeStage2Shower.cc +++ b/DQM/L1TMonitor/src/L1TdeStage2Shower.cc @@ -65,17 +65,21 @@ void L1TdeStage2Shower::analyze(const edm::Event& e, const edm::EventSetup& c) { for (auto dSh = dataShowers->begin(); dSh != dataShowers->end(); ++dSh) { if (dSh->isValid() and dSh->isOneNominalInTime()) { - if (dSh->isOneTightInTime()) - emtfShowerDataSummary_denom_->Fill(dSh->processor() + 1, (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); - else - emtfShowerDataSummary_denom_->Fill(dSh->processor() + 1, (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); + if (dSh->isOneTightInTime()) + emtfShowerDataSummary_denom_->Fill(dSh->processor() + 1, + (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); + else + emtfShowerDataSummary_denom_->Fill(dSh->processor() + 1, + (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); for (auto eSh = emulShowers->begin(); eSh != emulShowers->end(); ++eSh) { if (eSh->isValid() and eSh->isOneNominalInTime() and dSh->processor() == eSh->processor() and dSh->trackFinderType() == eSh->trackFinderType() and *dSh == *eSh) { if (dSh->isOneTightInTime()) - emtfShowerDataSummary_num_->Fill(dSh->processor() + 1, (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); + emtfShowerDataSummary_num_->Fill(dSh->processor() + 1, + (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); else - emtfShowerDataSummary_num_->Fill(dSh->processor() + 1, (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); + emtfShowerDataSummary_num_->Fill(dSh->processor() + 1, + (dSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); } } } @@ -85,9 +89,11 @@ void L1TdeStage2Shower::analyze(const edm::Event& e, const edm::EventSetup& c) { bool isMatched = false; if (eSh->isValid() and eSh->isOneNominalInTime()) { if (eSh->isOneTightInTime()) - emtfShowerEmulSummary_denom_->Fill(eSh->processor() + 1, (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); + emtfShowerEmulSummary_denom_->Fill(eSh->processor() + 1, + (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); else - emtfShowerEmulSummary_denom_->Fill(eSh->processor() + 1, (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); + emtfShowerEmulSummary_denom_->Fill(eSh->processor() + 1, + (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); for (auto dSh = dataShowers->begin(); dSh != dataShowers->end(); ++dSh) { if (dSh->isValid() and dSh->isOneNominalInTime() and eSh->processor() == dSh->processor() and eSh->trackFinderType() == dSh->trackFinderType() and *dSh == *eSh) @@ -95,9 +101,11 @@ void L1TdeStage2Shower::analyze(const edm::Event& e, const edm::EventSetup& c) { } if (not isMatched) { if (eSh->isOneTightInTime()) - emtfShowerEmulSummary_num_->Fill(eSh->processor() + 1, (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); + emtfShowerEmulSummary_num_->Fill(eSh->processor() + 1, + (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 3.5 : 0.5); else - emtfShowerEmulSummary_num_->Fill(eSh->processor() + 1, (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); + emtfShowerEmulSummary_num_->Fill(eSh->processor() + 1, + (eSh->trackFinderType() == l1t::tftype::emtf_pos) ? 2.5 : 1.5); } } } diff --git a/DQM/L1TMonitorClient/src/L1TdeCSCTPGShowerClient.cc b/DQM/L1TMonitorClient/src/L1TdeCSCTPGShowerClient.cc index 92f082a1f4f34..50342437763ee 100644 --- a/DQM/L1TMonitorClient/src/L1TdeCSCTPGShowerClient.cc +++ b/DQM/L1TMonitorClient/src/L1TdeCSCTPGShowerClient.cc @@ -32,45 +32,105 @@ void L1TdeCSCTPGShowerClient::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IG void L1TdeCSCTPGShowerClient::book(DQMStore::IBooker &iBooker) { iBooker.setCurrentFolder(monitorDir_); - lctShowerDataNomSummary_eff_ = iBooker.book2D( - "lct_cscshower_data_nom_summary_eff", "Efficiency of data LCT Nominal shower being correctly emulated", - 36, 1, 37, 18, 0, 18); - alctShowerDataNomSummary_eff_ = iBooker.book2D( - "alct_cscshower_data_nom_summary_eff", "Efficiency of data ALCT Nominal shower being correctly emulated", - 36, 1, 37, 18, 0, 18); - clctShowerDataNomSummary_eff_ = iBooker.book2D( - "clct_cscshower_data_nom_summary_eff", "Efficiency of data CLCT Nominal shower being correctly emulated", - 36, 1, 37, 18, 0, 18); - - lctShowerEmulNomSummary_eff_ = iBooker.book2D( - "lct_cscshower_emul_nom_summary_eff", "Fraction of emulated LCT Nominal shower without matching data LCT", - 36, 1, 37, 18, 0, 18); - alctShowerEmulNomSummary_eff_ = iBooker.book2D( - "alct_cscshower_emul_nom_summary_eff", "Fraction of emulated ALCT Nominal shower without matching data ALCT", - 36, 1, 37, 18, 0, 18); - clctShowerEmulNomSummary_eff_ = iBooker.book2D( - "clct_cscshower_emul_nom_summary_eff", "Fraction of emulated CLCT Nominal shower without matching data CLCT", - 36, 1, 37, 18, 0, 18); - - lctShowerDataTightSummary_eff_ = iBooker.book2D( - "lct_cscshower_data_tight_summary_eff", "Efficiency of data LCT Tight shower being correctly emulated", - 36, 1, 37, 18, 0, 18); - alctShowerDataTightSummary_eff_ = iBooker.book2D( - "alct_cscshower_data_tight_summary_eff", "Efficiency of data ALCT Tight shower being correctly emulated", - 36, 1, 37, 18, 0, 18); - clctShowerDataTightSummary_eff_ = iBooker.book2D( - "clct_cscshower_data_tight_summary_eff", "Efficiency of data CLCT Tight shower being correctly emulated", - 36, 1, 37, 18, 0, 18); - - lctShowerEmulTightSummary_eff_ = iBooker.book2D( - "lct_cscshower_emul_tight_summary_eff", "Fraction of emulated LCT Tight shower without matching data LCT", - 36, 1, 37, 18, 0, 18); - alctShowerEmulTightSummary_eff_ = iBooker.book2D( - "alct_cscshower_emul_tight_summary_eff", "Fraction of emulated ALCT Tight shower without matching data ALCT", - 36, 1, 37, 18, 0, 18); - clctShowerEmulTightSummary_eff_ = iBooker.book2D( - "clct_cscshower_emul_tight_summary_eff", "Fraction of emulated CLCT Tight shower without matching data CLCT", - 36, 1, 37, 18, 0, 18); + lctShowerDataNomSummary_eff_ = iBooker.book2D("lct_cscshower_data_nom_summary_eff", + "Efficiency of data LCT Nominal shower being correctly emulated", + 36, + 1, + 37, + 18, + 0, + 18); + alctShowerDataNomSummary_eff_ = iBooker.book2D("alct_cscshower_data_nom_summary_eff", + "Efficiency of data ALCT Nominal shower being correctly emulated", + 36, + 1, + 37, + 18, + 0, + 18); + clctShowerDataNomSummary_eff_ = iBooker.book2D("clct_cscshower_data_nom_summary_eff", + "Efficiency of data CLCT Nominal shower being correctly emulated", + 36, + 1, + 37, + 18, + 0, + 18); + + lctShowerEmulNomSummary_eff_ = iBooker.book2D("lct_cscshower_emul_nom_summary_eff", + "Fraction of emulated LCT Nominal shower without matching data LCT", + 36, + 1, + 37, + 18, + 0, + 18); + alctShowerEmulNomSummary_eff_ = iBooker.book2D("alct_cscshower_emul_nom_summary_eff", + "Fraction of emulated ALCT Nominal shower without matching data ALCT", + 36, + 1, + 37, + 18, + 0, + 18); + clctShowerEmulNomSummary_eff_ = iBooker.book2D("clct_cscshower_emul_nom_summary_eff", + "Fraction of emulated CLCT Nominal shower without matching data CLCT", + 36, + 1, + 37, + 18, + 0, + 18); + + lctShowerDataTightSummary_eff_ = iBooker.book2D("lct_cscshower_data_tight_summary_eff", + "Efficiency of data LCT Tight shower being correctly emulated", + 36, + 1, + 37, + 18, + 0, + 18); + alctShowerDataTightSummary_eff_ = iBooker.book2D("alct_cscshower_data_tight_summary_eff", + "Efficiency of data ALCT Tight shower being correctly emulated", + 36, + 1, + 37, + 18, + 0, + 18); + clctShowerDataTightSummary_eff_ = iBooker.book2D("clct_cscshower_data_tight_summary_eff", + "Efficiency of data CLCT Tight shower being correctly emulated", + 36, + 1, + 37, + 18, + 0, + 18); + + lctShowerEmulTightSummary_eff_ = iBooker.book2D("lct_cscshower_emul_tight_summary_eff", + "Fraction of emulated LCT Tight shower without matching data LCT", + 36, + 1, + 37, + 18, + 0, + 18); + alctShowerEmulTightSummary_eff_ = iBooker.book2D("alct_cscshower_emul_tight_summary_eff", + "Fraction of emulated ALCT Tight shower without matching data ALCT", + 36, + 1, + 37, + 18, + 0, + 18); + clctShowerEmulTightSummary_eff_ = iBooker.book2D("clct_cscshower_emul_tight_summary_eff", + "Fraction of emulated CLCT Tight shower without matching data CLCT", + 36, + 1, + 37, + 18, + 0, + 18); // x labels lctShowerDataNomSummary_eff_->setAxisTitle("Chamber", 1); @@ -160,18 +220,24 @@ void L1TdeCSCTPGShowerClient::processHistograms(DQMStore::IGetter &igetter) { MonitorElement *clctShowerEmulNomSummary_denom_ = igetter.get(monitorDir_ + "/clct_cscshower_emul_nom_summary_denom"); MonitorElement *clctShowerEmulNomSummary_num_ = igetter.get(monitorDir_ + "/clct_cscshower_emul_nom_summary_num"); - MonitorElement *lctShowerDataTightSummary_denom_ = igetter.get(monitorDir_ + "/lct_cscshower_data_tight_summary_denom"); + MonitorElement *lctShowerDataTightSummary_denom_ = + igetter.get(monitorDir_ + "/lct_cscshower_data_tight_summary_denom"); MonitorElement *lctShowerDataTightSummary_num_ = igetter.get(monitorDir_ + "/lct_cscshower_data_tight_summary_num"); - MonitorElement *alctShowerDataTightSummary_denom_ = igetter.get(monitorDir_ + "/alct_cscshower_data_tight_summary_denom"); + MonitorElement *alctShowerDataTightSummary_denom_ = + igetter.get(monitorDir_ + "/alct_cscshower_data_tight_summary_denom"); MonitorElement *alctShowerDataTightSummary_num_ = igetter.get(monitorDir_ + "/alct_cscshower_data_tight_summary_num"); - MonitorElement *clctShowerDataTightSummary_denom_ = igetter.get(monitorDir_ + "/clct_cscshower_data_tight_summary_denom"); + MonitorElement *clctShowerDataTightSummary_denom_ = + igetter.get(monitorDir_ + "/clct_cscshower_data_tight_summary_denom"); MonitorElement *clctShowerDataTightSummary_num_ = igetter.get(monitorDir_ + "/clct_cscshower_data_tight_summary_num"); - MonitorElement *lctShowerEmulTightSummary_denom_ = igetter.get(monitorDir_ + "/lct_cscshower_emul_tight_summary_denom"); + MonitorElement *lctShowerEmulTightSummary_denom_ = + igetter.get(monitorDir_ + "/lct_cscshower_emul_tight_summary_denom"); MonitorElement *lctShowerEmulTightSummary_num_ = igetter.get(monitorDir_ + "/lct_cscshower_emul_tight_summary_num"); - MonitorElement *alctShowerEmulTightSummary_denom_ = igetter.get(monitorDir_ + "/alct_cscshower_emul_tight_summary_denom"); + MonitorElement *alctShowerEmulTightSummary_denom_ = + igetter.get(monitorDir_ + "/alct_cscshower_emul_tight_summary_denom"); MonitorElement *alctShowerEmulTightSummary_num_ = igetter.get(monitorDir_ + "/alct_cscshower_emul_tight_summary_num"); - MonitorElement *clctShowerEmulTightSummary_denom_ = igetter.get(monitorDir_ + "/clct_cscshower_emul_tight_summary_denom"); + MonitorElement *clctShowerEmulTightSummary_denom_ = + igetter.get(monitorDir_ + "/clct_cscshower_emul_tight_summary_denom"); MonitorElement *clctShowerEmulTightSummary_num_ = igetter.get(monitorDir_ + "/clct_cscshower_emul_tight_summary_num"); lctShowerDataNomSummary_eff_->getTH2F()->Divide( From 4c715b00058e24d8c581d23f19384beabcef4f5c Mon Sep 17 00:00:00 2001 From: Xunwu Zuo Date: Sat, 15 Jan 2022 16:48:41 +0100 Subject: [PATCH 4/5] rename EMTF shower modules --- ...L1TStage2Shower.h => L1TStage2RegionalShower.h} | 10 +++++----- ...eStage2Shower.h => L1TdeStage2RegionalShower.h} | 10 +++++----- DQM/L1TMonitor/plugins/SealModule.cc | 8 ++++---- ...hower_cfi.py => L1TStage2RegionalShower_cfi.py} | 4 ++-- DQM/L1TMonitor/python/L1TStage2_cff.py | 4 ++-- DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py | 4 ++-- ...wer_cfi.py => L1TdeStage2RegionalShower_cfi.py} | 4 ++-- ...TStage2Shower.cc => L1TStage2RegionalShower.cc} | 10 +++++----- ...tage2Shower.cc => L1TdeStage2RegionalShower.cc} | 10 +++++----- ...rClient.h => L1TdeStage2RegionalShowerClient.h} | 10 +++++----- .../python/L1TStage2EMTFEmulatorClient_cff.py | 4 ++-- ...i.py => L1TdeStage2RegionalShowerClient_cfi.py} | 4 ++-- ...lient.cc => L1TdeStage2ShowerRegionalClient.cc} | 14 +++++++------- DQM/L1TMonitorClient/src/SealModule.cc | 4 ++-- 14 files changed, 50 insertions(+), 50 deletions(-) rename DQM/L1TMonitor/interface/{L1TStage2Shower.h => L1TStage2RegionalShower.h} (83%) rename DQM/L1TMonitor/interface/{L1TdeStage2Shower.h => L1TdeStage2RegionalShower.h} (77%) rename DQM/L1TMonitor/python/{L1TStage2Shower_cfi.py => L1TStage2RegionalShower_cfi.py} (88%) rename DQM/L1TMonitor/python/{L1TdeStage2Shower_cfi.py => L1TdeStage2RegionalShower_cfi.py} (88%) rename DQM/L1TMonitor/src/{L1TStage2Shower.cc => L1TStage2RegionalShower.cc} (95%) rename DQM/L1TMonitor/src/{L1TdeStage2Shower.cc => L1TdeStage2RegionalShower.cc} (92%) rename DQM/L1TMonitorClient/interface/{L1TdeStage2ShowerClient.h => L1TdeStage2RegionalShowerClient.h} (75%) rename DQM/L1TMonitorClient/python/{L1TdeStage2ShowerClient_cfi.py => L1TdeStage2RegionalShowerClient_cfi.py} (66%) rename DQM/L1TMonitorClient/src/{L1TdeStage2ShowerClient.cc => L1TdeStage2ShowerRegionalClient.cc} (82%) diff --git a/DQM/L1TMonitor/interface/L1TStage2Shower.h b/DQM/L1TMonitor/interface/L1TStage2RegionalShower.h similarity index 83% rename from DQM/L1TMonitor/interface/L1TStage2Shower.h rename to DQM/L1TMonitor/interface/L1TStage2RegionalShower.h index 883027162ab1a..1c21cad9773de 100644 --- a/DQM/L1TMonitor/interface/L1TStage2Shower.h +++ b/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; diff --git a/DQM/L1TMonitor/interface/L1TdeStage2Shower.h b/DQM/L1TMonitor/interface/L1TdeStage2RegionalShower.h similarity index 77% rename from DQM/L1TMonitor/interface/L1TdeStage2Shower.h rename to DQM/L1TMonitor/interface/L1TdeStage2RegionalShower.h index e10b5c03d7b97..c7200a8bca673 100644 --- a/DQM/L1TMonitor/interface/L1TdeStage2Shower.h +++ b/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; diff --git a/DQM/L1TMonitor/plugins/SealModule.cc b/DQM/L1TMonitor/plugins/SealModule.cc index ebeced76116fe..c48245171a5b7 100644 --- a/DQM/L1TMonitor/plugins/SealModule.cc +++ b/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); diff --git a/DQM/L1TMonitor/python/L1TStage2Shower_cfi.py b/DQM/L1TMonitor/python/L1TStage2RegionalShower_cfi.py similarity index 88% rename from DQM/L1TMonitor/python/L1TStage2Shower_cfi.py rename to DQM/L1TMonitor/python/L1TStage2RegionalShower_cfi.py index 8f50ff8745a7d..6a29bf30ee6dc 100644 --- a/DQM/L1TMonitor/python/L1TStage2Shower_cfi.py +++ b/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 diff --git a/DQM/L1TMonitor/python/L1TStage2_cff.py b/DQM/L1TMonitor/python/L1TStage2_cff.py index cc17e8faf171b..060cbb0e7e91e 100644 --- a/DQM/L1TMonitor/python/L1TStage2_cff.py +++ b/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 diff --git a/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py b/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py index b5c71022167b2..12f37b25be2cb 100644 --- a/DQM/L1TMonitor/python/L1TdeStage2EMTF_cff.py +++ b/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] @@ -30,4 +30,4 @@ from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM _run3shower_l1tdeStage2EmtfOnlineDQMSeq = l1tdeStage2EmtfOnlineDQMSeq.copy() -run3_GEM.toReplaceWith(l1tdeStage2EmtfOnlineDQMSeq, cms.Sequence(_run3shower_l1tdeStage2EmtfOnlineDQMSeq + l1tdeStage2Shower)) +run3_GEM.toReplaceWith(l1tdeStage2EmtfOnlineDQMSeq, cms.Sequence(_run3shower_l1tdeStage2EmtfOnlineDQMSeq + l1tdeStage2RegionalShower)) diff --git a/DQM/L1TMonitor/python/L1TdeStage2Shower_cfi.py b/DQM/L1TMonitor/python/L1TdeStage2RegionalShower_cfi.py similarity index 88% rename from DQM/L1TMonitor/python/L1TdeStage2Shower_cfi.py rename to DQM/L1TMonitor/python/L1TdeStage2RegionalShower_cfi.py index 308e724837848..e8e1e25fe6bf1 100644 --- a/DQM/L1TMonitor/python/L1TdeStage2Shower_cfi.py +++ b/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") diff --git a/DQM/L1TMonitor/src/L1TStage2Shower.cc b/DQM/L1TMonitor/src/L1TStage2RegionalShower.cc similarity index 95% rename from DQM/L1TMonitor/src/L1TStage2Shower.cc rename to DQM/L1TMonitor/src/L1TStage2RegionalShower.cc index 59d164debe80e..7a1b3dc487f7c 100644 --- a/DQM/L1TMonitor/src/L1TStage2Shower.cc +++ b/DQM/L1TMonitor/src/L1TStage2RegionalShower.cc @@ -3,17 +3,17 @@ #include #include -#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(ps.getParameter("emtfSource"))), CSCShowerToken(consumes(ps.getParameter("cscSource"))), monitorDir(ps.getUntrackedParameter("monitorDir", "")), verbose(ps.getUntrackedParameter("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 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); diff --git a/DQM/L1TMonitor/src/L1TdeStage2Shower.cc b/DQM/L1TMonitor/src/L1TdeStage2RegionalShower.cc similarity index 92% rename from DQM/L1TMonitor/src/L1TdeStage2Shower.cc rename to DQM/L1TMonitor/src/L1TdeStage2RegionalShower.cc index 0eb7cd7009be6..cbef1c09303a0 100644 --- a/DQM/L1TMonitor/src/L1TdeStage2Shower.cc +++ b/DQM/L1TMonitor/src/L1TdeStage2RegionalShower.cc @@ -1,17 +1,17 @@ #include -#include "DQM/L1TMonitor/interface/L1TdeStage2Shower.h" +#include "DQM/L1TMonitor/interface/L1TdeStage2RegionalShower.h" -L1TdeStage2Shower::L1TdeStage2Shower(const edm::ParameterSet& ps) +L1TdeStage2RegionalShower::L1TdeStage2RegionalShower(const edm::ParameterSet& ps) : data_EMTFShower_token_( consumes(ps.getParameter("dataSource"))), emul_EMTFShower_token_( consumes(ps.getParameter("emulSource"))), monitorDir_(ps.getUntrackedParameter("monitorDir")) {} -L1TdeStage2Shower::~L1TdeStage2Shower() {} +L1TdeStage2RegionalShower::~L1TdeStage2RegionalShower() {} -void L1TdeStage2Shower::bookHistograms(DQMStore::IBooker& iBooker, const edm::Run&, const edm::EventSetup&) { +void L1TdeStage2RegionalShower::bookHistograms(DQMStore::IBooker& iBooker, const edm::Run&, const edm::EventSetup&) { iBooker.setCurrentFolder(monitorDir_); // 2D summary plots @@ -56,7 +56,7 @@ void L1TdeStage2Shower::bookHistograms(DQMStore::IBooker& iBooker, const edm::Ru emtfShowerEmulSummary_num_->setBinLabel(4, "ME+ Tight", 2); } -void L1TdeStage2Shower::analyze(const edm::Event& e, const edm::EventSetup& c) { +void L1TdeStage2RegionalShower::analyze(const edm::Event& e, const edm::EventSetup& c) { edm::Handle dataShowers; edm::Handle emulShowers; diff --git a/DQM/L1TMonitorClient/interface/L1TdeStage2ShowerClient.h b/DQM/L1TMonitorClient/interface/L1TdeStage2RegionalShowerClient.h similarity index 75% rename from DQM/L1TMonitorClient/interface/L1TdeStage2ShowerClient.h rename to DQM/L1TMonitorClient/interface/L1TdeStage2RegionalShowerClient.h index cd3a6f441b6c2..eb8b436ff19a0 100644 --- a/DQM/L1TMonitorClient/interface/L1TdeStage2ShowerClient.h +++ b/DQM/L1TMonitorClient/interface/L1TdeStage2RegionalShowerClient.h @@ -1,5 +1,5 @@ -#ifndef DQM_L1TMONITORCLIENT_L1TdeStage2ShowerCLIENT_H -#define DQM_L1TMONITORCLIENT_L1TdeStage2ShowerCLIENT_H +#ifndef DQM_L1TMONITORCLIENT_L1TdeStage2RegionalShowerCLIENT_H +#define DQM_L1TMONITORCLIENT_L1TdeStage2RegionalShowerCLIENT_H #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/Event.h" @@ -10,13 +10,13 @@ #include -class L1TdeStage2ShowerClient : public DQMEDHarvester { +class L1TdeStage2RegionalShowerClient : public DQMEDHarvester { public: /// Constructor - L1TdeStage2ShowerClient(const edm::ParameterSet &ps); + L1TdeStage2RegionalShowerClient(const edm::ParameterSet &ps); /// Destructor - ~L1TdeStage2ShowerClient() override; + ~L1TdeStage2RegionalShowerClient() override; protected: void dqmEndLuminosityBlock(DQMStore::IBooker &, diff --git a/DQM/L1TMonitorClient/python/L1TStage2EMTFEmulatorClient_cff.py b/DQM/L1TMonitorClient/python/L1TStage2EMTFEmulatorClient_cff.py index b5bae3a7b63fd..2e2929c2ff9a3 100644 --- a/DQM/L1TMonitorClient/python/L1TStage2EMTFEmulatorClient_cff.py +++ b/DQM/L1TMonitorClient/python/L1TStage2EMTFEmulatorClient_cff.py @@ -14,7 +14,7 @@ ignoreBin = cms.untracked.vint32(ignoreBinsDeStage2Emtf) ) -from DQM.L1TMonitorClient.L1TdeStage2ShowerClient_cfi import * +from DQM.L1TMonitorClient.L1TdeStage2RegionalShowerClient_cfi import * # sequences l1tStage2EMTFEmulatorClient = cms.Sequence( @@ -23,4 +23,4 @@ from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM _run3shower_l1tStage2EMTFEmulatorClient = l1tStage2EMTFEmulatorClient.copy() -run3_GEM.toReplaceWith(l1tStage2EMTFEmulatorClient, cms.Sequence(_run3shower_l1tStage2EMTFEmulatorClient + l1tdeStage2ShowerClient)) +run3_GEM.toReplaceWith(l1tStage2EMTFEmulatorClient, cms.Sequence(_run3shower_l1tStage2EMTFEmulatorClient + l1tdeStage2RegionalShowerClient)) diff --git a/DQM/L1TMonitorClient/python/L1TdeStage2ShowerClient_cfi.py b/DQM/L1TMonitorClient/python/L1TdeStage2RegionalShowerClient_cfi.py similarity index 66% rename from DQM/L1TMonitorClient/python/L1TdeStage2ShowerClient_cfi.py rename to DQM/L1TMonitorClient/python/L1TdeStage2RegionalShowerClient_cfi.py index 057791273429e..e5d76eb7fab2b 100644 --- a/DQM/L1TMonitorClient/python/L1TdeStage2ShowerClient_cfi.py +++ b/DQM/L1TMonitorClient/python/L1TdeStage2RegionalShowerClient_cfi.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms from DQMServices.Core.DQMEDHarvester import DQMEDHarvester -l1tdeStage2ShowerClient = DQMEDHarvester( - "L1TdeStage2ShowerClient", +l1tdeStage2RegionalShowerClient = DQMEDHarvester( + "L1TdeStage2RegionalShowerClient", monitorDir = cms.untracked.string("L1TEMU/L1TdeStage2EMTF/Shower"), ) diff --git a/DQM/L1TMonitorClient/src/L1TdeStage2ShowerClient.cc b/DQM/L1TMonitorClient/src/L1TdeStage2ShowerRegionalClient.cc similarity index 82% rename from DQM/L1TMonitorClient/src/L1TdeStage2ShowerClient.cc rename to DQM/L1TMonitorClient/src/L1TdeStage2ShowerRegionalClient.cc index 4e9a5a2a912d5..0d48a01085257 100644 --- a/DQM/L1TMonitorClient/src/L1TdeStage2ShowerClient.cc +++ b/DQM/L1TMonitorClient/src/L1TdeStage2ShowerRegionalClient.cc @@ -1,4 +1,4 @@ -#include "DQM/L1TMonitorClient/interface/L1TdeStage2ShowerClient.h" +#include "DQM/L1TMonitorClient/interface/L1TdeStage2RegionalShowerClient.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -10,12 +10,12 @@ using namespace edm; using namespace std; -L1TdeStage2ShowerClient::L1TdeStage2ShowerClient(const edm::ParameterSet &ps) +L1TdeStage2RegionalShowerClient::L1TdeStage2RegionalShowerClient(const edm::ParameterSet &ps) : monitorDir_(ps.getUntrackedParameter("monitorDir")) {} -L1TdeStage2ShowerClient::~L1TdeStage2ShowerClient() {} +L1TdeStage2RegionalShowerClient::~L1TdeStage2RegionalShowerClient() {} -void L1TdeStage2ShowerClient::dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, +void L1TdeStage2RegionalShowerClient::dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const edm::LuminosityBlock &lumiSeg, const edm::EventSetup &c) { @@ -24,12 +24,12 @@ void L1TdeStage2ShowerClient::dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, } //-------------------------------------------------------- -void L1TdeStage2ShowerClient::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) { +void L1TdeStage2RegionalShowerClient::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) { book(ibooker); processHistograms(igetter); } -void L1TdeStage2ShowerClient::book(DQMStore::IBooker &iBooker) { +void L1TdeStage2RegionalShowerClient::book(DQMStore::IBooker &iBooker) { iBooker.setCurrentFolder(monitorDir_); emtfShowerDataSummary_eff_ = iBooker.book2D( @@ -56,7 +56,7 @@ void L1TdeStage2ShowerClient::book(DQMStore::IBooker &iBooker) { emtfShowerEmulSummary_eff_->setBinLabel(4, "ME+ Tight", 2); } -void L1TdeStage2ShowerClient::processHistograms(DQMStore::IGetter &igetter) { +void L1TdeStage2RegionalShowerClient::processHistograms(DQMStore::IGetter &igetter) { MonitorElement *emtfShowerDataSummary_denom_ = igetter.get(monitorDir_ + "/emtf_shower_data_summary_denom"); MonitorElement *emtfShowerDataSummary_num_ = igetter.get(monitorDir_ + "/emtf_shower_data_summary_num"); diff --git a/DQM/L1TMonitorClient/src/SealModule.cc b/DQM/L1TMonitorClient/src/SealModule.cc index 644596714543d..ca80d493ce0b6 100644 --- a/DQM/L1TMonitorClient/src/SealModule.cc +++ b/DQM/L1TMonitorClient/src/SealModule.cc @@ -18,8 +18,8 @@ DEFINE_FWK_MODULE(L1TdeCSCTPGClient); #include "DQM/L1TMonitorClient/interface/L1TdeCSCTPGShowerClient.h" DEFINE_FWK_MODULE(L1TdeCSCTPGShowerClient); -#include "DQM/L1TMonitorClient/interface/L1TdeStage2ShowerClient.h" -DEFINE_FWK_MODULE(L1TdeStage2ShowerClient); +#include "DQM/L1TMonitorClient/interface/L1TdeStage2RegionalShowerClient.h" +DEFINE_FWK_MODULE(L1TdeStage2RegionalShowerClient); #include "DQM/L1TMonitorClient/interface/L1TCSCTFClient.h" DEFINE_FWK_MODULE(L1TCSCTFClient); From 1536d007dc22ae69ba8a624fd2c629ab6ebf7ab7 Mon Sep 17 00:00:00 2001 From: Xunwu Zuo Date: Sat, 15 Jan 2022 18:26:38 +0100 Subject: [PATCH 5/5] code format --- DQM/L1TMonitorClient/src/L1TdeStage2ShowerRegionalClient.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DQM/L1TMonitorClient/src/L1TdeStage2ShowerRegionalClient.cc b/DQM/L1TMonitorClient/src/L1TdeStage2ShowerRegionalClient.cc index 0d48a01085257..b777293d2d751 100644 --- a/DQM/L1TMonitorClient/src/L1TdeStage2ShowerRegionalClient.cc +++ b/DQM/L1TMonitorClient/src/L1TdeStage2ShowerRegionalClient.cc @@ -16,9 +16,9 @@ L1TdeStage2RegionalShowerClient::L1TdeStage2RegionalShowerClient(const edm::Para L1TdeStage2RegionalShowerClient::~L1TdeStage2RegionalShowerClient() {} void L1TdeStage2RegionalShowerClient::dqmEndLuminosityBlock(DQMStore::IBooker &ibooker, - DQMStore::IGetter &igetter, - const edm::LuminosityBlock &lumiSeg, - const edm::EventSetup &c) { + DQMStore::IGetter &igetter, + const edm::LuminosityBlock &lumiSeg, + const edm::EventSetup &c) { book(ibooker); processHistograms(igetter); }