Skip to content

Commit c923b8f

Browse files
cmsbuildcmsbuild
authored
Merge pull request #49098 from vlimant/mini_from_mini
[Mini from mini] v2-v4 to v6 full recipe
2 parents 36dd114 + 8e9096d commit c923b8f

25 files changed

+1229
-112
lines changed

‎Configuration/Applications/python/ConfigBuilder.py‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ def define_Configs(self):
10981098
self.VALIDATIONDefaultSeq=''
10991099
self.ENDJOBDefaultSeq='endOfProcess'
11001100
self.REPACKDefaultSeq='DigiToRawRepack'
1101-
self.PATDefaultSeq='miniAOD'
1101+
self.PATDefaultSeq='patTask'
11021102
self.PATGENDefaultSeq='miniGEN'
11031103
#TODO: Check based of file input
11041104
self.NANODefaultSeq='nanoSequence'
@@ -1118,7 +1118,6 @@ def define_Configs(self):
11181118
if self._options.isMC==True:
11191119
self.RAW2DIGIDefaultCFF="Configuration/StandardSequences/RawToDigi_cff"
11201120
self.RECODefaultCFF="Configuration/StandardSequences/Reconstruction_cff"
1121-
self.PATDefaultCFF="Configuration/StandardSequences/PATMC_cff"
11221121
self.PATGENDefaultCFF="Configuration/StandardSequences/PATGEN_cff"
11231122
self.DQMOFFLINEDefaultCFF="DQMOffline/Configuration/DQMOfflineMC_cff"
11241123
self.ALCADefaultCFF="Configuration/StandardSequences/AlCaRecoStreamsMC_cff"
@@ -1745,12 +1744,6 @@ def prepare_RAW2DIGI(self, stepSpec = "RawToDigi"):
17451744
self.scheduleSequence(_raw2digiSeq,'raw2digi_step')
17461745
return
17471746

1748-
def prepare_PATFILTER(self, stepSpec = None):
1749-
self.loadAndRemember("PhysicsTools/PatAlgos/slimming/metFilterPaths_cff")
1750-
from PhysicsTools.PatAlgos.slimming.metFilterPaths_cff import allMetFilterPaths
1751-
for filt in allMetFilterPaths:
1752-
self.schedule.append(getattr(self.process,'Flag_'+filt))
1753-
17541747
def prepare_L1HwVal(self, stepSpec = 'L1HwVal'):
17551748
''' Enrich the schedule with L1 HW validation '''
17561749
self.loadDefaultOrSpecifiedCFF(stepSpec,self.L1HwValDefaultCFF)
@@ -1822,18 +1815,20 @@ def prepare_RECOBEFMIX(self, stepSpec = "reconstruction"):
18221815
self.scheduleSequence(_recobefmixSeq,'reconstruction_befmix_step')
18231816
return
18241817

1825-
def prepare_PAT(self, stepSpec = "miniAOD"):
1818+
def prepare_PAT(self, stepSpec = "patTask"):
18261819
''' Enrich the schedule with PAT '''
1827-
self.prepare_PATFILTER(self)
1828-
self.loadDefaultOrSpecifiedCFF(stepSpec,self.PATDefaultCFF)
1829-
self.labelsToAssociate.append('patTask')
1820+
_,pat_sequence,pat_cff = self.loadDefaultOrSpecifiedCFF(stepSpec,self.PATDefaultCFF)
1821+
## handle the noise filters as Flag_* path that were loaded
1822+
for existing_path,path_ in self.process.paths_().items():
1823+
if existing_path.startswith('Flag_'):
1824+
print(f'scheduling {existing_path} as part of PAT configuration')
1825+
self.schedule.append( path_ )
1826+
1827+
self.labelsToAssociate.append(pat_sequence)
18301828
if self._options.isData:
1831-
self._options.customisation_file_unsch.insert(0,"PhysicsTools/PatAlgos/slimming/miniAOD_tools.miniAOD_customizeAllData")
1829+
self._options.customisation_file_unsch.insert(0,f"{pat_cff}.miniAOD_customizeAllData")
18321830
else:
1833-
if self._options.fast:
1834-
self._options.customisation_file_unsch.insert(0,"PhysicsTools/PatAlgos/slimming/miniAOD_tools.miniAOD_customizeAllMCFastSim")
1835-
else:
1836-
self._options.customisation_file_unsch.insert(0,"PhysicsTools/PatAlgos/slimming/miniAOD_tools.miniAOD_customizeAllMC")
1831+
self._options.customisation_file_unsch.insert(0,f"{pat_cff}.miniAOD_customizeAllMC")
18371832

