Minor fixes while testing the full workflow (EGM+MUO)

Author: elfontan

DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py

@@ -84,7 +84,7 @@
 from DQM.TrackingMonitorClient.TrackingClientConfig_Tier0_cff import *
 from DQMOffline.Muon.muonQualityTests_cff import *
 from DQMOffline.EGamma.egammaPostProcessing_cff import *
-from DQMOffline.HLTScouting.hltScoutingPostProcessing_cff import *
+from DQMOffline.HLTScouting.HLTScoutingPostProcessing_cff import *
 from DQMOffline.Trigger.DQMOffline_Trigger_Client_cff import *
 from DQMOffline.Trigger.DQMOffline_HLT_Client_cff import *
 from DQMOffline.RecoB.dqmCollector_cff import *
@@ -268,7 +268,8 @@
 
 DQMHarvestBTag = cms.Sequence( bTagCollectorSequenceDATA )
 
-DQMHarvestHLTScouting = cms.Sequence( hltScoutingPostProcessing )
+# HLT Scouting trigger sequence
+DQMHarvestHLTScouting = cms.Sequence( HLTScoutingPostProcessing )
 
 from PhysicsTools.NanoAOD.nanoDQM_cff import *
 from Validation.RecoParticleFlow.DQMForPF_MiniAOD_cff import *

DQMOffline/Configuration/python/autoDQM.py

@@ -14,11 +14,6 @@
                                    'PostDQMOffline',
                                    '@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@hlt+@beam+@fed+dqmFastTimerServiceClient'],
 
-            'commonWithScouting': ['@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@hlt+@beam+@castor+@physics+@hltScouting',
-                                   'PostDQMOffline',
-                                   '@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@hlt+@beam+@fed+dqmFastTimerServiceClient'],
-
-
             'commonFakeHLT': ['@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@beam+@castor+@physics',
                         'PostDQMOffline',
                         '@dcs+@DQMMessageLogger+@stripCommon+@pixel+@tracking+@beam+@fed+dqmFastTimerServiceClient'],

DQMOffline/HLTScouting/python/HLTScoutingDqmOffline_cff.py

@@ -1,13 +1,11 @@
-# ------------------------------------------- #
-# Scouting DQM sequence for offline DQM       #
-#                                             #
-# used by DQM GUI: DQMOffline/Configuration   #
-# ------------------------------------------- #
-import FWCore.ParameterSet.Config as cms
-from DQMServices.Core.DQMEDHarvester import DQMEDHarvester                                                                                                            
+'''
+Scouting DQM sequences for offline DQM developed for 2025 pp data-taking
+and used by DQM GUI (DQMOffline/Configuration):
+currently running EGM and MUO monitoring modules.
+'''
 
 import FWCore.ParameterSet.Config as cms
-from DQMServices.Core.DQMEDHarvester import DQMEDHarvester 
+from DQMServices.Core.DQMEDHarvester import DQMEDHarvester                                
 
 from HLTriggerOffline.Scouting.ScoutingMuonTriggerAnalyzer_cfi import *
 from HLTriggerOffline.Scouting.ScoutingMuonTagProbeAnalyzer_cfi import *
@@ -16,8 +14,8 @@
 from HLTriggerOffline.Scouting.HLTScoutingEGammaDqmOffline_cff import *
 
 hltScoutingMuonDqmOffline = cms.Sequence(scoutingMonitoringTagProbeMuonNoVtx
-        * scoutingMonitoringTagProbeMuonVtx                                                                                                                                              
-        * scoutingMonitoringTriggerMuon                                                                                                                                                  
+                                         * scoutingMonitoringTagProbeMuonVtx                                                         
+                                         * scoutingMonitoringTriggerMuon                                                              
 ) 
 
 hltScoutingDqmOffline = cms.Sequence(hltScoutingMuonDqmOffline + hltScoutingEGammaDqmOffline)

DQMOffline/HLTScouting/python/hltScoutingPostProcessing_cff.py

@@ -1,24 +1,16 @@
-// -*- C++ -*-
-//
-// Package:    DQMOffline/Scouting
-// Class:      ScoutingEGammaCollectionMonitoring
-//
-/**\class ScoutingEGammaCollectionMonitoring ScoutingEGammaCollectionMonitoring.cc
- DQMOffline/Scouting/plugins/ScoutingEGammaCollectionMonitoring.cc
+/*
+Scouting EGamma DQM core implementation.
 
  Description: ScoutingEGammaCollectionMonitoring is developed to enable us to monitor the
               comparison between pat::Object and Run3Scouting<Object>.
 
  Implementation:
-     * Current runs on top of MINIAOD dataformat of the ScoutingEGammaCollectionMonitoring
- dataset.
+     * Current runs on top of MINIAOD dataformat of the ScoutingEGammaCollectionMonitoring dataset.
      * Implemented only for electrons as of now.
+
+Authors: Ting-Hsiang Hsu, Abanti Ranadhir Sahasransu
 */
-//
-// Original Author:  Abanti Ranadhir Sahasransu
-//         Created:  Sun, 18 Aug 2024 13:02:11 GMT
-//
-//
+
 #include "ScoutingEGammaCollectionMonitoring.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -28,37 +20,16 @@
 #include <numeric>
 #include <algorithm>
 
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-
 ScoutingEGammaCollectionMonitoring::ScoutingEGammaCollectionMonitoring(const edm::ParameterSet& iConfig)
     : outputInternalPath_(iConfig.getParameter<std::string>("OutputInternalPath")),
       triggerResultsToken_(consumes<edm::TriggerResults>(iConfig.getParameter<edm::InputTag>("TriggerResultTag"))),
       electronCollection_(
           consumes<edm::View<pat::Electron>>(iConfig.getParameter<edm::InputTag>("ElectronCollection"))),
       scoutingElectronCollection_(consumes<std::vector<Run3ScoutingElectron>>(
           iConfig.getParameter<edm::InputTag>("ScoutingElectronCollection"))),
