JetAnalyzer: allow possiblity to define the online DQM as output folder

Author: mmusich

DQM/HLTEvF/python/ScoutingJetMonitoring_cff.py

@@ -5,23 +5,23 @@
 from DQMOffline.JetMET.jetMETDQMOfflineSource_cff import *
 
 jetDQMOnlineAnalyzerAk4ScoutingCleaned = jetDQMAnalyzerAk4ScoutingCleaned.clone(
-    DCSFilterForJetMonitoring = cms.PSet(
-        DetectorTypes = cms.untracked.string("ecal:hbhe:hf:pixel:sistrip:es:muon"),
-        onlineMetaDataDigisSrc =  cms.untracked.InputTag("hltOnlineMetaDataDigis"),
-        DebugOn = cms.untracked.bool(False),
-        alwaysPass = cms.untracked.bool(False)
-    )
+    JetType='scoutingOnline',
+    DCSFilterForJetMonitoring=dict(DetectorTypes = "ecal:hbhe:hf:pixel:sistrip:es:muon",
+                                   onlineMetaDataDigisSrc = cms.untracked.InputTag("hltOnlineMetaDataDigis"),
+                                   DebugOn = cms.untracked.bool(False),
+                                   alwaysPass = False)
 )
+
 jetDQMOnlineAnalyzerAk4ScoutingUncleaned = jetDQMAnalyzerAk4ScoutingUncleaned.clone(
-    DCSFilterForJetMonitoring = cms.PSet(
-      DetectorTypes = cms.untracked.string("ecal:hbhe:hf:pixel:sistrip:es:muon"),
-        onlineMetaDataDigisSrc =  cms.untracked.InputTag("hltOnlineMetaDataDigis"),
-        DebugOn = cms.untracked.bool(False),
-        alwaysPass = cms.untracked.bool(False)
-    )
+    JetType='scoutingOnline',
+    DCSFilterForJetMonitoring=dict(DetectorTypes = "ecal:hbhe:hf:pixel:sistrip:es:muon",
+                                   onlineMetaDataDigisSrc = cms.untracked.InputTag("hltOnlineMetaDataDigis"),
+                                   DebugOn =  cms.untracked.bool(False),
+                                   alwaysPass = False)
 )
 
-jetDQMOnlineAnalyzerSequenceScouting = cms.Sequence(jetDQMOnlineAnalyzerAk4ScoutingUncleaned*jetDQMOnlineAnalyzerAk4ScoutingCleaned)
+jetDQMOnlineAnalyzerSequenceScouting = cms.Sequence(jetDQMOnlineAnalyzerAk4ScoutingUncleaned*
+                                                    jetDQMOnlineAnalyzerAk4ScoutingCleaned)
 
 ScoutingJetMonitoring = cms.Sequence(jetPreDQMSeqScouting*
                                      dqmAk4PFScoutingL1FastL2L3ResidualCorrectorChain*

DQMOffline/JetMET/interface/JetAnalyzer.h

@@ -937,6 +937,8 @@ class JetAnalyzer : public DQMEDAnalyzer {
   bool isPUPPIJet_;
   bool isScoutingJet_;
 
+  bool isOnlineDQM_;
+
   bool fill_jet_high_level_histo;
 
   bool fill_CHS_histos;

DQMOffline/JetMET/src/JetAnalyzer.cc

@@ -82,10 +82,12 @@ JetAnalyzer::JetAnalyzer(const edm::ParameterSet& pSet)
   //isJPTJet_  = (std::string("jpt") ==jetType_);
   isPFJet_ = (std::string("pf") == jetType_);
   isPUPPIJet_ = (std::string("puppi") == jetType_);
-  isScoutingJet_ = (std::string("scouting") == jetType_);
+  isScoutingJet_ = (jetType_.find("scouting") != std::string::npos);
   isMiniAODJet_ = (std::string("miniaod") == jetType_);
   jetCorrectorTag_ = pSet.getParameter<edm::InputTag>("JetCorrections");
 
+  isOnlineDQM_ = (jetType_.find("Online") != std::string::npos);
+
   if (!isMiniAODJet_) {  //in MiniAOD jet is already corrected
     jetCorrectorToken_ = consumes<reco::JetCorrector>(jetCorrectorTag_);
   }
@@ -313,12 +315,14 @@ JetAnalyzer::~JetAnalyzer() {
 // ***********************************************************
 void JetAnalyzer::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const&) {
   if (isScoutingJet_) {
+    std::string baseDir = isOnlineDQM_ ? "HLT/ScoutingOnline/Jet/" : "HLT/ScoutingOffline/Jet/";
+
     if (jetCleaningFlag_) {
-      ibooker.setCurrentFolder("HLT/ScoutingOffline/Jet/Cleaned" + mInputCollection_.label());
-      DirName = "HLT/ScoutingOffline/Jet/Cleaned" + mInputCollection_.label();
+      ibooker.setCurrentFolder(baseDir + "Cleaned" + mInputCollection_.label());
+      DirName = baseDir + "Cleaned" + mInputCollection_.label();
     } else {
-      ibooker.setCurrentFolder("HLT/ScoutingOffline/Jet/Uncleaned" + mInputCollection_.label());
-      DirName = "HLT/ScoutingOffline/Jet/Uncleaned" + mInputCollection_.label();
+      ibooker.setCurrentFolder(baseDir + "Uncleaned" + mInputCollection_.label());
+      DirName = baseDir + "Uncleaned" + mInputCollection_.label();
     }
   } else {
     if (jetCleaningFlag_) {
@@ -2615,10 +2619,12 @@ void JetAnalyzer::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetu
 void JetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //set general folders first --> change later on for different folders
   if (isScoutingJet_) {
+    std::string baseDir = isOnlineDQM_ ? "HLT/ScoutingOnline/Jet/" : "HLT/ScoutingOffline/Jet/";
+
     if (jetCleaningFlag_) {
-      DirName = "HLT/ScoutingOffline/Jet/Cleaned" + mInputCollection_.label();
+      DirName = baseDir + "Cleaned" + mInputCollection_.label();
     } else {
-      DirName = "HLT/ScoutingOffline/Jet/Uncleaned" + mInputCollection_.label();
+      DirName = baseDir + "Uncleaned" + mInputCollection_.label();
     }
   } else {
     if (jetCleaningFlag_) {