18381833
if self._options.hltProcess:
18391834
self._customise_coms.append( f'process.patTrigger.processName = "{self._options.hltProcess}"')

‎Configuration/ProcessModifiers/python/run2_miniAOD_miniAODUL_cff.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This modifier is for common settings to run miniAOD on top of
4+
# ultra-legacy (during LS2) Run-2 MINIAOD
5+
6+
run2_miniAOD_miniAODUL = cms.Modifier()

‎Configuration/ProcessModifiers/python/run3_miniAOD_miniAODpre142X_cff.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# This modifier is for common settings to run miniAOD on top of
4+
# Run-3 MINIAOD produced prior to 14.2 release
5+
6+
run3_miniAOD_miniAODpre142X = cms.Modifier()

‎Configuration/PyReleaseValidation/python/relval_nano.py‎

Lines changed: 85 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,60 @@ def next(self, index: int = None) -> None:
7979
'--customise': '"Configuration/DataProcessing/Utils.addMonitoring"'
8080
}])
8181
_HARVEST_mc = merge([_HARVEST_nano, {'--mc': ''}])
82+
## the validation sequence VALIDATION:@miniAODValidation will not function on M2M, because it requires AOD-bound collections TBF
83+
## the dqm sequence DQM:@miniAODDQM will not function on M2M, because it requires AOD-bound collections TBF
84+
#_MINI_from_MINI = {'-s': 'PAT:Configuration/StandardSequences/REMINI_cff.patAlgosToolsTask,DQM:@miniAODDQM',
85+
# '--process': 'M2M'}
86+
_MINI_from_MINI = {'-s': 'PAT:Configuration/StandardSequences/REMINI_cff.patAlgosToolsTask',
87+
'--eventcontent' : 'MINIAODSIM',
88+
'--datatier' : 'MINIAODSIM',
89+
'--process': 'M2M'}
90+
_MINI_from_MINI_data = merge([{'--data': '',
91+
'--eventcontent' : 'MINIAOD',
92+
'--datatier' : 'MINIAOD'},
93+
_MINI_from_MINI])
8294
steps['HRV_NANO_mc'] = _HARVEST_mc
95+
steps['HRV3_NANO_mc'] = merge([{'--filein':'file:step3_inDQM.root'},
96+
_HARVEST_mc])
8397
steps['HRV_NANO_data'] = _HARVEST_data
98+
steps['HRV3_NANO_data'] = merge([{'--filein':'file:step3_inDQM.root'},
99+
_HARVEST_data])
84100

