diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 1c757c038437d..1e38146c6954a 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -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 @@ -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]) diff --git a/DQMOffline/RecoB/python/bTagMiniDQM_cff.py b/DQMOffline/RecoB/python/bTagMiniDQM_cff.py index a2c4c0e173710..d3c7e265f0573 100644 --- a/DQMOffline/RecoB/python/bTagMiniDQM_cff.py +++ b/DQMOffline/RecoB/python/bTagMiniDQM_cff.py @@ -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() ##################################################################################### @@ -193,18 +193,13 @@ 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, @@ -212,7 +207,7 @@ def addSequences(Analyzer, Harvester, discriminators, regions, globalPSet, label 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))