From 6a586493baa32b4c1c8373470d7434d8f8791a46 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Thu, 14 Jul 2022 13:06:36 +0200 Subject: [PATCH 1/4] rebase: add miniaod dqm to FastSim --- .../Configuration/python/DQMOfflineFS_cff.py | 18 ++++++++++++++++++ DQMOffline/Muon/python/muonAnalyzer_cff.py | 17 +++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/DQMOffline/Configuration/python/DQMOfflineFS_cff.py b/DQMOffline/Configuration/python/DQMOfflineFS_cff.py index 4499267a2ddc6..2b5854d2bdd03 100644 --- a/DQMOffline/Configuration/python/DQMOfflineFS_cff.py +++ b/DQMOffline/Configuration/python/DQMOfflineFS_cff.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms # FastSim version of DQMOffline/Configuration/python/DQMOfflineMC_cff.py . +# MiniAOD part is a clone from DQMOffline/Configuration/python/DQMOffline_cff.py from DQMOffline.RecoB.PrimaryVertexMonitor_cff import * from DQM.Physics.DQMPhysics_cff import * @@ -22,4 +23,21 @@ singleTopElectronMediumDQM.setup.jetExtras.jetCorrector = cms.InputTag("ak4PFCHSL1FastL2L3Corrector") DQMOfflineFS = cms.Sequence(DQMOfflinePrePOG) + +# miniAOD DQM validation +from DQMOffline.JetMET.jetMETDQMOfflineSource_cff import * +from DQMOffline.Muon.muonMonitors_cff import * +from Validation.RecoParticleFlow.miniAODDQM_cff import * # On MiniAOD vs RECO +from Validation.RecoParticleFlow.DQMForPF_MiniAOD_cff import * # MiniAOD PF variables +from DQM.TrackingMonitor.tracksDQMMiniAOD_cff import * +from DQMOffline.RecoB.bTagMiniDQM_cff import * +from DQMOffline.Muon.miniAOD_cff import * +from DQM.Physics.DQMTopMiniAOD_cff import * + +DQMOfflineMiniAOD = cms.Sequence(jetMETDQMOfflineRedoProductsMiniAOD*bTagMiniDQMSource*muonMonitors_miniAOD*MuonMiniAOD*DQMOfflinePF) + +#Post sequences are automatically placed in the EndPath by ConfigBuilder if PAT is run. +#miniAOD DQM sequences need to access the filter results. + +PostDQMOfflineMiniAOD = cms.Sequence(miniAODDQMSequence*jetMETDQMOfflineSourceMiniAOD*tracksDQMMiniAOD*topPhysicsminiAOD) PostDQMOffline = cms.Sequence() diff --git a/DQMOffline/Muon/python/muonAnalyzer_cff.py b/DQMOffline/Muon/python/muonAnalyzer_cff.py index bbf0cdfb5e1f7..eac7aaf81c895 100644 --- a/DQMOffline/Muon/python/muonAnalyzer_cff.py +++ b/DQMOffline/Muon/python/muonAnalyzer_cff.py @@ -22,14 +22,6 @@ muonPFsequence* muonRecoOneHLT) - - -muonAnalyzer_miniAOD = cms.Sequence(muonRecoAnalyzer_miniAOD* - muonKinVsEtaAnalyzer_miniAOD* - diMuonHistos_miniAOD* - EfficiencyAnalyzer_miniAOD* - triggerMatchMonitor_miniAOD) - muonAnalyzer_noHLT = cms.Sequence(muonEnergyDepositAnalyzer* muonSeedsAnalyzer* muonRecoAnalyzer* @@ -39,3 +31,12 @@ diMuonHistos* EfficiencyAnalyzer* muonPFsequence) + +muonAnalyzer_miniAOD = cms.Sequence(muonRecoAnalyzer_miniAOD* + muonKinVsEtaAnalyzer_miniAOD* + diMuonHistos_miniAOD* + EfficiencyAnalyzer_miniAOD* + triggerMatchMonitor_miniAOD) + +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toReplaceWith(muonAnalyzer_miniAOD, muonAnalyzer_miniAOD.copyAndExclude([triggerMatchMonitor_miniAOD])) From 136b5b0d7f0cd9f92705d2e539c5828c50dfdbb8 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Thu, 21 Jul 2022 20:46:06 +0200 Subject: [PATCH 2/4] rebase --- .../PyReleaseValidation/python/relval_steps.py | 4 ++-- DQMOffline/Configuration/python/DQMOfflineFS_cff.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 0736df59c3819..e51a4e76d568f 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3849,7 +3849,7 @@ def gen2021HiMix(fragment,howMuch): '--scenario' : 'pp' } - upgradeStepDict['FastSimRun3'][k]={'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,PAT,VALIDATION:@standardValidation,DQM:@standardDQMFS', + upgradeStepDict['FastSimRun3'][k]={'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,PAT,VALIDATION:@standardValidation,DQM:@standardDQMFS+@miniAODDQM', '--fast':'', '--era':'Run3_FastSim', '--beamspot':beamspot, @@ -3859,7 +3859,7 @@ def gen2021HiMix(fragment,howMuch): '--datatier':'GEN-SIM-DIGI-RECO,MINIAODSIM,DQMIO', '--relval':'27000,3000'} - upgradeStepDict['HARVESTFastRun3'][k]={'-s':'HARVESTING:validationHarvesting', + upgradeStepDict['HARVESTFastRun3'][k]={'-s':'HARVESTING:validationHarvesting+@miniAODDQM', '--conditions':gt, '--mc':'', '--fast':'', diff --git a/DQMOffline/Configuration/python/DQMOfflineFS_cff.py b/DQMOffline/Configuration/python/DQMOfflineFS_cff.py index 2b5854d2bdd03..ca3c0b0ade521 100644 --- a/DQMOffline/Configuration/python/DQMOfflineFS_cff.py +++ b/DQMOffline/Configuration/python/DQMOfflineFS_cff.py @@ -41,3 +41,14 @@ PostDQMOfflineMiniAOD = cms.Sequence(miniAODDQMSequence*jetMETDQMOfflineSourceMiniAOD*tracksDQMMiniAOD*topPhysicsminiAOD) PostDQMOffline = cms.Sequence() + +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 +DQMOfflineNanoAOD = cms.Sequence(nanoDQM) +#PostDQMOfflineNanoAOD = cms.Sequence(nanoDQM) +from PhysicsTools.NanoAOD.nanogenDQM_cff import nanogenDQM +DQMOfflineNanoGen = cms.Sequence(nanogenDQM) From e11f974da6435cc483c3009c38078cc31944805b Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sat, 23 Jul 2022 00:00:56 +0200 Subject: [PATCH 3/4] fix MiniaodValidation for FastSim --- Configuration/PyReleaseValidation/python/relval_steps.py | 4 ++-- Configuration/StandardSequences/python/Harvesting_cff.py | 3 +++ Validation/RecoTau/python/DQMMCValidation_cfi.py | 2 ++ Validation/RecoTau/python/RecoTauValidation_cff.py | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index e51a4e76d568f..22b685294a2a9 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3849,7 +3849,7 @@ def gen2021HiMix(fragment,howMuch): '--scenario' : 'pp' } - upgradeStepDict['FastSimRun3'][k]={'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,PAT,VALIDATION:@standardValidation,DQM:@standardDQMFS+@miniAODDQM', + upgradeStepDict['FastSimRun3'][k]={'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQMFS+@miniAODDQM', '--fast':'', '--era':'Run3_FastSim', '--beamspot':beamspot, @@ -3859,7 +3859,7 @@ def gen2021HiMix(fragment,howMuch): '--datatier':'GEN-SIM-DIGI-RECO,MINIAODSIM,DQMIO', '--relval':'27000,3000'} - upgradeStepDict['HARVESTFastRun3'][k]={'-s':'HARVESTING:validationHarvesting+@miniAODDQM', + upgradeStepDict['HARVESTFastRun3'][k]={'-s':'HARVESTING:validationHarvesting+@miniAODValidation+@standardDQMFS+@miniAODDQM', '--conditions':gt, '--mc':'', '--fast':'', diff --git a/Configuration/StandardSequences/python/Harvesting_cff.py b/Configuration/StandardSequences/python/Harvesting_cff.py index 3d23b8c52feb7..a2e1f4a25a8bc 100644 --- a/Configuration/StandardSequences/python/Harvesting_cff.py +++ b/Configuration/StandardSequences/python/Harvesting_cff.py @@ -33,6 +33,9 @@ for _entry in [hltpostvalidation]: _validationHarvesting_fastsim.remove(_entry) _validationHarvesting_fastsim.remove(hltpostvalidation) +_validationHarvesting_fastsim.remove(efficienciesTauValidationMiniAODRealData) +_validationHarvesting_fastsim.remove(efficienciesTauValidationMiniAODRealElectronsData) +_validationHarvesting_fastsim.remove(efficienciesTauValidationMiniAODRealMuonsData) from Configuration.Eras.Modifier_fastSim_cff import fastSim fastSim.toReplaceWith(validationHarvesting,_validationHarvesting_fastsim) diff --git a/Validation/RecoTau/python/DQMMCValidation_cfi.py b/Validation/RecoTau/python/DQMMCValidation_cfi.py index 4d85fe187bfb8..230e564dae3b8 100644 --- a/Validation/RecoTau/python/DQMMCValidation_cfi.py +++ b/Validation/RecoTau/python/DQMMCValidation_cfi.py @@ -30,6 +30,8 @@ produceDenominatorZMM+ produceDenominatorZTT ) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toReplaceWith(produceDenoms,produceDenoms.copyAndExclude([produceDenominatorRealData,produceDenominatorRealElectronsData,produceDenominatorRealMuonsData])) runTauEff = cms.Sequence( efficienciesQCD+ diff --git a/Validation/RecoTau/python/RecoTauValidation_cff.py b/Validation/RecoTau/python/RecoTauValidation_cff.py index 9ed8558541fd4..632c9540f09cd 100644 --- a/Validation/RecoTau/python/RecoTauValidation_cff.py +++ b/Validation/RecoTau/python/RecoTauValidation_cff.py @@ -111,3 +111,6 @@ ) tauValidationSequenceMiniAOD = cms.Sequence(tauValidationMiniAODZTT*tauValidationMiniAODZEE*tauValidationMiniAODZMM*tauValidationMiniAODQCD*tauValidationMiniAODRealData*tauValidationMiniAODRealElectronsData*tauValidationMiniAODRealMuonsData) + +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toReplaceWith(tauValidationSequenceMiniAOD,tauValidationSequenceMiniAOD.copyAndExclude([tauValidationMiniAODRealData,tauValidationMiniAODRealElectronsData,tauValidationMiniAODRealMuonsData])) From 98cf5325a13ecaae00426aee656788221b0f3ac6 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sat, 23 Jul 2022 00:08:43 +0200 Subject: [PATCH 4/4] clean up unnecessary harvesting --- Configuration/PyReleaseValidation/python/relval_steps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 22b685294a2a9..06eb4aa17c608 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3859,7 +3859,7 @@ def gen2021HiMix(fragment,howMuch): '--datatier':'GEN-SIM-DIGI-RECO,MINIAODSIM,DQMIO', '--relval':'27000,3000'} - upgradeStepDict['HARVESTFastRun3'][k]={'-s':'HARVESTING:validationHarvesting+@miniAODValidation+@standardDQMFS+@miniAODDQM', + upgradeStepDict['HARVESTFastRun3'][k]={'-s':'HARVESTING:validationHarvesting+@miniAODValidation+@miniAODDQM', '--conditions':gt, '--mc':'', '--fast':'',