Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modify CaloLayer1 DQM for 5BX needed for Ecal #33510

Merged
merged 2 commits into from
Apr 24, 2021
Merged

Modify CaloLayer1 DQM for 5BX needed for Ecal #33510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fd6d45
Add Ecal monitoring elements for 5BX
hftsoi Apr 23, 2021
d6979c5
fix format
hftsoi Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@ namespace CaloL1Information {

dqm::reco::MonitorElement *last20Mismatches_;

dqm::reco::MonitorElement *ecalOccRecd5Bx_;
dqm::reco::MonitorElement *ecalOccRecd5BxEtWgt_;
dqm::reco::MonitorElement *ecalOccRecdBx1_;
dqm::reco::MonitorElement *ecalOccRecdBx2_;
dqm::reco::MonitorElement *ecalOccRecdBx3_;
dqm::reco::MonitorElement *ecalOccRecdBx4_;
dqm::reco::MonitorElement *ecalOccRecdBx5_;

std::vector<std::tuple<edm::RunID, edm::LuminosityBlockID, edm::EventID, std::vector<int>>> runMismatchList;
};

Expand Down Expand Up @@ -268,6 +276,16 @@ class L1TStage2CaloLayer1
// Input and config info
edm::EDGetTokenT<EcalTrigPrimDigiCollection> ecalTPSourceRecd_;
std::string ecalTPSourceRecdLabel_;
edm::EDGetTokenT<EcalTrigPrimDigiCollection> ecalTPSourceRecdBx1_;
std::string ecalTPSourceRecdBx1Label_;
edm::EDGetTokenT<EcalTrigPrimDigiCollection> ecalTPSourceRecdBx2_;
std::string ecalTPSourceRecdBx2Label_;
edm::EDGetTokenT<EcalTrigPrimDigiCollection> ecalTPSourceRecdBx3_;
std::string ecalTPSourceRecdBx3Label_;
edm::EDGetTokenT<EcalTrigPrimDigiCollection> ecalTPSourceRecdBx4_;
std::string ecalTPSourceRecdBx4Label_;
edm::EDGetTokenT<EcalTrigPrimDigiCollection> ecalTPSourceRecdBx5_;
std::string ecalTPSourceRecdBx5Label_;
edm::EDGetTokenT<HcalTrigPrimDigiCollection> hcalTPSourceRecd_;
std::string hcalTPSourceRecdLabel_;
edm::EDGetTokenT<EcalTrigPrimDigiCollection> ecalTPSourceSent_;
Expand All @@ -277,6 +295,7 @@ class L1TStage2CaloLayer1
edm::EDGetTokenT<FEDRawDataCollection> fedRawData_;
std::string histFolder_;
int tpFillThreshold_;
int tpFillThreshold5Bx_;
bool ignoreHFfbs_;
};

