Skip to content
Merged
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 @@ -4516,7 +4516,7 @@ def gen2024HiMix(fragment,howMuch):
'--datatier' : 'MINIAOD,NANOAOD,DQMIO'
}])
# reMINI 2024
steps['REMINIAOD_data2024'] = merge([{'--era' : 'Run3_2024', '--conditions' : 'auto:run3_data'}, steps['REMINIAOD_data2018UL']])
steps['REMINIAOD_data2024'] = merge([{'--era' : 'Run3_2024', '--conditions' : 'auto:run3_data'}, remove(steps['REMINIAOD_data2018UL'], '--procModifiers')])


# Not sure whether the customisations are in the dict as "--customise" or "--era" so try to
Expand Down Expand Up @@ -4549,7 +4549,7 @@ def gen2024HiMix(fragment,howMuch):
steps['REMINIAOD_mc2017UL']=merge([{'--era':'Run2_2017','--procModifiers':'run2_miniAOD_UL_preSummer20'},steps['REMINIAOD_mc2017']])
steps['REMINIAOD_mc2018UL']=merge([{'--conditions':'auto:phase1_2018_realistic','--era':'Run2_2018','--procModifiers':'run2_miniAOD_UL_preSummer20'},steps['REMINIAOD_mc2017']])
# reMINI 2024
steps['REMINIAOD_mc2024'] = merge([{'--conditions': 'auto:phase1_2024_realistic', '--era': 'Run3'}, steps['REMINIAOD_mc2018UL']])
steps['REMINIAOD_mc2024'] = merge([{'--conditions': 'auto:phase1_2024_realistic', '--era': 'Run3'}, remove(steps['REMINIAOD_mc2018UL'], '--procModifiers')])

#steps['MINIAODDATA'] =merge([stepMiniAODData])
#steps['MINIAODDreHLT'] =merge([{'--conditions':'auto:run1_data_%s'%menu},stepMiniAODData])
Expand Down
11 changes: 3 additions & 8 deletions DQMOffline/RecoB/python/bTagMiniDQM_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@


# For DQM
bTagMiniDQMSource = cms.Sequence(bTagSVDQM, patJetsSVInfoTask)
bTagMiniDQMSource = cms.Sequence()
bTagMiniDQMHarvesting = cms.Sequence()

# For Validation
bTagMiniValidationSource = cms.Sequence(bTagSVDQM, patJetsSVInfoTask)
bTagMiniValidationSource = cms.Sequence()
bTagMiniValidationHarvesting = cms.Sequence()

#####################################################################################
Expand Down Expand Up @@ -193,26 +193,21 @@ def addSequences(Analyzer, Harvester, discriminators, regions, globalPSet, label
#
#####################################################################################
from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
from Configuration.ProcessModifiers.miniAOD_skip_trackExtras_cff import miniAOD_skip_trackExtras

toExcludeDQMSource_pp_on_AA = [
bTagSVDQM,
patJetsSVInfoTask,
patJetsPuppiTagInfoAnalyzerDQM,
patJetsPuppiForwardTagInfoAnalyzerDQM,
]

toExcludeValidationSource_pp_on_AA = [
bTagSVDQM,
patJetsSVInfoTask,
patJetsPuppiTagInfoAnalyzerValidation,
patJetsPuppiTagInfoAnalyzerBJetsValidation,
patJetsPuppiTagInfoAnalyzerCJetsValidation,
patJetsPuppiTagInfoAnalyzerLJetsValidation,
patJetsPuppiForwardTagInfoAnalyzerValidation
]

_mAOD = (pp_on_AA | miniAOD_skip_trackExtras)
_mAOD = (pp_on_AA)
_mAOD.toReplaceWith(bTagMiniDQMSource, bTagMiniDQMSource.copyAndExclude(toExcludeDQMSource_pp_on_AA))
_mAOD.toReplaceWith(bTagMiniValidationSource, bTagMiniValidationSource.copyAndExclude(toExcludeValidationSource_pp_on_AA))