Skip to content

Commit 03b8bd8

Browse files
authored
Merge pull request #47328 from etzovara/JetMETScoutDQM_151X_202502102300
Developing offline JetMET DQM for Scouting jets - complementary to PR #47212
2 parents 4963dad + 8f9f53d commit 03b8bd8

File tree

3 files changed

+30
-14
lines changed

3 files changed

+30
-14
lines changed

DQMOffline/HLTScouting/python/HLTScoutingDqmOffline_cff.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@
1313

1414
from HLTriggerOffline.Scouting.HLTScoutingEGammaDqmOffline_cff import *
1515

16+
from DQMOffline.JetMET.jetMETDQMOfflineSource_cff import *
17+
1618
hltScoutingMuonDqmOffline = cms.Sequence(scoutingMonitoringTagProbeMuonNoVtx
1719
* scoutingMonitoringTagProbeMuonVtx
1820
* scoutingMonitoringTriggerMuon
19-
)
21+
)
22+
23+
hltScoutingJetDqmOffline = cms.Sequence(jetMETDQMOfflineSourceScouting)
2024

21-
hltScoutingDqmOffline = cms.Sequence(hltScoutingMuonDqmOffline + hltScoutingEGammaDqmOffline)
25+
hltScoutingDqmOffline = cms.Sequence(hltScoutingMuonDqmOffline + hltScoutingEGammaDqmOffline + hltScoutingJetDqmOffline)

DQMOffline/JetMET/python/jetMETDQMOfflineSource_cff.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@
104104

105105
ak4PFScoutingL1FastjetCorrector = ak4PFL1FastjetCorrector.clone(
106106
algorithm = cms.string('AK4PFHLT'),
107-
#srcRho = cms.InputTag("hltScoutingPFPacker","rho") ### to be updated to this once 2025 ScoutingPFMonitor datasets are available, where the "hltScoutingPacker,rho" won't be missing!
108-
srcRho = cms.InputTag('fixedGridRhoFastjetAll') ### used only temporarily, because in some 2024 ScoutingPFMonitor datasets the "hltScoutingPacker,rho" is missing!
107+
srcRho = cms.InputTag("hltScoutingPFPacker","rho")
109108
)
110109

111110
ak4PFScoutingL2RelativeCorrector = ak4PFL2RelativeCorrector.clone(

DQMOffline/JetMET/src/JetAnalyzer.cc

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -292,12 +292,19 @@ JetAnalyzer::~JetAnalyzer() {
292292

293293
// ***********************************************************
294294
void JetAnalyzer::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const&) {
295-
if (jetCleaningFlag_) {
296-
ibooker.setCurrentFolder("JetMET/Jet/Cleaned" + mInputCollection_.label());
297-
DirName = "JetMET/Jet/Cleaned" + mInputCollection_.label();
295+
if (isScoutingJet_) {
296+
if (!jetCleaningFlag_) {
297+
ibooker.setCurrentFolder("HLT/ScoutingOffline/Jet/Uncleaned" + mInputCollection_.label());
298+
DirName = "HLT/ScoutingOffline/Jet/Uncleaned" + mInputCollection_.label();
299+
}
298300
} else {
299-
ibooker.setCurrentFolder("JetMET/Jet/Uncleaned" + mInputCollection_.label());
300-
DirName = "JetMET/Jet/Uncleaned" + mInputCollection_.label();
301+
if (jetCleaningFlag_) {
302+
ibooker.setCurrentFolder("JetMET/Jet/Cleaned" + mInputCollection_.label());
303+
DirName = "JetMET/Jet/Cleaned" + mInputCollection_.label();
304+
} else {
305+
ibooker.setCurrentFolder("JetMET/Jet/Uncleaned" + mInputCollection_.label());
306+
DirName = "JetMET/Jet/Uncleaned" + mInputCollection_.label();
307+
}
301308
}
302309

303310
jetME = ibooker.book1D("jetReco", "jetReco", 5, 1, 5); // --> for .../JetMET/Run summary/Jet/.../jetReco plots
@@ -2584,12 +2591,18 @@ void JetAnalyzer::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetu
25842591
// ***********************************************************
25852592
void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
25862593
//set general folders first --> change later on for different folders
2587-
if (jetCleaningFlag_) {
2588-
//dbe_->setCurrentFolder("JetMET/Jet/Cleaned"+mInputCollection_.label());
2589-
DirName = "JetMET/Jet/Cleaned" + mInputCollection_.label();
2594+
if (isScoutingJet_) {
2595+
if (!jetCleaningFlag_) {
2596+
DirName = "HLT/ScoutingOffline/Jet/Uncleaned" + mInputCollection_.label();
2597+
}
25902598
} else {
2591-
//dbe_->setCurrentFolder("JetMET/Jet/Uncleaned"+mInputCollection_.label());
2592-
DirName = "JetMET/Jet/Uncleaned" + mInputCollection_.label();
2599+
if (jetCleaningFlag_) {
2600+
//dbe_->setCurrentFolder("JetMET/Jet/Cleaned"+mInputCollection_.label());
2601+
DirName = "JetMET/Jet/Cleaned" + mInputCollection_.label();
2602+
} else {
2603+
//dbe_->setCurrentFolder("JetMET/Jet/Uncleaned"+mInputCollection_.label());
2604+
DirName = "JetMET/Jet/Uncleaned" + mInputCollection_.label();
2605+
}
25932606
}
25942607

25952608
Handle<ValueMap<float>> puJetIdMva;

0 commit comments

Comments
 (0)