Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add miniAODDQM FastSim Validation #38736

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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+@miniAODValidation,DQM:@standardDQMFS+@miniAODDQM',
'--fast':'',
'--era':'Run3_FastSim',
'--beamspot':beamspot,
Expand All @@ -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+@miniAODValidation+@miniAODDQM',
'--conditions':gt,
'--mc':'',
'--fast':'',
Expand Down
3 changes: 3 additions & 0 deletions Configuration/StandardSequences/python/Harvesting_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
29 changes: 29 additions & 0 deletions DQMOffline/Configuration/python/DQMOfflineFS_cff.py
Original file line number Diff line number Diff line change
@@ -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 *
Expand All @@ -22,4 +23,32 @@
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()

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)
17 changes: 9 additions & 8 deletions DQMOffline/Muon/python/muonAnalyzer_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand All @@ -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]))
2 changes: 2 additions & 0 deletions Validation/RecoTau/python/DQMMCValidation_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -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+
Expand Down
3 changes: 3 additions & 0 deletions Validation/RecoTau/python/RecoTauValidation_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]))