-      eleIdMapTightToken_(consumes<edm::ValueMap<bool>>(iConfig.getParameter<edm::InputTag>("eleIdMapTight"))) {
-  // now do whatever initialization is needed
-}
-
-ScoutingEGammaCollectionMonitoring::~ScoutingEGammaCollectionMonitoring() {
-  // do anything here that needs to be done at desctruction time
-  // (e.g. close files, deallocate resources etc.)
-}
+      eleIdMapTightToken_(consumes<edm::ValueMap<bool>>(iConfig.getParameter<edm::InputTag>("eleIdMapTight"))) {}
 
-//
-// member functions
-//
+ScoutingEGammaCollectionMonitoring::~ScoutingEGammaCollectionMonitoring() {}
 
 // Function to convert pseudo-rapidity to theta
 double getPtFromEnergyMassEta(double energy, double mass, double eta) {

HLTriggerOffline/Scouting/plugins/ScoutingEGammaCollectionMonitoring.cc

@@ -1,3 +1,16 @@
+/*
+Scouting EGamma DQM core implementation.
+
+ Description: ScoutingEGammaCollectionMonitoring is developed to enable us to monitor the
+              comparison between pat::Object and Run3Scouting<Object>.
+
+ Implementation:
+     * Current runs on top of MINIAOD dataformat of the ScoutingEGammaCollectionMonitoring dataset.
+     * Implemented only for electrons as of now.
+
+Authors: Ting-Hsiang Hsu, Abanti Ranadhir Sahasransu
+*/
+
 #include "ScoutingElectronTagProbeAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/Math/interface/deltaR.h"
@@ -45,8 +58,6 @@ void ScoutingElectronTagProbeAnalyzer::dqmAnalyze(edm::Event const& iEvent,
     std::string filterTag = filterToMatch.at(iteFilter);
     for (pat::TriggerObjectStandAlone obj : *triggerObjects) {
       obj.unpackNamesAndLabels(iEvent, *triggerResults);
-      //for (size_t ij =0; ij < obj.filterLabels().size(); ij ++) std::cout << obj.filterLabels().at(ij) << " ";
-      //std::cout << std::endl;
       if (obj.hasFilterLabel(filterTag)) {
         legObjects[iteFilter].push_back(obj);
       }
@@ -362,12 +373,8 @@ void ScoutingElectronTagProbeAnalyzer::bookHistograms_resonance(DQMStore::IBooke
                                                    500);
 }
 
-// ------------ method fills 'descriptions' with the allowed parameters for the
-// module  ------------
+// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
 void ScoutingElectronTagProbeAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  // The following says we do not know what parameters are allowed so do no
-  // validation Please change this to state exactly what you do use, even if it
-  // is no parameters
   edm::ParameterSetDescription desc;
   desc.add<std::string>("OutputInternalPath", "MY_FOLDER");
   desc.add<edm::InputTag>("TriggerResultTag", edm::InputTag("TriggerResults", "", "HLT"));

HLTriggerOffline/Scouting/plugins/ScoutingElectronTagProbeAnalyzer.cc

@@ -75,7 +75,6 @@ struct kProbeKinematicMuonHistos {
   dqm::reco::MonitorElement* hy;
   dqm::reco::MonitorElement* hZerror;
   dqm::reco::MonitorElement* htracksSize;
-
 };
 
 struct kTagProbeMuonHistos {

HLTriggerOffline/Scouting/plugins/ScoutingMuonTagProbeAnalyzer.h

@@ -20,7 +20,6 @@ ScoutingMuonTriggerAnalyzer::ScoutingMuonTriggerAnalyzer(const edm::ParameterSet
     : outputInternalPath_(iConfig.getParameter<std::string>("OutputInternalPath")),
       triggerCache_(triggerExpression::Data(iConfig.getParameterSet("triggerConfiguration"), consumesCollector())),
       vtriggerSelection_(iConfig.getParameter<vector<string>>("triggerSelection")) {
-
   scoutingMuonCollection_ =
       consumes<std::vector<Run3ScoutingMuon>>(iConfig.getParameter<edm::InputTag>("ScoutingMuonCollection"));
   vtriggerSelector_.reserve(vtriggerSelection_.size());
@@ -173,4 +172,4 @@ void ScoutingMuonTriggerAnalyzer::fillDescriptions(edm::ConfigurationDescription
   descriptions.add("ScoutingMuonTriggerAnalyzer", desc);
 }
 
-DEFINE_FWK_MODULE(ScoutingMuonTriggerAnalyzer);
+DEFINE_FWK_MODULE(ScoutingMuonTriggerAnalyzer);

HLTriggerOffline/Scouting/plugins/ScoutingMuonTriggerAnalyzer.cc

@@ -7,6 +7,7 @@
 
 import FWCore.ParameterSet.Config as cms
 import FWCore.ParameterSet.VarParsing as VarParsing
+
 ## In line command options
 options = VarParsing.VarParsing('analysis')
 options.register('inputDataset',