85101
################################################################
86102
# 10.6 INPUT and workflows
103+
steps['TTbarAOD10.6_UL16APV'] = {'INPUT': InputInfo(
104+
location='STD', dataSet='/TTJets_SingleLeptFromT_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16RECOAPV-106X_mcRun2_asymptotic_preVFP_v8-v2/AODSIM')}
105+
steps['MINI_mc10.6ul16APV'] = merge([{'--procModifiers':'run2_miniAOD_UL'}, steps['REMINIAOD_mc2016UL_preVFP']])
106+
steps['M2M_mc10.6ul16APV'] = merge([_MINI_from_MINI, {'--procModifiers':'run2_miniAOD_miniAODUL'} ,steps['MINI_mc10.6ul16APV']])
107+
steps['TTbarMINIAOD10.6_UL16APVv2'] = {'INPUT': InputInfo(
108+
location='STD', dataSet='/TTJets_SingleLeptFromT_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16MiniAODAPVv2-106X_mcRun2_asymptotic_preVFP_v11-v2/MINIAODSIM')}
109+
steps['NANO_mc10.6ul16APVv2'] = merge([{'--era': 'Run2_2016_HIPM,run2_nanoAOD_106Xv2',
110+
'--conditions': 'auto:run2_mc'},
111+
_NANO_mc])
112+
steps['TTbarAOD10.6_UL16'] = {'INPUT': InputInfo(
113+
location='STD', dataSet='/TTJets_SingleLeptFromT_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16RECO-106X_mcRun2_asymptotic_v13-v2/AODSIM')}
114+
steps['MINI_mc10.6ul16'] = merge([{'--procModifiers':'run2_miniAOD_UL'}, steps['REMINIAOD_mc2016UL_postVFP']])
115+
steps['M2M_mc10.6ul16'] = merge([_MINI_from_MINI, {'--procModifiers':'run2_miniAOD_miniAODUL'} ,steps['MINI_mc10.6ul16']])
87116
steps['TTbarMINIAOD10.6_UL16v2'] = {'INPUT': InputInfo(
88117
location='STD', dataSet='/TTJets_SingleLeptFromT_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL16MiniAODv2-106X_mcRun2_asymptotic_v17-v2/MINIAODSIM')}
89118
steps['NANO_mc10.6ul16v2'] = merge([{'--era': 'Run2_2016,run2_nanoAOD_106Xv2',
90119
'--conditions': 'auto:run2_mc'},
91120
_NANO_mc])
92121
# 2017 looking Monte-Carlo: two versions in 10.6
122+
steps['TTbarAOD10.6_UL17'] = {'INPUT': InputInfo(
123+
location='STD', dataSet='/TTJets_SingleLeptFromT_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL17RECO-106X_mc2017_realistic_v6-v2/AODSIM')}
124+
steps['MINI_mc10.6ul17'] = merge([{'--procModifiers':'run2_miniAOD_UL'}, steps['REMINIAOD_mc2017UL']])
125+
steps['M2M_mc10.6ul17'] = merge([_MINI_from_MINI, {'--procModifiers':'run2_miniAOD_miniAODUL'} ,steps['MINI_mc10.6ul17']])
93126
steps['TTbarMINIAOD10.6_UL17v2'] = {'INPUT': InputInfo(
94127
location='STD', dataSet='/TTJets_SingleLeptFromT_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL17MiniAODv2-106X_mc2017_realistic_v9-v2/MINIAODSIM')}
95128
steps['NANO_mc10.6ul17v2'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_106Xv2',
96129
'--conditions': 'auto:phase1_2017_realistic'},
97130
_NANO_mc])
98131

