From cefd58a7e64c94b907f2abe645a1f66a5640ea21 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Thu, 8 Jun 2023 00:16:53 +0200 Subject: [PATCH 1/3] first Phase2 HLT DQM --- .../python/Harvesting_cff.py | 4 +++ .../python/Validation_cff.py | 6 ++++ .../Common/python/HLTValidationHarvest_cff.py | 23 +++++++++++++++ .../Common/python/HLTValidation_cff.py | 28 +++++++++++++++++++ .../Validation/SingleJetValidation_cfi.py | 5 ++++ .../Configuration/python/autoValidation.py | 2 +- 6 files changed, 67 insertions(+), 1 deletion(-) diff --git a/Configuration/StandardSequences/python/Harvesting_cff.py b/Configuration/StandardSequences/python/Harvesting_cff.py index a2e1f4a25a8bc..fa5a249346b6c 100644 --- 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 index 5d78123f9de68..066c33013fca0 100644 --- 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 index 0d54bb6edf854..aaf53d7165e34 100644 --- 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 index 7ac76ddbf0c8f..b0eb3e5d8cc18 100644 --- 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 index fb0d00511031c..366e2c405b797 100644 --- a/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py +++ b/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py @@ -20,4 +20,9 @@ HLTriggerResults = cms.InputTag("TriggerResults::HLT"), ) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toModify(SingleJetMetPaths, + PatternJetTrg = cms.untracked.string("HLT_(AK4)?PF(NoPU|Puppi)?Jet([0-9])+(_v[0-9]+)?$") + ) + SingleJetValidation = cms.Sequence(SingleJetMetPaths) diff --git a/Validation/Configuration/python/autoValidation.py b/Validation/Configuration/python/autoValidation.py index 874566ff34e5a..6efcaf6a85149 100644 --- 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]) From 94910024bd8b0dc0821aec61271e4c74efca0414 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Thu, 8 Jun 2023 13:40:04 +0200 Subject: [PATCH 2/3] update singlejet --- .../JetMET/python/Validation/SingleJetValidation_cfi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py b/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py index 366e2c405b797..ff04fb596ba79 100644 --- a/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py +++ b/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py @@ -2,6 +2,7 @@ #pfjetcoll="hltAK4PFJetsCorrected" pfjetcoll="hltAK4PFJets" +pfjetcollPhase2 = "hltAK4PFPuppiJetsCorrected" foldernm="HLT/HLTJETMET/" @@ -22,7 +23,8 @@ from Configuration.Eras.Modifier_phase2_common_cff import phase2_common phase2_common.toModify(SingleJetMetPaths, - PatternJetTrg = cms.untracked.string("HLT_(AK4)?PF(NoPU|Puppi)?Jet([0-9])+(_v[0-9]+)?$") + PatternJetTrg = 'HLT_(AK4)?PFPuppiJet([0-9])+(_v[0-9]+)?$', + PFJetAlgorithm = cms.untracked.InputTag(pfjetcollPhase2) ) SingleJetValidation = cms.Sequence(SingleJetMetPaths) From bc78dcf9aafd28615a20570650d1c0489d419f23 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Thu, 8 Jun 2023 16:13:56 +0200 Subject: [PATCH 3/3] style update --- .../python/Validation/SingleJetValidation_cfi.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py b/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py index ff04fb596ba79..4a8be8a4f4e7a 100644 --- a/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py +++ b/HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py @@ -1,20 +1,14 @@ import FWCore.ParameterSet.Config as cms -#pfjetcoll="hltAK4PFJetsCorrected" -pfjetcoll="hltAK4PFJets" -pfjetcollPhase2 = "hltAK4PFPuppiJetsCorrected" - -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"), @@ -23,8 +17,8 @@ from Configuration.Eras.Modifier_phase2_common_cff import phase2_common phase2_common.toModify(SingleJetMetPaths, - PatternJetTrg = 'HLT_(AK4)?PFPuppiJet([0-9])+(_v[0-9]+)?$', - PFJetAlgorithm = cms.untracked.InputTag(pfjetcollPhase2) + PatternJetTrg = "HLT_(AK4)?PFPuppiJet([0-9])+(_v[0-9]+)?$", + PFJetAlgorithm = "hltAK4PFPuppiJetsCorrected" ) SingleJetValidation = cms.Sequence(SingleJetMetPaths)