diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index 549b373761edd..aa4217a50eb3a 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/Configuration/Applications/python/ConfigBuilder.py @@ -1820,6 +1820,9 @@ def prepare_NANO(self, stepSpec = '' ): _cff,_seq = _subSeq.split('.') self.loadAndRemember(_cff) _seqToSchedule.append(_seq) + elif '/' in _subSeq: + self.loadAndRemember(_subSeq) + _seqToSchedule.append(self.NANODefaultSeq) else: _seqToSchedule.append(_subSeq) self.scheduleSequence('+'.join(_seqToSchedule), 'nanoAOD_step') diff --git a/Configuration/PyReleaseValidation/python/relval_nano.py b/Configuration/PyReleaseValidation/python/relval_nano.py index 2f48c05b380cc..c6b4ad46defe9 100644 --- a/Configuration/PyReleaseValidation/python/relval_nano.py +++ b/Configuration/PyReleaseValidation/python/relval_nano.py @@ -187,8 +187,7 @@ def subnext(self): ###current release cycle workflows : 13.2 steps['TTBarMINIAOD13.2'] = {'INPUT':InputInfo(location='STD', - ## dataset below to be replaced with a 13.2 relval sample when available - dataSet='/RelValTTbar_14TeV/CMSSW_13_0_0-PU_130X_mcRun3_2022_realistic_v2_HS-v4/MINIAODSIM')} + dataSet='/RelValTTbar_14TeV/CMSSW_13_2_0-PU_131X_mcRun3_2023_realistic_v9-v1/MINIAODSIM')} steps['NANO_mc13.2']=merge([{'--era':'Run3', '--conditions':'auto:phase1_2022_realistic'}, @@ -208,27 +207,20 @@ def subnext(self): steps['NANO_mc13.2']]) ##13.X INPUT -steps['RunScoutingPFRun32022D13.X']={'INPUT':InputInfo(dataSet='/ScoutingPFRun3/Run2022D-v1/RAW',label='2022D',events=100000,location='STD', ls=Run2022D)} - -steps['NANO_dataRun3ScoutingPF13.X']=merge([{'-s':'NANO:PhysicsTools/NanoAOD/custom_run3scouting_cff', - '--conditions':'auto:run3_data', - '-n':'10', - '--era' : 'Run3', - '--geometry' : 'DB:Extended', - '--datatier':'NANOAOD', - '--eventcontent':'NANOAOD'}]) - -steps['NANO_mcRun3ScoutingPF13.X']=merge([{'-s':'NANO:PhysicsTools/NanoAOD/custom_run3scouting_cff.nanoSequenceMC', - '--conditions':'auto:phase1_2022_realistic', - '-n':'10', - '--mc':'', - '--era' : 'Run3', - '--geometry' : 'DB:Extended', - '--datatier':'NANOAOD', - '--eventcontent':'NANOAOD', - '--filein':'/store/mc/Run3Summer22MiniAODv3/BulkGravitonToHH_MX1120_MH121_TuneCP5_13p6TeV_madgraph-pythia8/MINIAODSIM/124X_mcRun3_2022_realistic_v12-v3/2810000/f9cdd76c-faac-4f24-bf0c-2496c8fffe54.root', - '--secondfilein':'/store/mc/Run3Summer22DRPremix/BulkGravitonToHH_MX1120_MH121_TuneCP5_13p6TeV_madgraph-pythia8/AODSIM/124X_mcRun3_2022_realistic_v12-v3/2810000/ab09fc5d-859c-407f-b7ce-74b0bae9bb96.root', - '--customise':'IOPool/Input/fixReading_12_4_X_Files.fixReading_12_4_X_Files'}]) +steps['ScoutingPFRun32022DRAW13.X']={'INPUT':InputInfo(dataSet='/ScoutingPFRun3/Run2022D-v1/RAW',label='2022D',events=100000,location='STD', ls=Run2022D)} + +steps['NANO_dataRun3ScoutingPF13.X']=merge([{'-s':'NANO:@Scout'}, + steps['NANO_data13.0']]) + +steps['TTBarMINIAOD13.3'] = {'INPUT':InputInfo(location='STD', + dataSet='/RelValTTbar_14TeV/CMSSW_13_3_0-PU_133X_mcRun3_2023_realistic_v3-v1/MINIAODSIM')} + +steps['NANO_mc13.3']=merge([{'--era':'Run3', + '--conditions':'133X_mcRun3_2023_realistic_v3'}, + _NANO_mc]) + +steps['NANO_mcScouting13.X']=merge([{'-s':'NANO:@Scout'}, + steps['NANO_mc13.3']]) _wfn=WFN(2500) ################ @@ -281,8 +273,8 @@ def subnext(self): _wfn.next() ################ #13.X workflows -workflows[_wfn()] = ['ScoutingNanodata13X',['RunScoutingPFRun32022D13.X', 'NANO_dataRun3ScoutingPF13.X']] +workflows[_wfn()] = ['ScoutingNanodata13X',['ScoutingPFRun32022DRAW13.X', 'NANO_dataRun3ScoutingPF13.X']] _wfn.subnext() -workflows[_wfn()] = ['ScoutingNanomc13X',['NANO_mcRun3ScoutingPF13.X']] +workflows[_wfn()] = ['ScoutingNanomc13X',['TTBarMINIAOD13.3','NANO_mcScouting13.X']] ################ diff --git a/PhysicsTools/NanoAOD/python/autoNANO.py b/PhysicsTools/NanoAOD/python/autoNANO.py index b580e42007ec3..59cda688adb4d 100644 --- a/PhysicsTools/NanoAOD/python/autoNANO.py +++ b/PhysicsTools/NanoAOD/python/autoNANO.py @@ -28,6 +28,8 @@ def expandNanoMapping(seqList, mapping, key): # L1 flavours: add tables through customize, supposed to be combined with PHYS 'L1' : {'customize': 'nanoL1TrigObjCustomize'}, 'L1FULL' : {'customize': 'nanoL1TrigObjCustomizeFull'}, + #scouting nano + 'Scout' : {'sequence': 'PhysicsTools/NanoAOD/custom_run3scouting_cff'}, 'JME' : { 'sequence': '@PHYS', 'customize': '@PHYS+PhysicsTools/NanoAOD/custom_jme_cff.PrepJMECustomNanoAOD'}, # Muon POG flavours : add tables through customize, supposed to be combined with PHYS