132+
steps['TTbarAOD10.6_UL18'] = {'INPUT': InputInfo(
133+
location='STD', dataSet='/TTJets_SingleLeptFromT_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL18RECO-106X_upgrade2018_realistic_v11_L1v1-v2/AODSIM')}
134+
steps['MINI_mc10.6ul18'] = merge([{'--procModifiers':'run2_miniAOD_UL'}, steps['REMINIAOD_mc2018UL']])
135+
steps['M2M_mc10.6ul18'] = merge([_MINI_from_MINI, {'--procModifiers':'run2_miniAOD_miniAODUL'} ,steps['MINI_mc10.6ul18']])
99136
steps['TTbarMINIAOD10.6_UL18v2'] = {'INPUT': InputInfo(
100137
location='STD', dataSet='/TTJets_SingleLeptFromT_TuneCP5_13TeV-madgraphMLM-pythia8/RunIISummer20UL18MiniAODv2-106X_upgrade2018_realistic_v16_L1v1-v2/MINIAODSIM')}
101138
steps['NANO_mc10.6ul18v2'] = merge([{'--era': 'Run2_2018,run2_nanoAOD_106Xv2',
@@ -105,25 +142,29 @@ def next(self, index: int = None) -> None:
105142
# HIPM_UL2016_MiniAODv2 campaign is CMSSW_10_6_25
106143
steps['MuonEG2016MINIAOD10.6v2'] = {'INPUT': InputInfo(location='STD', ls=run2_lumis,
107144
dataSet='/MuonEG/Run2016E-HIPM_UL2016_MiniAODv2-v2/MINIAOD')}
145+
steps['M2M_data10.6ul16'] = merge([_MINI_from_MINI_data, {'--procModifiers':'run2_miniAOD_miniAODUL'}, steps['REMINIAOD_data2016UL']])
108146
steps['NANO_data10.6ul16v2'] = merge([{'--era': 'Run2_2016_HIPM,run2_nanoAOD_106Xv2',
109147
'--conditions': 'auto:run2_data'},
110148
_NANO_data])
111149
# UL2017_MiniAODv2 campaign is CMSSW_10_6_20
112150
steps['MuonEG2017MINIAOD10.6v2'] = {'INPUT': InputInfo(location='STD', ls=run2_lumis,
113151
dataSet='/MuonEG/Run2017F-UL2017_MiniAODv2-v1/MINIAOD')}
152+
steps['M2M_data10.6ul17'] = merge([_MINI_from_MINI_data, {'--procModifiers':'run2_miniAOD_miniAODUL'}, steps['REMINIAOD_data2017UL']])
114153
steps['NANO_data10.6ul17v2'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_106Xv2',
115154
'--conditions': 'auto:run2_data'},
116155
_NANO_data])
117156

118157
# UL2018_MiniAODv2 campaign is CMSSW_10_6_20
119158
steps['MuonEG2018MINIAOD10.6v2'] = {'INPUT': InputInfo(location='STD', ls=run2_lumis,
120159
dataSet='/MuonEG/Run2018D-UL2018_MiniAODv2-v1/MINIAOD')}
160+
steps['M2M_data10.6ul18'] = merge([_MINI_from_MINI_data, {'--procModifiers':'run2_miniAOD_miniAODUL'}, steps['REMINIAOD_data2018UL']])
121161
steps['NANO_data10.6ul18v2'] = merge([{'--era': 'Run2_2018,run2_nanoAOD_106Xv2',
122162
'--conditions': 'auto:run2_data'},
123163
_NANO_data])
124164

125165
################################################################
126166
# Run2UL re-MINI/NANO
167+
## below: nano steps in current release, using MINI redone with the current release, either from AOD or MINIAOD
127168
steps['NANO_mc_UL16APVreMINI'] = merge([{'--era': 'Run2_2016_HIPM',
128169
'--conditions': 'auto:run2_mc_pre_vfp'},
129170
_NANO_mc])
@@ -171,10 +212,21 @@ def next(self, index: int = None) -> None:
171212
# 13.0 workflows
172213
steps['TTbarMINIAOD13.0'] = {'INPUT': InputInfo(
173214
location='STD', dataSet='/TTtoLNu2Q_TuneCP5_13p6TeV_powheg-pythia8/Run3Summer23MiniAODv4-130X_mcRun3_2023_realistic_v14-v2/MINIAODSIM')}
174-
215+
steps['M2M_mc13.0s23'] = merge([{'--era': 'Run3', '--conditions': 'auto:phase1_2023_realistic', '--procModifier': 'run3_miniAOD_miniAODpre142X'},
216+
steps['M2M_mc10.6ul18']])
175217
steps['NANO_mc13.0'] = merge([{'--era': 'Run3,run3_nanoAOD_pre142X', '--conditions': 'auto:phase1_2023_realistic'},
176218
_NANO_mc])
177-
219+
## below: nano steps in current release, using MINI redone with the current release, either from AOD or MINIAOD
220+
steps['NANO_mc_S23reMINI'] = merge([{'--era': 'Run3', '--conditions': 'auto:phase1_2023_realistic'},
221+
_NANO_mc])
222+
#steps['NANO_mc_S22reMINI'] = merge([{'--era': 'Run3', '--conditions': 'auto:phase1_2023_realistic'},## fig GT
223+
# _NANO_mc])
224+
#steps['NANO_mc_S22EEreMINI'] = merge([{'--era': 'Run3', '--conditions': 'auto:phase1_2023_realistic'},## fig GT
225+
# _NANO_mc])
226+
#steps['NANO_mc_S23reMINI'] = merge([{'--era': 'Run3_2023', '--conditions': 'auto:phase1_2023_realistic'},## fit GT
227+
# _NANO_mc])
228+
#steps['NANO_mc_S23BPixreMINI'] = merge([{'--era': 'Run3_2023', '--conditions': 'auto:phase1_2023_realistic'},## fix GT
229+
# _NANO_mc])
178230

179231
# 13.0 workflows -- data
180232
steps['MuonEG2023MINIAOD13.0'] = {'INPUT': InputInfo(location='STD', ls={368489: [[46, 546]]},
@@ -186,9 +238,11 @@ def next(self, index: int = None) -> None:
186238
steps['ScoutingPFMonitor_Run2023D_RAW_130X'] = {'INPUT': InputInfo(
187239
dataSet='/ScoutingPFMonitor/Run2023D-v1/RAW', label='2023D', events=100000, location='STD', ls=Run2023D)}
188240

241+
steps['M2M_data13.0'] = merge([_MINI_from_MINI_data, {'--era': 'Run3', '--conditions': 'auto:run3_data', '--procModifier': 'run3_miniAOD_miniAODpre142X'}])
189242
steps['NANO_data13.0'] = merge([{'--era': 'Run3_2023,run3_nanoAOD_pre142X', '--conditions': 'auto:run3_data'},
190243
_NANO_data])
191-
244+
steps['NANO_data_23reMINI'] = merge([{'--era': 'Run3_2023', '--conditions': 'auto:run3_data'},
245+
_NANO_data])
192246
steps['NANO_data13.0_prompt'] = merge([{'-s': 'NANO:@Prompt,DQM:@nanoAODDQM', '-n': '1000'},
193247
steps['NANO_data13.0']])
194248

@@ -428,6 +482,7 @@ def next(self, index: int = None) -> None:
428482
######## 2500.0xxx ########
429483
# Run2, 10_6_X MiniAOD input (current recommendation for 2016--2018)
430484
workflows[_wfn()] = ['NANOmc106Xul16v2', ['TTbarMINIAOD10.6_UL16v2', 'NANO_mc10.6ul16v2', 'HRV_NANO_mc']]
485+
workflows[_wfn()] = ['NANOmc106Xul16APVv2', ['TTbarMINIAOD10.6_UL16APVv2', 'NANO_mc10.6ul16APVv2', 'HRV_NANO_mc']]
431486
workflows[_wfn()] = ['NANOmc106Xul17v2', ['TTbarMINIAOD10.6_UL17v2', 'NANO_mc10.6ul17v2', 'HRV_NANO_mc']]
432487
workflows[_wfn()] = ['NANOmc106Xul18v2', ['TTbarMINIAOD10.6_UL18v2', 'NANO_mc10.6ul18v2', 'HRV_NANO_mc']]
433488

@@ -438,16 +493,27 @@ def next(self, index: int = None) -> None:
438493

439494
# Run2, 10_6_X AOD, reMINI+reNANO
440495
_wfn.subnext()
441-
workflows[_wfn()] = ['NANOmcUL16APVreMINI', ['TTbar_13_reminiaod2016UL_preVFP_INPUT', 'REMINIAOD_mc2016UL_preVFP', 'NANO_mc_UL16APVreMINI', 'HRV_NANO_mc']] # noqa
442-
workflows[_wfn()] = ['NANOmcUL16reMINI', ['TTbar_13_reminiaod2016UL_postVFP_INPUT', 'REMINIAOD_mc2016UL_postVFP', 'NANO_mc_UL16reMINI', 'HRV_NANO_mc']] # noqa
443-
workflows[_wfn()] = ['NANOmcUL17reMINI', ['TTbar_13_reminiaod2017UL_INPUT', 'REMINIAOD_mc2017UL', 'NANO_mc_UL17reMINI', 'HRV_NANO_mc']] # noqa
444-
workflows[_wfn()] = ['NANOmcUL18reMINI', ['TTbar_13_reminiaod2018UL_INPUT', 'REMINIAOD_mc2018UL', 'NANO_mc_UL18reMINI', 'HRV_NANO_mc']] # noqa
496+
workflows[_wfn()] = ['NANOmcUL16APVreMINI', ['TTbarAOD10.6_UL16APV', 'MINI_mc10.6ul16APV', 'NANO_mc_UL16APVreMINI', 'HRV3_NANO_mc']]
497+
workflows[_wfn()] = ['NANOmcUL16reMINI', ['TTbarAOD10.6_UL16', 'MINI_mc10.6ul16', 'NANO_mc_UL16reMINI', 'HRV3_NANO_mc']]
498+
workflows[_wfn()] = ['NANOmcUL17reMINI', ['TTbarAOD10.6_UL17', 'MINI_mc10.6ul17', 'NANO_mc_UL17reMINI', 'HRV3_NANO_mc']]
499+
workflows[_wfn()] = ['NANOmcUL18reMINI', ['TTbarAOD10.6_UL18', 'MINI_mc10.6ul18', 'NANO_mc_UL18reMINI', 'HRV3_NANO_mc']]
500+
501+
_wfn.subnext()
502+
workflows[_wfn()] = ['NANOdataUL16APVreMINI', ['RunJetHT2016E_reminiaodUL', 'REMINIAOD_data2016UL_HIPM', 'NANO_data_UL16APVreMINI', 'HRV3_NANO_data']] # noqa
503+
workflows[_wfn()] = ['NANOdataUL16reMINI', ['RunJetHT2016H_reminiaodUL', 'REMINIAOD_data2016UL', 'NANO_data_UL16reMINI', 'HRV3_NANO_data']] # noqa
504+
workflows[_wfn()] = ['NANOdataUL17reMINI', ['RunJetHT2017F_reminiaodUL', 'REMINIAOD_data2017UL', 'NANO_data_UL17reMINI', 'HRV3_NANO_data']] # noqa
505+
workflows[_wfn()] = ['NANOdataUL18reMINI', ['RunJetHT2018D_reminiaodUL', 'REMINIAOD_data2018UL', 'NANO_data_UL18reMINI', 'HRV3_NANO_data']] # noqa
445506

446507
_wfn.subnext()
447-
workflows[_wfn()] = ['NANOdataUL16APVreMINI', ['RunJetHT2016E_reminiaodUL', 'REMINIAOD_data2016UL_HIPM', 'NANO_data_UL16APVreMINI', 'HRV_NANO_data']] # noqa
448-
workflows[_wfn()] = ['NANOdataUL16reMINI', ['RunJetHT2016H_reminiaodUL', 'REMINIAOD_data2016UL', 'NANO_data_UL16reMINI', 'HRV_NANO_data']] # noqa
449-
workflows[_wfn()] = ['NANOdataUL17reMINI', ['RunJetHT2017F_reminiaodUL', 'REMINIAOD_data2017UL', 'NANO_data_UL17reMINI', 'HRV_NANO_data']] # noqa
450-
workflows[_wfn()] = ['NANOdataUL18reMINI', ['RunJetHT2018D_reminiaodUL', 'REMINIAOD_data2018UL', 'NANO_data_UL18reMINI', 'HRV_NANO_data']] # noqa
508+
workflows[_wfn()] = ['NANOmcUL16APVMini2Mini', ['TTbarMINIAOD10.6_UL16APVv2', 'M2M_mc10.6ul16APV', 'NANO_mc_UL16APVreMINI', 'HRV3_NANO_mc']]
509+
workflows[_wfn()] = ['NANOmcUL16Mini2Mini', ['TTbarMINIAOD10.6_UL16v2', 'M2M_mc10.6ul16', 'NANO_mc_UL16reMINI', 'HRV3_NANO_mc']]
510+
workflows[_wfn()] = ['NANOmcUL17Mini2Mini', ['TTbarMINIAOD10.6_UL17v2', 'M2M_mc10.6ul17', 'NANO_mc_UL17reMINI', 'HRV3_NANO_mc']]
511+
workflows[_wfn()] = ['NANOmcUL18Mini2Mini', ['TTbarMINIAOD10.6_UL18v2', 'M2M_mc10.6ul18', 'NANO_mc_UL18reMINI', 'HRV3_NANO_mc']]
512+
513+
_wfn.subnext()
514+
workflows[_wfn()] = ['NANOdataUL16Mini2Mini', ['MuonEG2016MINIAOD10.6v2', 'M2M_data10.6ul16', 'NANO_data_UL16reMINI', 'HRV3_NANO_data']]
515+
workflows[_wfn()] = ['NANOdataUL17Mini2Mini', ['MuonEG2017MINIAOD10.6v2', 'M2M_data10.6ul17', 'NANO_data_UL17reMINI', 'HRV3_NANO_data']]
516+
workflows[_wfn()] = ['NANOdataUL18Mini2Mini', ['MuonEG2018MINIAOD10.6v2', 'M2M_data10.6ul18', 'NANO_data_UL18reMINI', 'HRV3_NANO_data']]
451517

452518
_wfn.next(1)
453519
######## 2500.1xxx ########
@@ -457,6 +523,12 @@ def next(self, index: int = None) -> None:
457523
_wfn.subnext()
458524
workflows[_wfn()] = ['NANOdata130Xrun3', ['MuonEG2023MINIAOD13.0', 'NANO_data13.0', 'HRV_NANO_data']]
459525

526+
_wfn.subnext()
527+
workflows[_wfn()] = ['NANOmc23Mini2Mini', ['TTbarMINIAOD13.0', 'M2M_mc13.0s23', 'NANO_mc_S23reMINI', 'HRV3_NANO_mc']]
528+
529+
_wfn.subnext()
530+
workflows[_wfn()] = ['NANOdata23Mini2Mini', ['MuonEG2023MINIAOD13.0', 'M2M_data13.0', 'NANO_data_23reMINI', 'HRV3_NANO_data']]
531+
460532
# POG/PAG custom NANOs, MC
461533
_wfn.subnext()
462534

@@ -520,11 +592,11 @@ def next(self, index: int = None) -> None:
520592

521593
# MINIv6+NANOv15, MC
522594
_wfn.subnext()
523-
workflows[_wfn()] = ['NANOmc2024reMINI', ['TTbar_13p6_Summer24_AOD_140X', 'REMINIAOD_mc2024', 'NANO_mc_Summer24_reMINI', 'HRV_NANO_mc']] # noqa
595+
workflows[_wfn()] = ['NANOmc2024reMINI', ['TTbar_13p6_Summer24_AOD_140X', 'REMINIAOD_mc2024', 'NANO_mc_Summer24_reMINI', 'HRV3_NANO_mc']] # noqa
524596

525597
# MINIv6+NANOv15, data
526598
_wfn.subnext()
527-
workflows[_wfn()] = ['NANOdata2024reMINI', ['JetMET1_Run2024H_AOD_140X', 'REMINIAOD_data2024', 'NANO_data_2024_reMINI', 'HRV_NANO_data']] # noqa
599+
workflows[_wfn()] = ['NANOdata2024reMINI', ['JetMET1_Run2024H_AOD_140X', 'REMINIAOD_data2024', 'NANO_data_2024_reMINI', 'HRV3_NANO_data']] # noqa
528600

529601
_wfn.next(3)
530602
######## 2500.3xxx ########

‎Configuration/StandardSequences/python/PATMC_cff.py‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Configuration/StandardSequences/python/PAT_cff.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@
1212
bunchSpacingProducer
1313
)
1414

15-
miniAOD=cms.Sequence()
15+
from PhysicsTools.PatAlgos.slimming.miniAOD_tools import miniAOD_customizeAllData
16+
from PhysicsTools.PatAlgos.slimming.miniAOD_tools import miniAOD_customizeAllMC
17+
18+
## include cms.Path defined from event filters
19+
from PhysicsTools.PatAlgos.slimming.metFilterPaths_cff import *

‎Configuration/StandardSequences/python/REMINI_cff.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
patAlgosToolsTask = cms.Task()
4+
5+
from PhysicsTools.PatAlgos.slimming.miniAODFromMiniAOD_tools import miniAODFromMiniAOD_customizeAllData as miniAOD_customizeAllData
6+
from PhysicsTools.PatAlgos.slimming.miniAODFromMiniAOD_tools import miniAODFromMiniAOD_customizeAllMC as miniAOD_customizeAllMC
7+

0 commit comments

Comments
 (0)