Merge pull request #41898 from srimanob/132_StartPhase2HLTDQM

Add Phase2 HLT DQM
cms-sw · Jun 9, 2023 · 7b220bf · 7b220bf
2 parents 4e71041 + bc78dcf
commit 7b220bf
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 8 deletions.
diff --git a/Configuration/StandardSequences/python/Harvesting_cff.py b/Configuration/StandardSequences/python/Harvesting_cff.py
@@ -28,6 +28,10 @@
 validationHarvesting = cms.Path(postValidation*hltpostvalidation*postValidation_gen)
 #validationHarvestingNoHLT = cms.Sequence(postValidation*postValidation_gen)
 #validationHarvesting = cms.Sequence(postValidation*hltpostvalidation*postValidation_gen)
+validationHarvestingPhase2 = cms.Path(hltpostvalidation)
+
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toReplaceWith(validationHarvesting,validationHarvestingPhase2)
 
 _validationHarvesting_fastsim = validationHarvesting.copy()
 for _entry in [hltpostvalidation]:

diff --git a/Configuration/StandardSequences/python/Validation_cff.py b/Configuration/StandardSequences/python/Validation_cff.py
@@ -47,6 +47,9 @@
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
 fastSim.toReplaceWith(prevalidation,_prevalidation_fastsim)
 
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toReplaceWith(prevalidation, prevalidation.copyAndExclude([cms.SequencePlaceholder("mix"),globalPrevalidation,metPreValidSeq,jetPreValidSeq]))
+
 validationNoHLT = cms.Sequence(
                                genvalid_all
                                *globaldigisanalyze
@@ -57,6 +60,9 @@
 validation = cms.Sequence(validationNoHLT
                          *hltvalidation)
 
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toReplaceWith(validation, validation.copyAndExclude([validationNoHLT]))
+
 validationNoHLTHiMix = cms.Sequence(
                                genvalid_all_hiMix
                                *globaldigisanalyze

diff --git a/HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py b/HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py
@@ -39,6 +39,29 @@
     )
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 
+# Temporary Phase-2 configuration
+# Exclude everything except JetMET for now
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toReplaceWith(hltpostvalidation, hltpostvalidation.copyAndExclude([postProcessorHLTtrackingSequence,
+                                                                                 postProcessorHLTvertexing,
+                                                                                 HLTMuonPostVal,
+                                                                                 HLTTauPostVal,
+                                                                                 EgammaPostVal,
+                                                                                 postProcessorHLTgsfTrackingSequence,
+                                                                                 postProcessorHLTmuonTrackingSequence,
+                                                                                 heavyFlavorValidationHarvestingSequence,
+                                                                                 #JetMETPostVal,
+                                                                                 #HLTAlCaPostVal,
+                                                                                 SusyExoPostVal,
+                                                                                 #ExamplePostVal,
+                                                                                 hltvalidationqt,
+                                                                                 HLTHiggsPostVal,
+                                                                                 hltExoticaPostProcessors,
+                                                                                 b2gHLTriggerValidationHarvest,
+                                                                                 HLTSMPPostVal,
+                                                                                 HltBTagPostVal])
+)
+
 # fastsim customs
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
 fastSim.toReplaceWith(hltpostvalidation, hltpostvalidation.copyAndExclude([

diff --git a/HLTriggerOffline/Common/python/HLTValidation_cff.py b/HLTriggerOffline/Common/python/HLTValidation_cff.py
@@ -39,6 +39,16 @@
     )
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 
+# Temporary Phase-2 config
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toReplaceWith(hltassociation, hltassociation.copyAndExclude([hltMultiTrackValidation,
+                                                                           hltMultiPVValidation,
+                                                                           egammaSelectors,
+                                                                           ExoticaValidationProdSeq,
+                                                                           hltMultiTrackValidationGsfTracks,
+                                                                           hltMultiTrackValidationMuonTracks])
+)
+
 # hcal
 from DQMOffline.Trigger.HCALMonitoring_cff import *
 
@@ -61,6 +71,24 @@
     +hltHCALdigisAnalyzer+hltHCALRecoAnalyzer+hltHCALNoiseRates # HCAL
 )
 
+# Temporary Phase-2 config
+# Exclude everything except JetMET for now
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toReplaceWith(hltvalidationWithMC, hltvalidationWithMC.copyAndExclude([HLTMuonVal,
+                                                                                     HLTTauVal,
+                                                                                     egammaValidationSequence,
+                                                                                     heavyFlavorValidationSequence,
+                                                                                     #HLTJetMETValSeq,
+                                                                                     HLTSusyExoValSeq,
+                                                                                     HiggsValidationSequence,
+                                                                                     ExoticaValidationSequence,
+                                                                                     b2gHLTriggerValidation,
+                                                                                     SMPValidationSequence,
+                                                                                     hltbtagValidationSequence,
+                                                                                     hltHCALdigisAnalyzer,
+                                                                                     hltHCALRecoAnalyzer,
+                                                                                     hltHCALNoiseRates]))
+
 hltvalidationWithData = cms.Sequence(
 )
 

diff --git a/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py b/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py
@@ -1,23 +1,24 @@
 import FWCore.ParameterSet.Config as cms
 
-#pfjetcoll="hltAK4PFJetsCorrected"
-pfjetcoll="hltAK4PFJets"
-
-foldernm="HLT/HLTJETMET/"
-
 from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
 SingleJetMetPaths = DQMEDAnalyzer('HLTJetMETValidation',
     triggerEventObject    = cms.untracked.InputTag("hltTriggerSummaryRAW","","HLT"),
-    DQMFolder             = cms.untracked.string(foldernm),
+    DQMFolder             = cms.untracked.string("HLT/HLTJETMET/"),
     PatternJetTrg         = cms.untracked.string("HLT_PF(NoPU)?Jet([0-9])+(_v[0-9]+)?$"),                                   
     PatternMetTrg         = cms.untracked.string("HLT_+[Calo|PF]+MET([0-9])+[_NotCleaned|_BeamHaloCleaned]+(_v[0-9]+)?$"),
     PatternMuTrg          = cms.untracked.string("HLT_Mu([0-9])+(_v[0-9]+)?$"),
     LogFileName           = cms.untracked.string('JetMETSingleJetValidation.log'),
-    PFJetAlgorithm        = cms.untracked.InputTag(pfjetcoll),
+    PFJetAlgorithm        = cms.untracked.InputTag("hltAK4PFJets"),
     GenJetAlgorithm       = cms.untracked.InputTag("ak4GenJets"),
     CaloMETCollection     = cms.untracked.InputTag("hltMet"),
     GenMETCollection      = cms.untracked.InputTag("genMetCalo"),
     HLTriggerResults      = cms.InputTag("TriggerResults::HLT"),
 )
 
+from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
+phase2_common.toModify(SingleJetMetPaths,
+                       PatternJetTrg = "HLT_(AK4)?PFPuppiJet([0-9])+(_v[0-9]+)?$",
+                       PFJetAlgorithm = "hltAK4PFPuppiJetsCorrected"
+                       )
+
 SingleJetValidation = cms.Sequence(SingleJetMetPaths)
diff --git a/Validation/Configuration/python/autoValidation.py b/Validation/Configuration/python/autoValidation.py
@@ -24,7 +24,7 @@
                    'TrackerPhase2Validation' : ['', 'trackerphase2ValidationSource', 'trackerphase2ValidationHarvesting'],
                  }
 
-_phase2_allowed = ['baseValidation','trackingValidation','muonOnlyValidation','JetMETOnlyValidation', 'electronOnlyValidation', 'photonOnlyValidation','bTagOnlyValidation', 'tauOnlyValidation', 'hcalValidation', 'HGCalValidation', 'MTDValidation', 'OuterTrackerValidation', 'ecalValidation_phase2', 'TrackerPhase2Validation']
+_phase2_allowed = ['baseValidation','trackingValidation','muonOnlyValidation','JetMETOnlyValidation', 'electronOnlyValidation', 'photonOnlyValidation','bTagOnlyValidation', 'tauOnlyValidation', 'hcalValidation', 'HGCalValidation', 'MTDValidation', 'OuterTrackerValidation', 'ecalValidation_phase2', 'TrackerPhase2Validation', 'standardValidation']
 autoValidation['phase2Validation'] = ['','','']
 for i in range(0,3):
     autoValidation['phase2Validation'][i] = '+'.join([_f for _f in [autoValidation[m][i] for m in _phase2_allowed] if _f])