diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index 7917a21310dd6..cc971b1e5ca25 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -17,17 +17,19 @@ # 2017 (ele guns 10, 35, 1000; pho guns 10, 35; mu guns 1, 10, 100, 1000, QCD 3TeV, QCD Flat) # (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design) # (TTbar trackingOnly, trackingRun2, trackingOnlyRun2, trackingLowPU, pixelTrackingOnly) +# (TTbar PU with JME NanoAOD) # 2018 (ele guns 10, 35, 1000; pho guns 10, 35; mu guns 1, 10, 100, 1000, QCD 3TeV, QCD Flat) # 2018 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design) # (TTbar trackingOnly, pixelTrackingOnly) # (HE collapse: TTbar, TTbar PU, TTbar design) # (ParkingBPH: TTbar) +# (TTbar PU with JME NanoAOD) # (Patatrack pixel-only: ZMM - on CPU, on GPU, both, auto) # (Patatrack pixel-only: TTbar - on CPU, on GPU, both, auto) # (Patatrack ECAL-only: TTbar - on CPU, on GPU, both, auto) # (Patatrack HCAL-only: TTbar - on CPU, on GPU, both, auto) # 2021 (ZMM, TTbar, ZEE, MinBias, TTbar PU, TTbar PU premix, ZEE PU, TTbar design) -# (TTbar trackingMkFit) +# (TTbar trackingOnly, pixelTrackingOnly, trackingMkFit) # (Patatrack pixel-only: ZMM - on CPU, on GPU, both, auto) # (Patatrack pixel-only: TTbar - on CPU, on GPU, both, auto) # (Patatrack ECAL-only: TTbar - on CPU, on GPU, both, auto) @@ -37,20 +39,22 @@ numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0, 10042.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0, 10024.1,10024.2,10024.3,10024.4,10024.5, + 10224.15, 10801.0,10802.0,10803.0,10804.0,10805.0,10806.0,10807.0,10808.0,10809.0,10859.0,10871.0, 10842.0,10824.0,10825.0,10826.0,10823.0,11024.0,11025.0,11224.0, 10824.1,10824.5, 10824.6,11024.6,11224.6, 10824.8, + 11024.15, 10842.501,10842.502, # 10842.503,10842.504, 10824.501,10824.502, # 10824.503,10824.504, - # 10824.511,10824.512,10824.513,10824.514, + 10824.511,10824.512, # 10824.513,10824.514, # 10824.521,10824.522,10824.523,10824.524, 11650.0,11634.0,11646.0,11640.0,11834.0,11834.99,11846.0,12024.0, - 11634.7, + 11634.1,11634.5,11634.7, 11650.501,11650.502, # 11650.503,11650.504, 11634.501,11634.502, # 11634.503,11634.504, - # 11634.511,11634.512,11634.513,11634.514, + 11634.511,11634.512, # 11634.513,11634.514, # 11634.521,11634.522,11634.523,11634.524, 12434.0,12634.0,12634.99, 12834.0,13034.0,13034.99] diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 8ecd4285ce005..7b6540624de26 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -45,6 +45,20 @@ '2026D48PU', '2026D49', '2026D49PU', + '2026D51', + '2026D51PU', + '2026D53', + '2026D53PU', + '2026D54', + '2026D54PU', + '2026D55', + '2026D55PU', + '2026D56', + '2026D56PU', + '2026D57', + '2026D57PU', + '2026D58', + '2026D58PU', ] # pre-generation of WF numbers @@ -54,7 +68,7 @@ } numWFSkip=200 # temporary measure to keep other WF numbers the same -numWFConflict = [[25000,26000],[50000,51000]] +numWFConflict = [[24000,24400],[25000,26000],[50000,51000]] numWFAll={ 2017: [], 2026: [] @@ -110,8 +124,10 @@ class UpgradeWorkflow_baseline(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): cust=properties.get('Custom', None) era=properties.get('Era', None) + modifier=properties.get('ProcessModifier',None) if cust is not None: stepDict[stepName][k]['--customise']=cust if era is not None: stepDict[stepName][k]['--era']=era + if modifier is not None: stepDict[stepName][k]['--procModifier']=modifier def condition(self, fragment, stepList, key, hasHarvest): return True upgradeWFs['baseline'] = UpgradeWorkflow_baseline( @@ -236,7 +252,7 @@ def setup_(self, step, stepName, stepDict, k, properties): if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, stepDict[step][k]]) def condition_(self, fragment, stepList, key, hasHarvest): - return '2017' in key or '2018' in key + return '2017' in key or '2018' in key or '2021' in key upgradeWFs['pixelTrackingOnly'] = UpgradeWorkflow_pixelTrackingOnly( steps = [ 'RecoFull', @@ -269,7 +285,7 @@ def condition_(self, fragment, stepList, key, hasHarvest): offset = 0.7, ) upgradeWFs['trackingMkFit'].step3 = { - '--customise': 'RecoTracker/MkFit/customizeInitialStepToMkFit.customizeInitialStepToMkFit' + '--procModifiers': 'trackingMkFit' } # Patatrack workflows @@ -291,10 +307,14 @@ def condition_(self, fragment, stepList, key, hasHarvest): class UpgradeWorkflowPatatrack_PixelOnlyCPU(UpgradeWorkflowPatatrack): def setup_(self, step, stepName, stepDict, k, properties): - if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) - elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, stepDict[step][k]]) + if 'Reco' in step: + stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) + elif 'HARVEST' in step: + stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, stepDict[step][k]]) + def condition_(self, fragment, stepList, key, hasHarvest): return '2018' in key or '2021' in key + upgradeWFs['PatatrackPixelOnlyCPU'] = UpgradeWorkflowPatatrack_PixelOnlyCPU( steps = [ 'RecoFull', @@ -306,6 +326,7 @@ def condition_(self, fragment, stepList, key, hasHarvest): suffix = 'Patatrack_PixelOnlyCPU', offset = 0.501, ) + upgradeWFs['PatatrackPixelOnlyCPU'].step3 = { '-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly,VALIDATION:@pixelTrackingOnlyValidation,DQM:@pixelTrackingOnlyDQM', '--datatier': 'GEN-SIM-RECO,DQMIO', @@ -315,10 +336,14 @@ def condition_(self, fragment, stepList, key, hasHarvest): class UpgradeWorkflowPatatrack_PixelOnlyGPU(UpgradeWorkflowPatatrack): def setup_(self, step, stepName, stepDict, k, properties): - if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) - elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, stepDict[step][k]]) + if 'Reco' in step: + stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) + elif 'HARVEST' in step: + stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, stepDict[step][k]]) + def condition_(self, fragment, stepList, key, hasHarvest): return '2018' in key or '2021' in key + upgradeWFs['PatatrackPixelOnlyGPU'] = UpgradeWorkflowPatatrack_PixelOnlyGPU( steps = [ 'RecoFull', @@ -330,36 +355,109 @@ def condition_(self, fragment, stepList, key, hasHarvest): suffix = 'Patatrack_PixelOnlyGPU', offset = 0.502, ) + upgradeWFs['PatatrackPixelOnlyGPU'].step3 = { '-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly,VALIDATION:@pixelTrackingOnlyValidation,DQM:@pixelTrackingOnlyDQM', '--datatier': 'GEN-SIM-RECO,DQMIO', '--eventcontent': 'RECOSIM,DQM', '--procModifiers': 'gpu' } + +class UpgradeWorkflowPatatrack_ECALOnlyCPU(UpgradeWorkflowPatatrack): + def setup_(self, step, stepName, stepDict, k, properties): + if 'Reco' in step: + stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) + elif 'HARVEST' in step: + stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@ecalOnlyValidation+@ecal'}, stepDict[step][k]]) + + def condition_(self, fragment, stepList, key, hasHarvest): + return '2018' in key or '2021' in key + +upgradeWFs['PatatrackECALOnlyCPU'] = UpgradeWorkflowPatatrack_ECALOnlyCPU( + steps = [ + 'RecoFull', + 'HARVESTFull', + 'RecoFullGlobal', + 'HARVESTFullGlobal', + ], + PU = [], + suffix = 'Patatrack_ECALOnlyCPU', + offset = 0.511, +) + +upgradeWFs['PatatrackECALOnlyCPU'].step3 = { + '-s': 'RAW2DIGI:RawToDigi_ecalOnly,RECO:reconstruction_ecalOnly,VALIDATION:@ecalOnlyValidation,DQM:@ecalOnly', + '--datatier': 'GEN-SIM-RECO,DQMIO', + '--eventcontent': 'RECOSIM,DQM', +} + +class UpgradeWorkflowPatatrack_ECALOnlyGPU(UpgradeWorkflowPatatrack): + def setup_(self, step, stepName, stepDict, k, properties): + if 'Reco' in step: + stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) + elif 'HARVEST' in step: + stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@ecalOnlyValidation+@ecal'}, stepDict[step][k]]) + + def condition_(self, fragment, stepList, key, hasHarvest): + return '2018' in key or '2021' in key + +upgradeWFs['PatatrackECALOnlyGPU'] = UpgradeWorkflowPatatrack_ECALOnlyGPU( + steps = [ + 'RecoFull', + 'HARVESTFull', + 'RecoFullGlobal', + 'HARVESTFullGlobal', + ], + PU = [], + suffix = 'Patatrack_ECALOnlyGPU', + offset = 0.512, +) + +upgradeWFs['PatatrackECALOnlyGPU'].step3 = { + '-s': 'RAW2DIGI:RawToDigi_ecalOnly,RECO:reconstruction_ecalOnly,VALIDATION:@ecalOnlyValidation,DQM:@ecalOnly', + '--datatier': 'GEN-SIM-RECO,DQMIO', + '--eventcontent': 'RECOSIM,DQM', + '--procModifiers': 'gpu' +} + # end of Patatrack workflows class UpgradeWorkflow_ProdLike(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): - if 'Reco' in step: + if 'Digi' in step and 'Trigger' not in step: + stepDict[stepName][k] = merge([{'-s': 'DIGI,L1,DIGI2RAW,HLT:@relval2021', '--datatier':'GEN-SIM-DIGI-RAW', '--eventcontent':'RAWSIM'}, stepDict[step][k]]) + elif 'Reco' in step: stepDict[stepName][k] = merge([{'-s': 'RAW2DIGI,L1Reco,RECO,RECOSIM', '--datatier':'AODSIM', '--eventcontent':'AODSIM'}, stepDict[step][k]]) elif 'MiniAOD' in step: # the separate miniAOD step is used here stepDict[stepName][k] = deepcopy(stepDict[step][k]) - if 'HARVEST' in step: + if 'ALCA' in step or 'HARVEST' in step: # remove step stepDict[stepName][k] = None + if 'Nano' in step: + stepDict[stepName][k] = merge([{'--filein':'file:step4.root'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - return fragment=="TTbar_14TeV" and '2026' in key + return fragment=="TTbar_14TeV" and ('2026' in key or '2021' in key) upgradeWFs['ProdLike'] = UpgradeWorkflow_ProdLike( steps = [ + 'DigiFull', + 'RecoFull', 'RecoFullGlobal', + 'HARVESTFull', 'HARVESTFullGlobal', 'MiniAODFullGlobal', + 'ALCAFull', + 'NanoFull', ], PU = [ + 'DigiFull', + 'RecoFull', 'RecoFullGlobal', + 'HARVESTFull', 'HARVESTFullGlobal', 'MiniAODFullGlobal', + 'ALCAFull', + 'NanoFull', ], suffix = '_ProdLike', offset = 0.21, @@ -434,46 +532,21 @@ def condition(self, fragment, stepList, key, hasHarvest): offset = 0.8, ) -class UpgradeWorkflow_TICLOnly(UpgradeWorkflow): +class UpgradeWorkflow_JMENano(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): - if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) + if 'Nano' in step: + stepDict[stepName][k] = merge([{'--customise': 'PhysicsTools/NanoAOD/custom_jme_cff.PrepJMECustomNanoAOD_MC'}, stepDict[step][k]]) def condition(self, fragment, stepList, key, hasHarvest): - result = (fragment=="CloseByParticleGun") and ('2026' in key) - if result: - skipList = [s for s in stepList if ("HARVEST" in s)] - for skip in skipList: - stepList.remove(skip) - return result -upgradeWFs['TICLOnly'] = UpgradeWorkflow_TICLOnly( + return fragment=="TTbar_13" and ('2017' in key or '2018' in key) +upgradeWFs['JMENano'] = UpgradeWorkflow_JMENano( steps = [ - 'RecoFull', - 'RecoFullGlobal', + 'NanoFull', ], PU = [], - suffix = '_TICLOnly', - offset = 0.51, + suffix = '_JMENano', + offset = 0.15, ) -upgradeWFs['TICLOnly'].step3 = { - '--customise' : 'RecoHGCal/TICL/ticl_iterations.TICL_iterations' -} -class UpgradeWorkflow_TICLFullReco(UpgradeWorkflow): - def setup_(self, step, stepName, stepDict, k, properties): - if 'Reco' in step: stepDict[stepName][k] = merge([self.step3, stepDict[step][k]]) - def condition(self, fragment, stepList, key, hasHarvest): - return (fragment=="CloseByParticleGun") and ('2026' in key) -upgradeWFs['TICLFullReco'] = UpgradeWorkflow_TICLFullReco( - steps = [ - 'RecoFull', - 'RecoFullGlobal', - ], - PU = [], - suffix = '_TICLFullReco', - offset = 0.52, -) -upgradeWFs['TICLFullReco'].step3 = { - '--customise' : 'RecoHGCal/TICL/ticl_iterations.TICL_iterations_withReco' -} # common operations for aging workflows class UpgradeWorkflowAging(UpgradeWorkflow): @@ -534,6 +607,37 @@ def condition(self, fragment, stepList, key, hasHarvest): offset = 0.99, ) +class UpgradeWorkflow_TestOldDigi(UpgradeWorkflow): + def setup_(self, step, stepName, stepDict, k, properties): + if 'Reco' in step: + # use existing DIGI-RAW file from old release + stepDict[stepName][k] = merge([{'--filein': 'das:/RelValTTbar_14TeV/CMSSW_11_0_0_pre13-110X_mcRun4_realistic_v2_2026D49noPU-v1/GEN-SIM-DIGI-RAW'}, stepDict[step][k]]) + # handle separate PU input + stepNamePU = step + 'PU' + self.suffix + stepDict[stepNamePU][k] = merge([{'--filein': 'das:/RelValTTbar_14TeV/CMSSW_11_0_0_pre13-PU25ns_110X_mcRun4_realistic_v2_2026D49PU200-v2/GEN-SIM-DIGI-RAW'},stepDict[stepName][k]]) + elif 'GenSim' in step or 'Digi' in step: + # remove step + stepDict[stepName][k] = None + def condition(self, fragment, stepList, key, hasHarvest): + # limited to HLT TDR production geometry + return fragment=="TTbar_14TeV" and '2026D49' in key + def workflow_(self, workflows, num, fragment, stepList): + UpgradeWorkflow.workflow_(self, workflows, num, fragment, stepList) +upgradeWFs['TestOldDigi'] = UpgradeWorkflow_TestOldDigi( + steps = [ + 'GenSimHLBeamSpotFull', + 'GenSimHLBeamSpotFull14', + 'DigiFullTrigger', + 'RecoFullGlobal', + ], + PU = [ + 'DigiFullTrigger', + 'RecoFullGlobal', + ], + suffix = '_TestOldDigi', + offset = 0.1001, +) + # check for duplicate offsets offsets = [specialWF.offset for specialType,specialWF in six.iteritems(upgradeWFs)] seen = set() @@ -679,6 +783,57 @@ def condition(self, fragment, stepList, key, hasHarvest): 'Era' : 'Phase2C9', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, + '2026D51' : { + 'Geom' : 'Extended2026D51', + 'HLTmenu': '@fake2', + 'GT' : 'auto:phase2_realistic_T15', + 'Era' : 'Phase2C9', + 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], + }, + '2026D53' : { + 'Geom' : 'Extended2026D53', + 'HLTmenu': '@fake2', + 'GT' : 'auto:phase2_realistic_T15', + 'Era' : 'Phase2C9', + 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], + }, + '2026D54' : { + 'Geom' : 'Extended2026D54', + 'HLTmenu': '@fake2', + 'GT' : 'auto:phase2_realistic_T19', + 'ProcessModifier': 'phase2_PixelCPEGeneric', + 'Era' : 'Phase2C9', + 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], + }, + '2026D55' : { + 'Geom' : 'Extended2026D55', + 'HLTmenu': '@fake2', + 'GT' : 'auto:phase2_realistic_T19', + 'ProcessModifier': 'phase2_PixelCPEGeneric', + 'Era' : 'Phase2C9', + 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], + }, + '2026D56' : { + 'Geom' : 'Extended2026D56', + 'HLTmenu': '@fake2', + 'GT' : 'auto:phase2_realistic_T15', + 'Era' : 'Phase2C9', + 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], + }, + '2026D57' : { + 'Geom' : 'Extended2026D57', + 'HLTmenu': '@fake2', + 'GT' : 'auto:phase2_realistic_T15', + 'Era' : 'Phase2C9', + 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], + }, + '2026D58' : { + 'Geom' : 'Extended2026D58', + 'HLTmenu': '@fake2', + 'GT' : 'auto:phase2_realistic_T15', + 'Era' : 'Phase2C10', + 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], + }, } # standard PU sequences @@ -708,14 +863,14 @@ def __init__(self, howMuch, dataset): ('SingleGammaPt10_pythia8_cfi', UpgradeFragment(Kby(9,100),'SingleGammaPt10')), ('SingleGammaPt35_pythia8_cfi', UpgradeFragment(Kby(9,50),'SingleGammaPt35')), ('SingleMuPt1_pythia8_cfi', UpgradeFragment(Kby(25,100),'SingleMuPt1')), - ('SingleMuPt10_pythia8_cfi', UpgradeFragment(Kby(25,100),'SingleMuPt10')), - ('SingleMuPt100_pythia8_cfi', UpgradeFragment(Kby(9,100),'SingleMuPt100')), - ('SingleMuPt1000_pythia8_cfi', UpgradeFragment(Kby(9,100),'SingleMuPt1000')), + ('SingleMuPt10_Eta2p85_cfi', UpgradeFragment(Kby(9,100),'SingleMuPt10')), + ('SingleMuPt100_Eta2p85_cfi', UpgradeFragment(Kby(9,100),'SingleMuPt100')), + ('SingleMuPt1000_Eta2p85_cfi', UpgradeFragment(Kby(9,100),'SingleMuPt1000')), ('FourMuExtendedPt_1_200_pythia8_cfi', UpgradeFragment(Kby(10,100),'FourMuExtendedPt1_200')), ('TenMuExtendedE_0_200_pythia8_cfi', UpgradeFragment(Kby(10,100),'TenMuExtendedE_0_200')), - ('DoubleElectronPt10Extended_pythia8_cfi', UpgradeFragment(Kby(9,100),'SingleElectronPt10Extended')), - ('DoubleElectronPt35Extended_pythia8_cfi', UpgradeFragment(Kby(9,100),'SingleElectronPt35Extended')), - ('DoubleElectronPt1000Extended_pythia8_cfi', UpgradeFragment(Kby(9,50),'SingleElectronPt1000Extended')), + ('DoubleElectronPt10Extended_pythia8_cfi', UpgradeFragment(Kby(9,100),'SingleElPt10Extended')), + ('DoubleElectronPt35Extended_pythia8_cfi', UpgradeFragment(Kby(9,100),'SingleElPt35Extended')), + ('DoubleElectronPt1000Extended_pythia8_cfi', UpgradeFragment(Kby(9,50),'SingleElPt1000Extended')), ('DoubleGammaPt10Extended_pythia8_cfi', UpgradeFragment(Kby(9,100),'SingleGammaPt10Extended')), ('DoubleGammaPt35Extended_pythia8_cfi', UpgradeFragment(Kby(9,50),'SingleGammaPt35Extended')), ('DoubleMuPt1Extended_pythia8_cfi', UpgradeFragment(Kby(25,100),'SingleMuPt1Extended')), @@ -735,25 +890,25 @@ def __init__(self, howMuch, dataset): ('QCD_Pt_80_120_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,100),'QCD_Pt_80_120_14TeV')), ('H200ChargedTaus_Tauola_14TeV_cfi', UpgradeFragment(Kby(9,100),'Higgs200ChargedTaus_14TeV')), ('JpsiMM_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(66,100),'JpsiMM_14TeV')), - ('TTbar_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,100),'TTbar_14TeV')), + ('TTbar_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(9,100),'TTbar_14TeV')), ('WE_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,100),'WE_14TeV')), - ('ZTT_Tauola_All_hadronic_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,100),'ZTT_14TeV')), + ('ZTT_Tauola_All_hadronic_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(9,100),'ZTT_14TeV')), ('H130GGgluonfusion_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,100),'H130GGgluonfusion_14TeV')), ('PhotonJet_Pt_10_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,100),'PhotonJets_Pt_10_14TeV')), ('QQH1352T_Tauola_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,100),'QQH1352T_Tauola_14TeV')), - ('MinBias_14TeV_pythia8_TuneCUETP8M1_cfi', UpgradeFragment(Kby(90,100),'MinBias_14TeV')), + ('MinBias_14TeV_pythia8_TuneCP5_cfi', UpgradeFragment(Kby(90,100),'MinBias_14TeV')), ('WM_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,100),'WM_14TeV')), ('ZMM_13TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(18,100),'ZMM_13')), - ('QCDForPF_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(50,100),'QCD_FlatPt_15_3000HS_14')), + ('QCDForPF_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(50,100),'QCD_FlatPt_15_3000HS_14')), ('DYToLL_M-50_14TeV_pythia8_cff', UpgradeFragment(Kby(9,100),'DYToLL_M_50_14TeV')), ('DYToTauTau_M-50_14TeV_pythia8_tauola_cff', UpgradeFragment(Kby(9,100),'DYtoTauTau_M_50_14TeV')), - ('ZEE_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,100),'ZEE_14')), + ('ZEE_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(9,100),'ZEE_14')), ('QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,100),'QCD_Pt_80_120_13')), - ('H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,50),'H125GGgluonfusion_13')), - ('QCD_Pt-20toInf_MuEnrichedPt15_TuneCUETP8M1_14TeV_pythia8_cff', UpgradeFragment(Kby(9,100),'QCD_Pt-20toInf_MuEnrichedPt15_14TeV')), - ('ZMM_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(18,100),'ZMM_14')), - ('QCD_Pt-15To7000_TuneCUETP8M1_Flat_14TeV-pythia8_cff', UpgradeFragment(Kby(9,50),'QCD_Pt-15To7000_Flat_14TeV')), - ('H125GGgluonfusion_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,50),'H125GGgluonfusion_14')), + ('H125GGgluonfusion_13TeV_TuneCP5_cfi', UpgradeFragment(Kby(9,50),'H125GGgluonfusion_13')), + ('QCD_Pt20toInf_MuEnrichedPt15_14TeV_TuneCP5_cff', UpgradeFragment(Kby(19565, 217391),'QCD_Pt20toInfMuEnrichPt15_14')), # effi = 4.6e-4, local=8.000e-04 + ('ZMM_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(18,100),'ZMM_14')), + ('QCD_Pt15To7000_Flat_14TeV_TuneCP5_cff', UpgradeFragment(Kby(9,50),'QCD_Pt15To7000_Flat_14')), + ('H125GGgluonfusion_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(9,50),'H125GGgluonfusion_14')), ('QCD_Pt_600_800_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,50),'QCD_Pt_600_800_14')), ('UndergroundCosmicSPLooseMu_cfi', UpgradeFragment(Kby(9,50),'CosmicsSPLoose')), ('BeamHalo_13TeV_cfi', UpgradeFragment(Kby(9,50),'BeamHalo_13')), @@ -762,7 +917,7 @@ def __init__(self, howMuch, dataset): ('ZpMM_13TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,50),'ZpMM_13')), ('QCD_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,50),'QCD_Pt_3000_3500_13')), ('WpM_13TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,50),'WpM_13')), - ('SingleNuE10_cfi.py', UpgradeFragment(Kby(9,50),'NuGun')), + ('SingleNuE10_cfi', UpgradeFragment(Kby(9,50),'NuGun')), ('TTbarLepton_13TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,50),'TTbarLepton_13')), ('WE_13TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,50),'WE_13')), ('WM_13TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,50),'WM_13')), @@ -785,7 +940,7 @@ def __init__(self, howMuch, dataset): ('HSCPstop_M_200_TuneCUETP8M1_13TeV_pythia8_cff', UpgradeFragment(Kby(9,50),'HSCPstop_M_200_13')), ('RSGravitonToGammaGamma_kMpl01_M_3000_TuneCUETP8M1_13TeV_pythia8_cfi', UpgradeFragment(Kby(9,50),'RSGravitonToGaGa_13')), ('WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_cff', UpgradeFragment(Kby(9,50),'WpToENu_M-2000_13')), - ('DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_cff', UpgradeFragment(Kby(9,50),'DisplacedSUSY_stopToBottom_M_300_1000mm_13')), + ('DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_cff', UpgradeFragment(Kby(9,50),'DisplacedSUSY_stopToB_M_300_1000mm_13')), ('TenE_E_0_200_pythia8_cfi', UpgradeFragment(Kby(9,100),'TenE_0_200')), ('FlatRandomPtAndDxyGunProducer_cfi', UpgradeFragment(Kby(9,100),'DisplacedMuonsDxy_0_500')), ('TenTau_E_15_500_pythia8_cfi', UpgradeFragment(Kby(9,100),'TenTau_15_500')), @@ -793,14 +948,36 @@ def __init__(self, howMuch, dataset): ('SingleMuPt15Eta1p7_2p7_cfi', UpgradeFragment(Kby(9,100),'SingleMuPt15Eta1p7_2p7')), ('SingleGammaPt25Eta1p7_2p7_cfi', UpgradeFragment(Kby(9,100),'SingleGammaPt25Eta1p7_2p7')), ('SingleElectronPt15Eta1p7_2p7_cfi', UpgradeFragment(Kby(9,100),'SingleElectronPt15Eta1p7_2p7')), - ('ZTT_All_hadronic_14TeV_TuneCUETP8M1_cfi', UpgradeFragment(Kby(9,50),'ZTT_14')), + ('ZTT_All_hadronic_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(9,50),'ZTT_14')), ('CloseByParticle_Photon_ERZRanges_cfi', UpgradeFragment(Kby(9,100),'CloseByParticleGun')), - ('CE_E_Front_300um_cfi', UpgradeFragment(Kby(9,100),'CloseByParticleGun_CE_E_Front_300um')), - ('CE_E_Front_200um_cfi', UpgradeFragment(Kby(9,100),'CloseByParticleGun_CE_E_Front_200um')), - ('CE_E_Front_120um_cfi', UpgradeFragment(Kby(9,100),'CloseByParticleGun_CE_E_Front_120um')), - ('CE_H_Fine_300um_cfi', UpgradeFragment(Kby(9,100),'CloseByParticleGun_CE_H_Fine_300um')), - ('CE_H_Fine_200um_cfi', UpgradeFragment(Kby(9,100),'CloseByParticleGun_CE_H_Fine_200um')), - ('CE_H_Fine_120um_cfi', UpgradeFragment(Kby(9,100),'CloseByParticleGun_CE_H_Fine_120um')), - ('CE_H_Coarse_Scint_cfi', UpgradeFragment(Kby(9,100),'CloseByParticleGun_CE_H_Coarse_Scint')), - ('CE_H_Coarse_300um_cfi', UpgradeFragment(Kby(9,100),'CloseByParticleGun_CE_H_Coarse_300um')), + ('CE_E_Front_300um_cfi', UpgradeFragment(Kby(9,100),'CloseByPGun_CE_E_Front_300um')), + ('CE_E_Front_200um_cfi', UpgradeFragment(Kby(9,100),'CloseByPGun_CE_E_Front_200um')), + ('CE_E_Front_120um_cfi', UpgradeFragment(Kby(9,100),'CloseByPGun_CE_E_Front_120um')), + ('CE_H_Fine_300um_cfi', UpgradeFragment(Kby(9,100),'CloseByPGun_CE_H_Fine_300um')), + ('CE_H_Fine_200um_cfi', UpgradeFragment(Kby(9,100),'CloseByPGun_CE_H_Fine_200um')), + ('CE_H_Fine_120um_cfi', UpgradeFragment(Kby(9,100),'CloseByPGun_CE_H_Fine_120um')), + ('CE_H_Coarse_Scint_cfi', UpgradeFragment(Kby(9,100),'CloseByPGun_CE_H_Coarse_Scint')), + ('CE_H_Coarse_300um_cfi', UpgradeFragment(Kby(9,100),'CloseByPGun_CE_H_Coarse_300um')), + ('SingleElectronFlatPt2To100_cfi', UpgradeFragment(Kby(9,100),'SingleEFlatPt2To100')), + ('SingleMuFlatPt0p7To10_cfi', UpgradeFragment(Kby(9,100),'SingleMuFlatPt0p7To10')), + ('SingleMuFlatPt2To100_cfi', UpgradeFragment(Kby(9,100),'SingleMuFlatPt2To100')), + ('SingleGammaFlatPt8To150_cfi', UpgradeFragment(Kby(9,100),'SingleGammaFlatPt8To150')), + ('SinglePiFlatPt0p7To10_cfi', UpgradeFragment(Kby(9,100),'SinglePiFlatPt0p7To10')), + ('SingleTauFlatPt2To150_cfi', UpgradeFragment(Kby(9,100),'SingleTauFlatPt2To150')), + ('FlatRandomPtAndDxyGunProducer_MuPt2To10_cfi', UpgradeFragment(Kby(9,100),'DisplacedMuPt2To10')), + ('FlatRandomPtAndDxyGunProducer_MuPt10To30_cfi', UpgradeFragment(Kby(9,100),'DisplacedMuPt10To30')), + ('FlatRandomPtAndDxyGunProducer_MuPt30To100_cfi', UpgradeFragment(Kby(9,100),'DisplacedMuPt30To100')), + ('B0ToKstarMuMu_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(304,3030),'B0ToKstarMuMu_14TeV')), # 3.3% + ('BsToEleEle_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(223,2222),'BsToEleEle_14TeV')), # 4.5% + ('BsToJpsiGamma_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(2500,25000),'BsToJpsiGamma_14TeV')), # 0.4% + ('BsToJpsiPhi_mumuKK_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(910,9090),'BsToJpsiPhi_mumuKK_14TeV')), # 1.1% + ('BsToMuMu_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(313,3125),'BsToMuMu_14TeV')), # 3.2% + ('BsToPhiPhi_KKKK_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(556,5555),'BsToPhiPhi_KKKK_14TeV')), # 1.8% + ('TauToMuMuMu_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(18939,189393),'TauToMuMuMu_14TeV')), # effi = 5.280e-04 + ('BdToKstarEleEle_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(206,2061),'BdToKstarEleEle_14TeV')), #effi = 4.850e-02 + ('ZpTT_1500_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(9,50),'ZpTT_1500_14')), + ('BuMixing_BMuonFilter_forSTEAM_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(900,10000),'BuMixing_14')), + ('Upsilon1SToMuMu_forSTEAM_14TeV_TuneCP5_cfi', UpgradeFragment(Kby(9,50),'Upsilon1SToMuMu_14')), + ('TenTau_E_15_500_Eta3p1_pythia8_cfi', UpgradeFragment(Kby(9,100),'TenTau_15_500_Eta3p1')), ]) +