From 59c44f6ef5f540920fefe16bd579a5ea9285d09f Mon Sep 17 00:00:00 2001 From: Salavat Date: Sun, 7 Jun 2020 23:10:09 +0200 Subject: [PATCH 1/2] removing hbhereco=HBHEIsolatedNoiseReflagger from Run3 --- RecoJets/JetProducers/python/caloJetsForTrk_cff.py | 5 ++--- .../Configuration/python/hcalGlobalReco_cff.py | 4 ++-- .../Configuration/python/hcalLocalReco_cff.py | 12 ++++++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/RecoJets/JetProducers/python/caloJetsForTrk_cff.py b/RecoJets/JetProducers/python/caloJetsForTrk_cff.py index fad402d974e77..4b5d9c6d4a959 100644 --- a/RecoJets/JetProducers/python/caloJetsForTrk_cff.py +++ b/RecoJets/JetProducers/python/caloJetsForTrk_cff.py @@ -18,6 +18,5 @@ from Configuration.Eras.Modifier_pf_badHcalMitigation_cff import pf_badHcalMitigation pf_badHcalMitigation.toModify( caloTowerForTrk, missingHcalRescaleFactorForEcal = 1.0 ) -from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal -phase2_hcal.toModify( caloTowerForTrk, hbheInput = cms.InputTag("hbhereco") ) - +from Configuration.Eras.Modifier_run3_HB_cff import run3_HB +run3_HB.toModify( caloTowerForTrk, hbheInput = cms.InputTag("hbhereco") ) diff --git a/RecoLocalCalo/Configuration/python/hcalGlobalReco_cff.py b/RecoLocalCalo/Configuration/python/hcalGlobalReco_cff.py index a94a032602713..70207e36ba654 100644 --- a/RecoLocalCalo/Configuration/python/hcalGlobalReco_cff.py +++ b/RecoLocalCalo/Configuration/python/hcalGlobalReco_cff.py @@ -6,5 +6,5 @@ from RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi import hbheprereco as _phase1_hbheprereco -from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal -phase2_hcal.toReplaceWith( hbhereco, _phase1_hbheprereco ) +from Configuration.Eras.Modifier_run3_HB_cff import run3_HB +run3_HB.toReplaceWith( hbhereco, _phase1_hbheprereco ) # >=Run3 diff --git a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py index bead5855018d0..aca45eb3b694b 100644 --- a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py +++ b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py @@ -25,6 +25,7 @@ # copy for cosmics _default_hfreco = hfreco.clone() +#--- Phase1 _phase1_hcalLocalRecoTask = hcalLocalRecoTask.copy() _phase1_hcalLocalRecoTask.add(hfprereco) @@ -45,12 +46,11 @@ from Configuration.ProcessModifiers.run2_HECollapse_2018_cff import run2_HECollapse_2018 run2_HECollapse_2018.toReplaceWith(hcalLocalRecoTask, _collapse_hcalLocalRecoTask) -_phase2_hcalLocalRecoTask = hcalLocalRecoTask.copy() -_phase2_hcalLocalRecoTask.remove(hbheprereco) - -from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal -phase2_hcal.toReplaceWith( hcalLocalRecoTask, _phase2_hcalLocalRecoTask ) - +#--- from >=Run3 +_run3_hcalLocalRecoTask = _phase1_hcalLocalRecoTask.copy() +_run3_hcalLocalRecoTask.remove(hbheprereco) +from Configuration.Eras.Modifier_run3_HB_cff import run3_HB +run3_HB.toReplaceWith( hcalLocalRecoTask, _run3_hcalLocalRecoTask ) _fastSim_hcalLocalRecoTask = hcalLocalRecoTask.copyAndExclude([zdcreco]) from Configuration.Eras.Modifier_fastSim_cff import fastSim From 98a74643feebaedc92f35df5b3e48787f83325d5 Mon Sep 17 00:00:00 2001 From: Salavat Date: Mon, 8 Jun 2020 12:31:31 +0200 Subject: [PATCH 2/2] DQM HBHE-no-noise customization move to Run3 --- .../Configuration/python/DQMOffline_cff.py | 6 ++-- .../Hcal/python/HcalDQMOfflineSequence_cff.py | 6 ++-- .../hcalRecHitsValidationSequence_cff.py | 34 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py index b00a5b93181b7..c34907257985d 100644 --- a/DQMOffline/Configuration/python/DQMOffline_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_cff.py @@ -236,9 +236,9 @@ PostDQMOfflineMiniAOD = cms.Sequence(miniAODDQMSequence*jetMETDQMOfflineSourceMiniAOD*tracksDQMMiniAOD*topPhysicsminiAOD) PostDQMOffline = cms.Sequence() -from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal -phase2_hcal.toReplaceWith( PostDQMOfflineMiniAOD, PostDQMOfflineMiniAOD.copyAndExclude([ - pfMetDQMAnalyzerMiniAOD, pfPuppiMetDQMAnalyzerMiniAOD # No hcalnoise yet +from Configuration.Eras.Modifier_run3_HB_cff import run3_HB +run3_HB.toReplaceWith( PostDQMOfflineMiniAOD, PostDQMOfflineMiniAOD.copyAndExclude([ + pfMetDQMAnalyzerMiniAOD, pfPuppiMetDQMAnalyzerMiniAOD # No hcalnoise (yet) ])) from PhysicsTools.NanoAOD.nanoDQM_cff import nanoDQM diff --git a/DQMOffline/Hcal/python/HcalDQMOfflineSequence_cff.py b/DQMOffline/Hcal/python/HcalDQMOfflineSequence_cff.py index 48579a8fb6aab..605903816934e 100644 --- a/DQMOffline/Hcal/python/HcalDQMOfflineSequence_cff.py +++ b/DQMOffline/Hcal/python/HcalDQMOfflineSequence_cff.py @@ -16,6 +16,6 @@ HcalDQMOfflineSequence = cms.Sequence(NoiseRatesDQMOffline*RecHitsDQMOffline*AllCaloTowersDQMOffline) #HcalDQMOfflineSequence = cms.Sequence(NoiseRatesDQMOffline*AllCaloTowersDQMOffline) -_phase2_HcalDQMOfflineSequence = HcalDQMOfflineSequence.copyAndExclude([NoiseRatesDQMOffline]) -from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal -phase2_hcal.toReplaceWith(HcalDQMOfflineSequence, _phase2_HcalDQMOfflineSequence) +_run3_HcalDQMOfflineSequence = HcalDQMOfflineSequence.copyAndExclude([NoiseRatesDQMOffline]) +from Configuration.Eras.Modifier_run3_HB_cff import run3_HB +run3_HB.toReplaceWith(HcalDQMOfflineSequence, _run3_HcalDQMOfflineSequence) diff --git a/Validation/HcalRecHits/python/hcalRecHitsValidationSequence_cff.py b/Validation/HcalRecHits/python/hcalRecHitsValidationSequence_cff.py index 796436153a641..50b314feaecfa 100644 --- a/Validation/HcalRecHits/python/hcalRecHitsValidationSequence_cff.py +++ b/Validation/HcalRecHits/python/hcalRecHitsValidationSequence_cff.py @@ -1,18 +1,18 @@ -import FWCore.ParameterSet.Config as cms - -from Validation.HcalRecHits.HcalRecHitParam_cfi import * - -import Validation.HcalRecHits.HcalRecHitParam_cfi - -RecHitsValidation = Validation.HcalRecHits.HcalRecHitParam_cfi.hcalRecoAnalyzer.clone() -NoiseRatesValidation = Validation.HcalRecHits.HcalRecHitParam_cfi.hcalNoiseRates.clone() - -hcalRecHitsValidationSequence = cms.Sequence(NoiseRatesValidation*RecHitsValidation) - -# fastsim hasn't got the right noise collection for the moment => no noise validation +import FWCore.ParameterSet.Config as cms + +from Validation.HcalRecHits.HcalRecHitParam_cfi import * + +import Validation.HcalRecHits.HcalRecHitParam_cfi + +RecHitsValidation = Validation.HcalRecHits.HcalRecHitParam_cfi.hcalRecoAnalyzer.clone() +NoiseRatesValidation = Validation.HcalRecHits.HcalRecHitParam_cfi.hcalNoiseRates.clone() + +hcalRecHitsValidationSequence = cms.Sequence(NoiseRatesValidation*RecHitsValidation) + +# fastsim hasn't got the right noise collection for the moment => no noise validation from Configuration.Eras.Modifier_fastSim_cff import fastSim -fastSim.toReplaceWith(hcalRecHitsValidationSequence, hcalRecHitsValidationSequence.copyAndExclude([NoiseRatesValidation])) - -from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal -_phase2_hcalRecHitsValidationSequence = hcalRecHitsValidationSequence.copyAndExclude([NoiseRatesValidation]) -phase2_hcal.toReplaceWith(hcalRecHitsValidationSequence, _phase2_hcalRecHitsValidationSequence) +fastSim.toReplaceWith(hcalRecHitsValidationSequence, hcalRecHitsValidationSequence.copyAndExclude([NoiseRatesValidation])) + +_run3_hcalRecHitsValidationSequence = hcalRecHitsValidationSequence.copyAndExclude([NoiseRatesValidation]) +from Configuration.Eras.Modifier_run3_HB_cff import run3_HB +run3_HB.toReplaceWith(hcalRecHitsValidationSequence, _run3_hcalRecHitsValidationSequence)