Expand Down
5 changes: 5 additions & 0 deletions DQM/L1TMonitor/python/L1TStage2CaloLayer1_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
l1tStage2CaloLayer1 = DQMEDAnalyzer('L1TStage2CaloLayer1',
ecalTPSourceRecd = cms.InputTag("caloLayer1Digis"),
ecalTPSourceRecdBx1 = cms.InputTag("caloLayer1Digis","EcalDigisBx1"),
ecalTPSourceRecdBx2 = cms.InputTag("caloLayer1Digis","EcalDigisBx2"),
ecalTPSourceRecdBx3 = cms.InputTag("caloLayer1Digis","EcalDigisBx3"),
ecalTPSourceRecdBx4 = cms.InputTag("caloLayer1Digis","EcalDigisBx4"),
ecalTPSourceRecdBx5 = cms.InputTag("caloLayer1Digis","EcalDigisBx5"),
hcalTPSourceRecd = cms.InputTag("caloLayer1Digis"),
ecalTPSourceSent = cms.InputTag("ecalDigis","EcalTriggerPrimitives"),
hcalTPSourceSent = cms.InputTag("hcalDigis"),
Expand Down
76 changes: 76 additions & 0 deletions DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
//Modified by Bhawna Gomber <[email protected]>
//Modified by Andrew Loeliger <[email protected]>
//Modified by Ho-Fung Tsoi <[email protected]>

#include "DQM/L1TMonitor/interface/L1TStage2CaloLayer1.h"

Expand All @@ -21,6 +22,16 @@
L1TStage2CaloLayer1::L1TStage2CaloLayer1(const edm::ParameterSet& ps)
: ecalTPSourceRecd_(consumes<EcalTrigPrimDigiCollection>(ps.getParameter<edm::InputTag>("ecalTPSourceRecd"))),
ecalTPSourceRecdLabel_(ps.getParameter<edm::InputTag>("ecalTPSourceRecd").label()),
ecalTPSourceRecdBx1_(consumes<EcalTrigPrimDigiCollection>(ps.getParameter<edm::InputTag>("ecalTPSourceRecdBx1"))),
ecalTPSourceRecdBx1Label_(ps.getParameter<edm::InputTag>("ecalTPSourceRecdBx1").label()),
ecalTPSourceRecdBx2_(consumes<EcalTrigPrimDigiCollection>(ps.getParameter<edm::InputTag>("ecalTPSourceRecdBx2"))),
ecalTPSourceRecdBx2Label_(ps.getParameter<edm::InputTag>("ecalTPSourceRecdBx2").label()),
ecalTPSourceRecdBx3_(consumes<EcalTrigPrimDigiCollection>(ps.getParameter<edm::InputTag>("ecalTPSourceRecdBx3"))),
ecalTPSourceRecdBx3Label_(ps.getParameter<edm::InputTag>("ecalTPSourceRecdBx3").label()),
ecalTPSourceRecdBx4_(consumes<EcalTrigPrimDigiCollection>(ps.getParameter<edm::InputTag>("ecalTPSourceRecdBx4"))),
ecalTPSourceRecdBx4Label_(ps.getParameter<edm::InputTag>("ecalTPSourceRecdBx4").label()),
ecalTPSourceRecdBx5_(consumes<EcalTrigPrimDigiCollection>(ps.getParameter<edm::InputTag>("ecalTPSourceRecdBx5"))),
ecalTPSourceRecdBx5Label_(ps.getParameter<edm::InputTag>("ecalTPSourceRecdBx5").label()),
hcalTPSourceRecd_(consumes<HcalTrigPrimDigiCollection>(ps.getParameter<edm::InputTag>("hcalTPSourceRecd"))),
hcalTPSourceRecdLabel_(ps.getParameter<edm::InputTag>("hcalTPSourceRecd").label()),
ecalTPSourceSent_(consumes<EcalTrigPrimDigiCollection>(ps.getParameter<edm::InputTag>("ecalTPSourceSent"))),
Expand All @@ -30,6 +41,7 @@ L1TStage2CaloLayer1::L1TStage2CaloLayer1(const edm::ParameterSet& ps)
fedRawData_(consumes<FEDRawDataCollection>(ps.getParameter<edm::InputTag>("fedRawDataLabel"))),
histFolder_(ps.getParameter<std::string>("histFolder")),
tpFillThreshold_(ps.getUntrackedParameter<int>("etDistributionsFillThreshold", 0)),
tpFillThreshold5Bx_(ps.getUntrackedParameter<int>("etDistributionsFillThreshold5Bx", 1)),
ignoreHFfbs_(ps.getUntrackedParameter<bool>("ignoreHFfbs", false)) {}

L1TStage2CaloLayer1::~L1TStage2CaloLayer1() {}
Expand Down Expand Up @@ -194,6 +206,63 @@ void L1TStage2CaloLayer1::dqmAnalyze(const edm::Event& event,
if (nEcalMismatch > streamCache(event.streamID())->streamNumMaxEvtMismatchECAL)
streamCache(event.streamID())->streamNumMaxEvtMismatchECAL = nEcalMismatch;

edm::Handle<EcalTrigPrimDigiCollection> ecalTPsRecdBx1;
event.getByToken(ecalTPSourceRecdBx1_, ecalTPsRecdBx1);
edm::Handle<EcalTrigPrimDigiCollection> ecalTPsRecdBx2;
event.getByToken(ecalTPSourceRecdBx2_, ecalTPsRecdBx2);
edm::Handle<EcalTrigPrimDigiCollection> ecalTPsRecdBx3;
event.getByToken(ecalTPSourceRecdBx3_, ecalTPsRecdBx3);
edm::Handle<EcalTrigPrimDigiCollection> ecalTPsRecdBx4;
event.getByToken(ecalTPSourceRecdBx4_, ecalTPsRecdBx4);
edm::Handle<EcalTrigPrimDigiCollection> ecalTPsRecdBx5;
event.getByToken(ecalTPSourceRecdBx5_, ecalTPsRecdBx5);

for (const auto& tp : (*ecalTPsRecdBx1)) {
if (tp.compressedEt() > tpFillThreshold5Bx_) {
const int ieta = tp.id().ieta();
const int iphi = tp.id().iphi();
eventMonitors.ecalOccRecdBx1_->Fill(ieta, iphi);
eventMonitors.ecalOccRecd5Bx_->Fill(1);
eventMonitors.ecalOccRecd5BxEtWgt_->Fill(1, tp.compressedEt());
}
}
for (const auto& tp : (*ecalTPsRecdBx2)) {
if (tp.compressedEt() > tpFillThreshold5Bx_) {
const int ieta = tp.id().ieta();
const int iphi = tp.id().iphi();
eventMonitors.ecalOccRecdBx2_->Fill(ieta, iphi);
eventMonitors.ecalOccRecd5Bx_->Fill(2);
eventMonitors.ecalOccRecd5BxEtWgt_->Fill(2, tp.compressedEt());
}
}
for (const auto& tp : (*ecalTPsRecdBx3)) {
if (tp.compressedEt() > tpFillThreshold5Bx_) {
const int ieta = tp.id().ieta();
const int iphi = tp.id().iphi();
eventMonitors.ecalOccRecdBx3_->Fill(ieta, iphi);
eventMonitors.ecalOccRecd5Bx_->Fill(3);
eventMonitors.ecalOccRecd5BxEtWgt_->Fill(3, tp.compressedEt());
}
}
for (const auto& tp : (*ecalTPsRecdBx4)) {
if (tp.compressedEt() > tpFillThreshold5Bx_) {
const int ieta = tp.id().ieta();
const int iphi = tp.id().iphi();
eventMonitors.ecalOccRecdBx4_->Fill(ieta, iphi);
eventMonitors.ecalOccRecd5Bx_->Fill(4);
eventMonitors.ecalOccRecd5BxEtWgt_->Fill(4, tp.compressedEt());
}
}
for (const auto& tp : (*ecalTPsRecdBx5)) {
if (tp.compressedEt() > tpFillThreshold5Bx_) {
const int ieta = tp.id().ieta();
const int iphi = tp.id().iphi();
eventMonitors.ecalOccRecdBx5_->Fill(ieta, iphi);
eventMonitors.ecalOccRecd5Bx_->Fill(5);
eventMonitors.ecalOccRecd5BxEtWgt_->Fill(5, tp.compressedEt());
}
}

edm::Handle<HcalTrigPrimDigiCollection> hcalTPsSent;
event.getByToken(hcalTPSourceSent_, hcalTPsSent);
edm::Handle<HcalTrigPrimDigiCollection> hcalTPsRecd;
Expand Down Expand Up @@ -441,6 +510,13 @@ void L1TStage2CaloLayer1::bookHistograms(DQMStore::IBooker& ibooker,
eventMonitors.ecalTPRawEtRecd_ = bookEt("ecalTPRawEtRecd", "ECal Raw Et Layer1 Readout");
eventMonitors.ecalTPRawEtSentAndRecd_ = bookEt("ecalTPRawEtMatch", "ECal Raw Et FULL MATCH");
eventMonitors.ecalTPRawEtSent_ = bookEt("ecalTPRawEtSent", "ECal Raw Et TCC Readout");
eventMonitors.ecalOccRecd5Bx_ = ibooker.book1D("ecalOccRecd5Bx", "ECal TP Values Averaged vs BX", 5, 1, 6);
eventMonitors.ecalOccRecd5BxEtWgt_ = ibooker.book1D("ecalOccRecd5BxEtWgt", "ECal TP*Et Averaged vs BX", 5, 1, 6);
eventMonitors.ecalOccRecdBx1_ = bookEcalOccupancy("ecalOccRecdBx1", "ECal TP Occupancy for BX1");
eventMonitors.ecalOccRecdBx2_ = bookEcalOccupancy("ecalOccRecdBx2", "ECal TP Occupancy for BX2");
eventMonitors.ecalOccRecdBx3_ = bookEcalOccupancy("ecalOccRecdBx3", "ECal TP Occupancy for BX3");
eventMonitors.ecalOccRecdBx4_ = bookEcalOccupancy("ecalOccRecdBx4", "ECal TP Occupancy for BX4");
eventMonitors.ecalOccRecdBx5_ = bookEcalOccupancy("ecalOccRecdBx5", "ECal TP Occupancy for BX5");

ibooker.setCurrentFolder(histFolder_ + "/ECalDetail/TCCDebug");
eventMonitors.ecalOccSentNotRecd_ =
Expand Down
1 change: 1 addition & 0 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Unpacker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ namespace l1t {
makeRegions(ctp7_phi, ctp7Data, res->getRegions());
} else if (N_BX == 5) {
const uint32_t* ptr5 = ptr;
ptr += 192 * 2;
Copy link
Contributor

@aloeliger aloeliger Apr 23, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hftsoi,@cecilecaillol Is this change endorsed by @asavincms ?

UCTCTP7RawData ctp7Data(ptr);
makeECalTPGs(ctp7_phi, ctp7Data, res->getEcalDigis());
makeHCalTPGs(ctp7_phi, ctp7Data, res->getHcalDigis());
Expand Down