Skip to content

Commit 2f221c7

Browse files
vlimantvlimant
committed
more Mini from Mini test workflows, and fix to harvesting of the appropriate step
1 parent 1a552c6 commit 2f221c7

File tree

1 file changed

+42
-18
lines changed

1 file changed

+42
-18
lines changed

‎Configuration/PyReleaseValidation/python/relval_nano.py‎

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,20 @@ 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 under a proc-Modifier
83-
_MIMI_from_MINI = {'-s': 'PAT:Configuration/StandardSequences/REMINI_cff.patAlgosToolsTask,DQM:@miniAODDQM',
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+
#_MIMI_from_MINI = {'-s': 'PAT:Configuration/StandardSequences/REMINI_cff.patAlgosToolsTask,DQM:@miniAODDQM',
85+
# '--process': 'M2M'}
86+
_MIMI_from_MINI = {'-s': 'PAT:Configuration/StandardSequences/REMINI_cff.patAlgosToolsTask',
87+
'--eventcontent' : 'MINIAODSIM',
88+
'--datatier' : 'MINIAODSIM',
8489
'--process': 'M2M'}
8590
steps['HRV_NANO_mc'] = _HARVEST_mc
91+
steps['HRV3_NANO_mc'] = merge([{'--filein':'file:step3_inDQM.root'},
92+
_HARVEST_mc])
8693
steps['HRV_NANO_data'] = _HARVEST_data
94+
steps['HRV3_NANO_data'] = merge([{'--filein':'file:step3_inDQM.root'},
95+
_HARVEST_data])
8796

8897
################################################################
8998
# 10.6 INPUT and workflows
@@ -148,6 +157,7 @@ def next(self, index: int = None) -> None:
148157

149158
################################################################
150159
# Run2UL re-MINI/NANO
160+
## below: nano steps in current release, using MINI redone with the current release, either from AOD or MINIAOD
151161
steps['NANO_mc_UL16APVreMINI'] = merge([{'--era': 'Run2_2016_HIPM',
152162
'--conditions': 'auto:run2_mc_pre_vfp'},
153163
_NANO_mc])
@@ -178,10 +188,21 @@ def next(self, index: int = None) -> None:
178188
# 13.0 workflows
179189
steps['TTbarMINIAOD13.0'] = {'INPUT': InputInfo(
180190
location='STD', dataSet='/TTtoLNu2Q_TuneCP5_13p6TeV_powheg-pythia8/Run3Summer23MiniAODv4-130X_mcRun3_2023_realistic_v14-v2/MINIAODSIM')}
181-
191+
steps['M2M_mc13.0'] = merge([{'--era': 'Run3', '--conditions': 'auto:phase1_2023_realistic', '--procModifier': 'run3_miniAOD_miniAODpre142X'},
192+
steps['M2M_mc10.6ul18']])
182193
steps['NANO_mc13.0'] = merge([{'--era': 'Run3,run3_nanoAOD_pre142X', '--conditions': 'auto:phase1_2023_realistic'},
183194
_NANO_mc])
184-
195+
## below: nano steps in current release, using MINI redone with the current release, either from AOD or MINIAOD
196+
steps['NANO_mc_reMINI'] = merge([{'--era': 'Run3', '--conditions': 'auto:phase1_2023_realistic'},
197+
_NANO_mc])
198+
#steps['NANO_mc_S22reMINI'] = merge([{'--era': 'Run3', '--conditions': 'auto:phase1_2023_realistic'},## fig GT
199+
# _NANO_mc])
200+
#steps['NANO_mc_S22EEreMINI'] = merge([{'--era': 'Run3', '--conditions': 'auto:phase1_2023_realistic'},## fig GT
201+
# _NANO_mc])
202+
#steps['NANO_mc_S23reMINI'] = merge([{'--era': 'Run3_2023', '--conditions': 'auto:phase1_2023_realistic'},## fit GT
203+
# _NANO_mc])
204+
#steps['NANO_mc_S23BPixreMINI'] = merge([{'--era': 'Run3_2023', '--conditions': 'auto:phase1_2023_realistic'},## fix GT
205+
# _NANO_mc])
185206

186207
# 13.0 workflows -- data
187208
steps['MuonEG2023MINIAOD13.0'] = {'INPUT': InputInfo(location='STD', ls={368489: [[46, 546]]},
@@ -440,22 +461,22 @@ def next(self, index: int = None) -> None:
440461
workflows[_wfn()] = ['NANOmcPreUL17reMINI', ['TTbar_13_reminiaod2017UL_INPUT', 'REMINIAOD_mc2017UL', 'NANO_mc_UL17reMINI', 'HRV_NANO_mc']] # noqa
441462
workflows[_wfn()] = ['NANOmcPreUL18reMINI', ['TTbar_13_reminiaod2018UL_INPUT', 'REMINIAOD_mc2018UL', 'NANO_mc_UL18reMINI', 'HRV_NANO_mc']] # noqa
442463

443-
workflows[_wfn()] = ['NANOmcUL16APVreMINI', ['TTbarAOD10.6_UL16APV', 'MINI_mc10.6ul16APV', 'NANO_mc_UL16APVreMINI', 'HRV_NANO_mc']]
444-
workflows[_wfn()] = ['NANOmcUL16reMINI', ['TTbarAOD10.6_UL16', 'MINI_mc10.6ul16', 'NANO_mc_UL16reMINI', 'HRV_NANO_mc']]
445-
workflows[_wfn()] = ['NANOmcUL17reMINI', ['TTbarAOD10.6_UL17', 'MINI_mc10.6ul17', 'NANO_mc_UL17reMINI', 'HRV_NANO_mc']]
446-
workflows[_wfn()] = ['NANOmcUL18reMINI', ['TTbarAOD10.6_UL18', 'MINI_mc10.6ul18', 'NANO_mc_UL18reMINI', 'HRV_NANO_mc']]
464+
workflows[_wfn()] = ['NANOmcUL16APVreMINI', ['TTbarAOD10.6_UL16APV', 'MINI_mc10.6ul16APV', 'NANO_mc_UL16APVreMINI', 'HRV3_NANO_mc']]
465+
workflows[_wfn()] = ['NANOmcUL16reMINI', ['TTbarAOD10.6_UL16', 'MINI_mc10.6ul16', 'NANO_mc_UL16reMINI', 'HRV3_NANO_mc']]
466+
workflows[_wfn()] = ['NANOmcUL17reMINI', ['TTbarAOD10.6_UL17', 'MINI_mc10.6ul17', 'NANO_mc_UL17reMINI', 'HRV3_NANO_mc']]
467+
workflows[_wfn()] = ['NANOmcUL18reMINI', ['TTbarAOD10.6_UL18', 'MINI_mc10.6ul18', 'NANO_mc_UL18reMINI', 'HRV3_NANO_mc']]
447468

448469
_wfn.subnext()
449-
workflows[_wfn()] = ['NANOdataUL16APVreMINI', ['RunJetHT2016E_reminiaodUL', 'REMINIAOD_data2016UL_HIPM', 'NANO_data_UL16APVreMINI', 'HRV_NANO_data']] # noqa
450-
workflows[_wfn()] = ['NANOdataUL16reMINI', ['RunJetHT2016H_reminiaodUL', 'REMINIAOD_data2016UL', 'NANO_data_UL16reMINI', 'HRV_NANO_data']] # noqa
451-
workflows[_wfn()] = ['NANOdataUL17reMINI', ['RunJetHT2017F_reminiaodUL', 'REMINIAOD_data2017UL', 'NANO_data_UL17reMINI', 'HRV_NANO_data']] # noqa
452-
workflows[_wfn()] = ['NANOdataUL18reMINI', ['RunJetHT2018D_reminiaodUL', 'REMINIAOD_data2018UL', 'NANO_data_UL18reMINI', 'HRV_NANO_data']] # noqa
470+
workflows[_wfn()] = ['NANOdataUL16APVreMINI', ['RunJetHT2016E_reminiaodUL', 'REMINIAOD_data2016UL_HIPM', 'NANO_data_UL16APVreMINI', 'HRV3_NANO_data']] # noqa
471+
workflows[_wfn()] = ['NANOdataUL16reMINI', ['RunJetHT2016H_reminiaodUL', 'REMINIAOD_data2016UL', 'NANO_data_UL16reMINI', 'HRV3_NANO_data']] # noqa
472+
workflows[_wfn()] = ['NANOdataUL17reMINI', ['RunJetHT2017F_reminiaodUL', 'REMINIAOD_data2017UL', 'NANO_data_UL17reMINI', 'HRV3_NANO_data']] # noqa
473+
workflows[_wfn()] = ['NANOdataUL18reMINI', ['RunJetHT2018D_reminiaodUL', 'REMINIAOD_data2018UL', 'NANO_data_UL18reMINI', 'HRV3_NANO_data']] # noqa
453474

454475
_wfn.subnext()
455-
workflows[_wfn()] = ['NANOmcUL16APVMini2Mini', ['TTbarMINIAOD10.6_UL16APVv2', 'M2M_mc10.6ul16APV', 'NANO_mc_UL16APVreMINI', 'HRV_NANO_mc']]
456-
workflows[_wfn()] = ['NANOmcUL16Mini2Mini', ['TTbarMINIAOD10.6_UL16v2', 'M2M_mc10.6ul16', 'NANO_mc_UL16reMINI', 'HRV_NANO_mc']]
457-
workflows[_wfn()] = ['NANOmcUL17Mini2Mini', ['TTbarMINIAOD10.6_UL17v2', 'M2M_mc10.6ul17', 'NANO_mc_UL17reMINI', 'HRV_NANO_mc']]
458-
workflows[_wfn()] = ['NANOmcUL18Mini2Mini', ['TTbarMINIAOD10.6_UL18v2', 'M2M_mc10.6ul18', 'NANO_mc_UL18reMINI', 'HRV_NANO_mc']]
476+
workflows[_wfn()] = ['NANOmcUL16APVMini2Mini', ['TTbarMINIAOD10.6_UL16APVv2', 'M2M_mc10.6ul16APV', 'NANO_mc_UL16APVreMINI', 'HRV3_NANO_mc']]
477+
workflows[_wfn()] = ['NANOmcUL16Mini2Mini', ['TTbarMINIAOD10.6_UL16v2', 'M2M_mc10.6ul16', 'NANO_mc_UL16reMINI', 'HRV3_NANO_mc']]
478+
workflows[_wfn()] = ['NANOmcUL17Mini2Mini', ['TTbarMINIAOD10.6_UL17v2', 'M2M_mc10.6ul17', 'NANO_mc_UL17reMINI', 'HRV3_NANO_mc']]
479+
workflows[_wfn()] = ['NANOmcUL18Mini2Mini', ['TTbarMINIAOD10.6_UL18v2', 'M2M_mc10.6ul18', 'NANO_mc_UL18reMINI', 'HRV3_NANO_mc']]
459480

460481

461482
_wfn.subnext()
@@ -469,6 +490,9 @@ def next(self, index: int = None) -> None:
469490
_wfn.subnext()
470491
workflows[_wfn()] = ['NANOdata130Xrun3', ['MuonEG2023MINIAOD13.0', 'NANO_data13.0', 'HRV_NANO_data']]
471492

493+
_wfn.subnext()
494+
workflows[_wfn()] = ['NANOmc23Mini2Mini', ['TTbarMINIAOD13.0', 'M2M_mc13.0', 'NANO_mc_reMINI', 'HRV3_NANO_mc']]
495+
472496
# POG/PAG custom NANOs, MC
473497
_wfn.subnext()
474498

@@ -528,11 +552,11 @@ def next(self, index: int = None) -> None:
528552

529553
# MINIv6+NANOv15, MC
530554
_wfn.subnext()
531-
workflows[_wfn()] = ['NANOmc2024reMINI', ['TTbar_13p6_Summer24_AOD_140X', 'REMINIAOD_mc2024', 'NANO_mc_Summer24_reMINI', 'HRV_NANO_mc']] # noqa
555+
workflows[_wfn()] = ['NANOmc2024reMINI', ['TTbar_13p6_Summer24_AOD_140X', 'REMINIAOD_mc2024', 'NANO_mc_Summer24_reMINI', 'HRV3_NANO_mc']] # noqa
532556

533557
# MINIv6+NANOv15, data
534558
_wfn.subnext()
535-
workflows[_wfn()] = ['NANOdata2024reMINI', ['JetMET1_Run2024H_AOD_140X', 'REMINIAOD_data2024', 'NANO_data_2024_reMINI', 'HRV_NANO_data']] # noqa
559+
workflows[_wfn()] = ['NANOdata2024reMINI', ['JetMET1_Run2024H_AOD_140X', 'REMINIAOD_data2024', 'NANO_data_2024_reMINI', 'HRV3_NANO_data']] # noqa
536560

537561
_wfn.next(3)
538562
######## 2500.3xxx ########

0 commit comments

Comments
 (0)