@@ -179,27 +179,21 @@ def subnext(self):
179179steps ['NANO_mc14.0' ] = merge ([{'--era' : 'Run3,run3_nanoAOD_pre142X' , '--conditions' : 'auto:phase1_2024_realistic' },
180180 _NANO_mc ])
181181
182- steps ['BPHNANO_mc14.0' ] = merge ([{'-s' : 'NANO:@BPH' , '-n' : '1000' },
183- steps ['NANO_mc14.0' ]])
184-
185182steps ['muPOGNANO_mc14.0' ] = merge ([{'-s' : 'NANO:@MUPOG,DQM:@nanoAODDQM' , '-n' : '1000' },
186183 steps ['NANO_mc14.0' ]])
187184
188185steps ['EGMNANO_mc14.0' ] = merge ([{'-s' : 'NANO:@EGM,DQM:@nanoAODDQM' , '-n' : '1000' },
189186 steps ['NANO_mc14.0' ]])
190187
191- steps ['BTVNANO_mc14.0' ] = merge ([{'-s' : 'NANO:@BTV' , '-n' : '1000' },
188+ steps ['BTVNANO_mc14.0' ] = merge ([{'-s' : 'NANO:@BTV,DQM:@nanoAODDQM ' , '-n' : '1000' },
192189 steps ['NANO_mc14.0' ]])
193190
194191steps ['lepTrackInfoNANO_mc14.0' ] = merge ([{'-s' : 'NANO:@LepTrackInfo,DQM:@nanoAODDQM' , '-n' : '1000' },
195192 steps ['NANO_mc14.0' ]])
196193
197- steps ['jmeNANO_mc14.0' ] = merge ([{'-s' : 'NANO:@JME ' , '-n' : '1000' },
194+ steps ['jmeNANO_mc14.0' ] = merge ([{'-s' : 'NANO:@JME,DQM:@nanojmeDQM ' , '-n' : '1000' },
198195 steps ['NANO_mc14.0' ]])
199196
200- steps ['jmeNANO_rePuppi_mc14.0' ] = merge ([{'-s' : 'NANO:@JMErePuppi ' , '-n' : '1000' },
201- steps ['NANO_mc14.0' ]])
202-
203197steps ['scoutingNANO_mc14.0' ] = merge ([{'-s' : 'NANO:@Scout' },
204198 steps ['NANO_mc14.0' ]])
205199
@@ -239,31 +233,25 @@ def subnext(self):
239233steps ['NANO_data14.0_prompt' ] = merge ([{'-s' : 'NANO:@Prompt,DQM:@nanoAODDQM' , '-n' : '1000' },
240234 steps ['NANO_data14.0' ]])
241235
242- steps ['BPHNANO_data14.0' ] = merge ([{'-s' : 'NANO:@BPH' , '-n' : '1000' },
243- steps ['NANO_data14.0' ]])
244-
245236steps ['muPOGNANO_data14.0' ] = merge ([{'-s' : 'NANO:@MUPOG,DQM:@nanoAODDQM' , '-n' : '1000' },
246237 steps ['NANO_data14.0' ]])
247238
248239steps ['EGMNANO_data14.0' ] = merge ([{'-s' : 'NANO:@EGM,DQM:@nanoAODDQM' , '-n' : '1000' },
249240 steps ['NANO_data14.0' ]])
250241
251- steps ['BTVNANO_data14.0' ] = merge ([{'-s' : 'NANO:@BTV' , '-n' : '1000' },
242+ steps ['BTVNANO_data14.0' ] = merge ([{'-s' : 'NANO:@BTV,DQM:@nanoAODDQM ' , '-n' : '1000' },
252243 steps ['NANO_data14.0' ]])
253244
254245steps ['lepTrackInfoNANO_data14.0' ] = merge ([{'-s' : 'NANO:@LepTrackInfo,DQM:@nanoAODDQM' , '-n' : '1000' },
255246 steps ['NANO_data14.0' ]])
256247
257- steps ['jmeNANO_data14.0' ] = merge ([{'-s' : 'NANO:@JME' , '-n' : '1000' },
248+ steps ['jmeNANO_data14.0' ] = merge ([{'-s' : 'NANO:@JME,DQM:@nanojmeDQM ' , '-n' : '1000' },
258249 steps ['NANO_data14.0' ]])
259250
260- steps ['jmeNANO_rePuppi_data14.0' ] = merge ([{'-s' : 'NANO:@JMErePuppi' , '-n' : '1000' },
261- steps ['NANO_data14.0' ]])
262-
263251steps ['scoutingNANO_data14.0' ] = merge ([{'-s' : 'NANO:@Scout' },
264252 steps ['NANO_data14.0' ]])
265253
266- steps ['scoutingNANO_withPrompt_data14.0' ] = merge ([{'-s' : 'NANO:@Prompt+@ScoutMonitor' },
254+ steps ['scoutingNANO_withPrompt_data14.0' ] = merge ([{'-s' : 'NANO:@Prompt+@ScoutMonitor' },
267255 steps ['NANO_data14.0' ]])
268256
269257# DPG custom NANO
@@ -287,10 +275,10 @@ def subnext(self):
287275
288276################################################################
289277# Run3 re-MINI/NANOv15 in 15.0
290- steps ['TTbar_13p6_Summer24_AOD ' ] = {'INPUT' : InputInfo (
278+ steps ['TTbar_13p6_Summer24_AOD_140X ' ] = {'INPUT' : InputInfo (
291279 location = 'STD' , dataSet = '/TTtoLNu2Q_TuneCP5_13p6TeV_powheg-pythia8/RunIII2024Summer24DRPremix-140X_mcRun3_2024_realistic_v26-v2/AODSIM' )}
292280
293- steps ['JetMET1_Run2024H_AOD ' ] = {'INPUT' : InputInfo (
281+ steps ['JetMET1_Run2024H_AOD_140X ' ] = {'INPUT' : InputInfo (
294282 location = 'STD' , ls = {385836 : [[72 , 166 ]]}, dataSet = '/JetMET1/Run2024H-PromptReco-v1/AOD' )}
295283
296284steps ['NANO_mc_Summer24_reMINI' ] = merge ([{'--era' : 'Run3_2024' , '--conditions' : 'auto:phase1_2024_realistic' }, _NANO_mc ])
@@ -301,16 +289,81 @@ def subnext(self):
301289################################################################
302290# Run3, 15_0_X input (for 2025 data-taking)
303291# temporarily using the Summer24 samples
304- steps ['TTbar_13p6_Summer24_MINIAOD ' ] = {'INPUT' : InputInfo (
292+ steps ['TTbar_13p6_Summer24_MINIAOD_150X ' ] = {'INPUT' : InputInfo (
305293 location = 'STD' , dataSet = '/TTtoLNu2Q_TuneCP5_13p6TeV_powheg-pythia8/RunIII2024Summer24MiniAODv6-150X_mcRun3_2024_realistic_v2-v2/MINIAODSIM' )}
306294
307- steps ['JetMET1_Run2024H_MINIAOD' ] = {'INPUT' : InputInfo (
308- location = 'STD' , ls = {385836 : [[72 , 166 ]]}, dataSet = '/JetMET1/Run2024H-MINIv6NANOv15-v2/MINIAOD' )}
309-
310295steps ['NANO_mc15.0' ] = merge ([{'--era' : 'Run3_2025' , '--conditions' : 'auto:phase1_2025_realistic' }, _NANO_mc ])
311296
297+ steps ['BPHNANO_mc15.0' ] = merge ([{'-s' : 'NANO:@BPH,DQM:@nanoAODDQM' },
298+ steps ['NANO_mc15.0' ]])
299+
300+ steps ['muPOGNANO_mc15.0' ] = merge ([{'-s' : 'NANO:@MUPOG,DQM:@nanoAODDQM' , '-n' : '1000' },
301+ steps ['NANO_mc15.0' ]])
302+
303+ steps ['EGMNANO_mc15.0' ] = merge ([{'-s' : 'NANO:@EGM,DQM:@nanoAODDQM' , '-n' : '1000' },
304+ steps ['NANO_mc15.0' ]])
305+
306+ steps ['BTVNANO_mc15.0' ] = merge ([{'-s' : 'NANO:@BTV,DQM:@nanoAODDQM' , '-n' : '1000' },
307+ steps ['NANO_mc15.0' ]])
308+
309+ steps ['lepTrackInfoNANO_mc15.0' ] = merge ([{'-s' : 'NANO:@LepTrackInfo,DQM:@nanoAODDQM' , '-n' : '1000' },
310+ steps ['NANO_mc15.0' ]])
311+
312+ steps ['jmeNANO_mc15.0' ] = merge ([{'-s' : 'NANO:@JME,DQM:@nanojmeDQM' , '-n' : '1000' },
313+ steps ['NANO_mc15.0' ]])
314+
315+ steps ['jmeNANO_rePuppi_mc15.0' ] = merge ([{'-s' : 'NANO:@JMErePuppi,DQM:@nanojmeDQM' , '-n' : '1000' },
316+ steps ['NANO_mc15.0' ]])
317+
318+ steps ['scoutingNANO_mc15.0' ] = merge ([{'-s' : 'NANO:@Scout' },
319+ steps ['NANO_mc15.0' ]])
320+
321+ steps ['scoutingNANO_withPrompt_mc15.0' ] = merge ([{'-s' : 'NANO:@Prompt+@Scout' },
322+ steps ['NANO_mc15.0' ]])
323+
324+ # ====== DATA ======
325+ lumis_Run2025C = {392175 : [[95 , 542 ]]}
326+
327+ steps ['JetMET1_Run2025C_MINIAOD_150X' ] = {'INPUT' : InputInfo (
328+ location = 'STD' , ls = lumis_Run2025C , dataSet = '/JetMET1/Run2025C-PromptReco-v1/MINIAOD' )}
329+
330+ steps ['ScoutingPFRun3_Run2025C_HLTSCOUT_150X' ] = {'INPUT' : InputInfo (location = 'STD' , ls = lumis_Run2025C ,
331+ dataSet = '/ScoutingPFRun3/Run2025C-v1/HLTSCOUT' )}
332+
333+ steps ['ScoutingPFMonitor_Run2025C_MINIAOD_150X' ] = {'INPUT' : InputInfo (
334+ location = 'STD' , ls = lumis_Run2025C , dataSet = '/ScoutingPFMonitor/Run2025C-PromptReco-v1/MINIAOD' )}
335+
312336steps ['NANO_data15.0' ] = merge ([{'--era' : 'Run3_2025' , '--conditions' : 'auto:run3_data_prompt' }, _NANO_data ])
313337
338+ steps ['NANO_data15.0_prompt' ] = merge ([{'-s' : 'NANO:@Prompt,DQM:@nanoAODDQM' , '-n' : '1000' },
339+ steps ['NANO_data15.0' ]])
340+
341+ steps ['BPHNANO_data15.0' ] = merge ([{'-s' : 'NANO:@BPH,DQM:@nanoAODDQM' },
342+ steps ['NANO_data15.0' ]])
343+
344+ steps ['muPOGNANO_data15.0' ] = merge ([{'-s' : 'NANO:@MUPOG,DQM:@nanoAODDQM' , '-n' : '1000' },
345+ steps ['NANO_data15.0' ]])
346+
347+ steps ['EGMNANO_data15.0' ] = merge ([{'-s' : 'NANO:@EGM,DQM:@nanoAODDQM' , '-n' : '1000' },
348+ steps ['NANO_data15.0' ]])
349+
350+ steps ['BTVNANO_data15.0' ] = merge ([{'-s' : 'NANO:@BTV,DQM:@nanoAODDQM' , '-n' : '1000' },
351+ steps ['NANO_data15.0' ]])
352+
353+ steps ['lepTrackInfoNANO_data15.0' ] = merge ([{'-s' : 'NANO:@LepTrackInfo,DQM:@nanoAODDQM' , '-n' : '1000' },
354+ steps ['NANO_data15.0' ]])
355+
356+ steps ['jmeNANO_data15.0' ] = merge ([{'-s' : 'NANO:@JME,DQM:@nanojmeDQM' , '-n' : '1000' },
357+ steps ['NANO_data15.0' ]])
358+
359+ steps ['jmeNANO_rePuppi_data15.0' ] = merge ([{'-s' : 'NANO:@JMErePuppi,DQM:@nanojmeDQM' , '-n' : '1000' },
360+ steps ['NANO_data15.0' ]])
361+
362+ steps ['scoutingNANO_data15.0' ] = merge ([{'-s' : 'NANO:@Scout' },
363+ steps ['NANO_data15.0' ]])
364+
365+ steps ['scoutingNANO_withPrompt_data15.0' ] = merge ([{'-s' : 'NANO:@Prompt+@ScoutMonitor' },
366+ steps ['NANO_data15.0' ]])
314367
315368################################################################
316369# NANOGEN
@@ -356,7 +409,6 @@ def subnext(self):
356409
357410_wfn .subnext ()
358411workflows [_wfn ()] = ['NANOdata130Xrun3' , ['MuonEG2023MINIAOD13.0' , 'NANO_data13.0' , 'HRV_NANO_data' ]]
359- workflows [_wfn ()] = ['NANOdata130Xrun3' , ['MuonEG2023MINIAOD13.0' , 'NANO_data13.0_prompt' , 'HRV_NANO_data' ]]
360412
361413# POG/PAG custom NANOs, MC
362414_wfn .subnext ()
@@ -370,36 +422,33 @@ def subnext(self):
370422
371423_wfn .next (2 )
372424######## 2500.2xx ########
373- # Run3, 14_0_X input
374- workflows [ _wfn ()] = [ 'NANOmc140X' , [ 'TTbarMINIAOD14.0' , 'NANO_mc14.0' , 'HRV_NANO_mc' ]]
425+ # Run3, 14_0_X input (2024 RAW/AOD)
426+ # Standard NANO, MC
375427
428+ # Standard NANO, data
376429_wfn .subnext ()
377- workflows [_wfn ()] = ['NANOdata140Xrun3' , ['MuonEG2024MINIAOD14.0' , 'NANO_data14.0' , 'HRV_NANO_data' ]]
378- workflows [_wfn ()] = ['NANOdata140Xrun3' , ['MuonEG2024MINIAOD14.0' , 'NANO_data14.0_prompt' , 'HRV_NANO_data' ]]
379430
380431# POG/PAG custom NANOs, MC
381432_wfn .subnext ()
382433workflows [_wfn ()] = ['muPOGNANOmc140X' , ['TTbarMINIAOD14.0' , 'muPOGNANO_mc14.0' ]]
383434workflows [_wfn ()] = ['EGMNANOmc140X' , ['TTbarMINIAOD14.0' , 'EGMNANO_mc14.0' ]]
384435workflows [_wfn ()] = ['BTVNANOmc140X' , ['TTbarMINIAOD14.0' , 'BTVNANO_mc14.0' ]]
385436workflows [_wfn ()] = ['jmeNANOmc140X' , ['TTbarMINIAOD14.0' , 'jmeNANO_mc14.0' ]]
386- workflows [_wfn ()] = ['jmeNANOrePuppimc140X' , ['TTbarMINIAOD14.0' , 'jmeNANO_rePuppi_mc14.0' ]]
437+ _wfn () # workflows[_wfn()] = ['jmeNANOrePuppimc140X', ['TTbarMINIAOD14.0', 'jmeNANO_rePuppi_mc14.0']]
387438workflows [_wfn ()] = ['lepTrackInfoNANOmc140X' , ['TTbarMINIAOD14.0' , 'lepTrackInfoNANO_mc14.0' ]]
388439workflows [_wfn ()] = ['ScoutingNANOmc140X' , ['TTbarMINIAOD14.0' , 'scoutingNANO_mc14.0' ]]
389440workflows [_wfn ()] = ['ScoutingNANOwithPromptmc140X' , ['TTbarMINIAOD14.0' , 'scoutingNANO_withPrompt_mc14.0' ]]
390- workflows [_wfn ()] = ['BPHNANOmc140X' , ['TTbarMINIAOD14.0' , 'BPHNANO_mc14.0' ]]
391441
392442# POG/PAG custom NANOs, data
393443_wfn .subnext ()
394444workflows [_wfn ()] = ['muPOGNANO140Xrun3' , ['MuonEG2024MINIAOD14.0' , 'muPOGNANO_data14.0' ]]
395445workflows [_wfn ()] = ['EGMNANOdata140Xrun3' , ['MuonEG2024MINIAOD14.0' , 'EGMNANO_data14.0' ]]
396446workflows [_wfn ()] = ['BTVNANOdata140Xrun3' , ['MuonEG2024MINIAOD14.0' , 'BTVNANO_data14.0' ]]
397447workflows [_wfn ()] = ['jmeNANOdata140Xrun3' , ['MuonEG2024MINIAOD14.0' , 'jmeNANO_data14.0' ]]
398- workflows [_wfn ()] = ['jmeNANOrePuppidata140Xrun3' , ['MuonEG2024MINIAOD14.0' , 'jmeNANO_rePuppi_data14.0' ]]
448+ _wfn () # workflows[_wfn()] = ['jmeNANOrePuppidata140Xrun3', ['MuonEG2024MINIAOD14.0', 'jmeNANO_rePuppi_data14.0']]
399449workflows [_wfn ()] = ['lepTrackInfoNANOdata140Xrun3' , ['MuonEG2024MINIAOD14.0' , 'lepTrackInfoNANO_data14.0' ]]
400450workflows [_wfn ()] = ['ScoutingNANOdata140Xrun3' , ['ScoutingPFRun32024RAW14.0' , 'scoutingNANO_data14.0' ]]
401451workflows [_wfn ()] = ['ScoutingNANOwithPromptdata140Xrun3' , ['ScoutingPFMonitor2024MINIAOD14.0' , 'scoutingNANO_withPrompt_data14.0' ]]
402- workflows [_wfn ()] = ['BPHNANOdata140Xrun3' , ['MuonEG2024MINIAOD14.0' , 'BPHNANO_data14.0' ]]
403452
404453# DPG custom NANOs, data
405454_wfn .subnext ()
@@ -416,20 +465,54 @@ def subnext(self):
416465# but I keep the 14.0 label for now since it's consistent with those ones
417466# let me know if I should change this
418467
468+ # MINIv6+NANOv15, MC
469+ _wfn .subnext ()
470+ workflows [_wfn ()] = ['NANOmc2024reMINI' , ['TTbar_13p6_Summer24_AOD_140X' , 'REMINIAOD_mc2024' , 'NANO_mc_Summer24_reMINI' , 'HRV_NANO_mc' ]] # noqa
471+
472+ # MINIv6+NANOv15, data
473+ _wfn .subnext ()
474+ workflows [_wfn ()] = ['NANOdata2024reMINI' , ['JetMET1_Run2024H_AOD_140X' , 'REMINIAOD_data2024' , 'NANO_data_2024_reMINI' , 'HRV_NANO_data' ]] # noqa
475+
419476_wfn .next (3 )
420477######## 2500.3xx ########
421- # Run3 re-MINI/NANOv15 in 15_0_X
422- workflows [_wfn ()] = ['NANOmc2024reMINI' , ['TTbar_13p6_Summer24_AOD' , 'REMINIAOD_mc2024' , 'NANO_mc_Summer24_reMINI' , 'HRV_NANO_mc' ]] # noqa
478+ # Run3, 15_0_X input (2024 MINIv6+NANOv15 & 2025 data-taking)
479+ # Standard NANO, MC
480+ workflows [_wfn ()] = ['NANOmc150X' , ['TTbar_13p6_Summer24_MINIAOD_150X' , 'NANO_mc15.0' , 'HRV_NANO_mc' ]]
481+
482+ # Standard NANO, data
483+ _wfn .subnext ()
484+ workflows [_wfn ()] = ['NANOdata150X' , ['JetMET1_Run2025C_MINIAOD_150X' , 'NANO_data15.0' , 'HRV_NANO_data' ]]
485+ workflows [_wfn ()] = ['NANOdata150X' , ['JetMET1_Run2025C_MINIAOD_150X' , 'NANO_data15.0_prompt' , 'HRV_NANO_data' ]]
486+
487+ # POG/PAG custom NANOs, MC
488+ _wfn .subnext ()
489+ workflows [_wfn ()] = ['muPOGNANOmc150X' , ['TTbar_13p6_Summer24_MINIAOD_150X' , 'muPOGNANO_mc15.0' ]]
490+ workflows [_wfn ()] = ['EGMNANOmc150X' , ['TTbar_13p6_Summer24_MINIAOD_150X' , 'EGMNANO_mc15.0' ]]
491+ workflows [_wfn ()] = ['BTVNANOmc150X' , ['TTbar_13p6_Summer24_MINIAOD_150X' , 'BTVNANO_mc15.0' ]]
492+ workflows [_wfn ()] = ['jmeNANOmc150X' , ['TTbar_13p6_Summer24_MINIAOD_150X' , 'jmeNANO_mc15.0' ]]
493+ workflows [_wfn ()] = ['jmeNANOrePuppimc150X' , ['TTbar_13p6_Summer24_MINIAOD_150X' , 'jmeNANO_rePuppi_mc15.0' ]]
494+ workflows [_wfn ()] = ['lepTrackInfoNANOmc150X' , ['TTbar_13p6_Summer24_MINIAOD_150X' , 'lepTrackInfoNANO_mc15.0' ]]
495+ workflows [_wfn ()] = ['ScoutingNANOmc150X' , ['TTbar_13p6_Summer24_MINIAOD_150X' , 'scoutingNANO_mc15.0' ]]
496+ workflows [_wfn ()] = ['ScoutingNANOwithPromptmc150X' , ['TTbar_13p6_Summer24_MINIAOD_150X' , 'scoutingNANO_withPrompt_mc15.0' ]]
497+ workflows [_wfn ()] = ['BPHNANOmc150X' , ['TTbar_13p6_Summer24_MINIAOD_150X' , 'BPHNANO_mc15.0' ]]
423498
499+ # POG/PAG custom NANOs, data
424500_wfn .subnext ()
425- workflows [_wfn ()] = ['NANOdata2024reMINI' , ['JetMET1_Run2024H_AOD' , 'REMINIAOD_data2024' , 'NANO_data_2024_reMINI' , 'HRV_NANO_data' ]] # noqa
501+ workflows [_wfn ()] = ['muPOGNANO150Xrun3' , ['JetMET1_Run2025C_MINIAOD_150X' , 'muPOGNANO_data15.0' ]]
502+ workflows [_wfn ()] = ['EGMNANOdata150Xrun3' , ['JetMET1_Run2025C_MINIAOD_150X' , 'EGMNANO_data15.0' ]]
503+ workflows [_wfn ()] = ['BTVNANOdata150Xrun3' , ['JetMET1_Run2025C_MINIAOD_150X' , 'BTVNANO_data15.0' ]]
504+ workflows [_wfn ()] = ['jmeNANOdata150Xrun3' , ['JetMET1_Run2025C_MINIAOD_150X' , 'jmeNANO_data15.0' ]]
505+ workflows [_wfn ()] = ['jmeNANOrePuppidata150Xrun3' , ['JetMET1_Run2025C_MINIAOD_150X' , 'jmeNANO_rePuppi_data15.0' ]]
506+ workflows [_wfn ()] = ['lepTrackInfoNANOdata150Xrun3' , ['JetMET1_Run2025C_MINIAOD_150X' , 'lepTrackInfoNANO_data15.0' ]]
507+ workflows [_wfn ()] = ['ScoutingNANOdata150Xrun3' , ['ScoutingPFRun3_Run2025C_HLTSCOUT_150X' , 'scoutingNANO_data15.0' ]]
508+ workflows [_wfn ()] = ['ScoutingNANOwithPromptdata150Xrun3' , ['ScoutingPFMonitor_Run2025C_MINIAOD_150X' , 'scoutingNANO_withPrompt_data15.0' ]] # noqa
509+ workflows [_wfn ()] = ['BPHNANOdata150Xrun3' , ['JetMET1_Run2025C_MINIAOD_150X' , 'BPHNANO_data15.0' ]]
426510
427- # Run3, 15_0_X input (2025)
511+ # DPG custom NANOs, data
428512_wfn .subnext ()
429- workflows [_wfn ()] = ['NANOmc150X' , ['TTbar_13p6_Summer24_MINIAOD' , 'NANO_mc15.0' , 'HRV_NANO_mc' ]]
430513
514+ # DPG custom NANOs, MC
431515_wfn .subnext ()
432- workflows [_wfn ()] = ['NANOdata150X' , ['JetMET1_Run2024H_MINIAOD' , 'NANO_data15.0' , 'HRV_NANO_data' ]]
433516
434517
435518_wfn .next (9 )
0 commit comments