From 47b86a6fbe265d3292efda80eb64f60d7170f686 Mon Sep 17 00:00:00 2001 From: Fabio Cossutti Date: Fri, 11 Jan 2019 14:55:46 +0100 Subject: [PATCH] Revert "Backport FastSim2017 PU and pmx wfs to 10_2_X" --- .../python/relval_pileup.py | 10 --- .../python/relval_premix.py | 15 ----- .../python/relval_standard.py | 2 +- .../python/relval_steps.py | 63 +------------------ 4 files changed, 3 insertions(+), 87 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_pileup.py b/Configuration/PyReleaseValidation/python/relval_pileup.py index 4c99567c2591e..c8a756e086dfc 100644 --- a/Configuration/PyReleaseValidation/python/relval_pileup.py +++ b/Configuration/PyReleaseValidation/python/relval_pileup.py @@ -68,13 +68,3 @@ workflows[25408] = ['SMS-T1tttt_mGl-1500_mLSP-100_13',["FS_SMS-T1tttt_mGl-1500_mLSP-100_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]] workflows[25409] = ['QCD_FlatPt_15_3000HS_13',["FS_QCD_FlatPt_15_3000HS_13_UP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]] -### fastsim 2017 #### -workflows[25400.17] = ['ZEE_13',["FS_ZEE_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[25402.17] = ['TTbar_13',["FS_TTbar_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[25403.17] = ['H125GGgluonfusion_13',["FS_H125GGgluonfusion_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -#workflow[25404] -workflows[25405.17] = ['ZTT_13',["FS_ZTT_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[25406.17] = ['ZMM_13',["FS_ZMM_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[25407.17] = ['NuGun_UP17',["FS_NuGun_UP17_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[25408.17] = ['SMS-T1tttt_mGl-1500_mLSP-100_13',["FS_SMS-T1tttt_mGl-1500_mLSP-100_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[25409.17] = ['QCD_FlatPt_15_3000HS_13',["FS_QCD_FlatPt_15_3000HS_13_UP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] diff --git a/Configuration/PyReleaseValidation/python/relval_premix.py b/Configuration/PyReleaseValidation/python/relval_premix.py index eab5db771862a..2f60e494bd8d0 100644 --- a/Configuration/PyReleaseValidation/python/relval_premix.py +++ b/Configuration/PyReleaseValidation/python/relval_premix.py @@ -79,18 +79,3 @@ workflows[250407] = ['NuGun_UP15',["FS_NuGun_UP15_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]] workflows[250408] = ['QCD_FlatPt_15_3000HS_13',["FS_QCD_FlatPt_15_3000HS_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]] workflows[250409] = ['SMS-T1tttt_mGl-1500_mLSP-100_13',["FS_SMS-T1tttt_mGl-1500_mLSP-100_13_PRMXUP15_PU25","HARVESTUP15FS","MINIAODMCUP15FS"]] - -#fastsim, 2017 PU50#### - -## premixed minbias -workflows[250399.17]=['',['FS_PREMIXUP17_PU50']] -## signal + PU -workflows[250400.17] = ['ZEE_13',["FS_ZEE_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[250402.17] = ['TTbar_13',["FS_TTbar_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[250402.171] = ['TTbar_13',["FS_PREMIXUP17_PU50","FS_TTbar_13_PRMXLOCALUP17_PU50","HARVESTUP17FS"]] -workflows[250403.17] = ['H125GGgluonfusion_13',["FS_H125GGgluonfusion_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[250405.17] = ['ZTT_13',["FS_ZTT_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[250406.17] = ['ZMM_13',["FS_ZMM_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[250407.17] = ['NuGun_UP17',["FS_NuGun_UP17_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[250408.17] = ['QCD_FlatPt_15_3000HS_13',["FS_QCD_FlatPt_15_3000HS_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] -workflows[250409.17] = ['SMS-T1tttt_mGl-1500_mLSP-100_13',["FS_SMS-T1tttt_mGl-1500_mLSP-100_13_PRMXUP17_PU50","HARVESTUP17FS","MINIAODMCUP17FS"]] diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index f9b5753faf03c..d6883feee0e34 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -400,7 +400,7 @@ workflows[2017.13] = ['TTbar_13_UP17', ['TTbarFS_13_trackingOnlyValidation_UP17','HARVESTUP17FS_trackingOnly']] ### MinBias fastsim_13 TeV for mixing ### -workflows[2017.8] = ['',['MinBiasFS_13_UP17_ForMixing']] +workflows[2017.8] = ['',['MinBiasFS_13_ForMixing']] ### standard set ### diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 01c09d80118ac..dbd68098acbec 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -572,7 +572,7 @@ def identitySim(wf): 'CMSSW_7_3_0_pre1-PRE_LS172_V15_FastSim-v1', # 4 - fast sim GEN-SIM-DIGI-RAW-HLTDEBUG for id tests 'CMSSW_9_0_0_pre4-PU25ns_90X_mcRun2_asymptotic_v1-v1', # 5 - fullSim PU 25ns UP15 premix 'CMSSW_8_1_0_pre15-PU50ns_81X_mcRun2_startup_v12-v1', # 6 - fullSim PU 50ns UP15 premix - 'CMSSW_10_2_8-102X_mc2017_realistic_v5_FastSim-v1', # 7 - fastSim MinBias for mixing + 'CMSSW_10_2_0-102X_mcRun2_asymptotic_v3_gcc7_FastSim-v1', # 7 - fastSim MinBias for mixing 'CMSSW_10_2_0-PU25ns_102X_mcRun2_asymptotic_v3_gcc7_FastSim-v1',# 8 - fastSim premixed MinBias 'CMSSW_10_2_0-102X_upgrade2018_realistic_v9_gcc7-v1', # 9 - Run2 HI GEN-SIM for mixing 'CMSSW_7_6_0-76X_mcRun2_asymptotic_v11-v1', # 10 - 13 TeV High Stats GEN-SIM @@ -924,10 +924,7 @@ def genS(fragment,howMuch): '--datatier':'GEN-SIM-DIGI-RECO,DQMIO', '--relval':'27000,3000'}, step1Defaults]) -step1FastPU17NewMixing =merge([{'-s':'GEN,SIM,RECOBEFMIX', - '--eventcontent':'FASTPU', - '--datatier':'GEN-SIM-RECO'}, - step1FastUpg2017Defaults]) + step1FastUpg2017_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'}, step1FastUpg2017Defaults]) @@ -978,19 +975,11 @@ def genS(fragment,howMuch): steps['SingleMuPt10FS_UP17']=merge([{'cfg':'SingleMuPt10_pythia8_cfi'},step1FastUpg2017Defaults]) steps['SingleMuPt100FS_UP17']=merge([{'cfg':'SingleMuPt100_pythia8_cfi'},step1FastUpg2017Defaults]) -### FastSim: produce sample of minbias events for PU mixing -steps['MinBiasFS_13_UP17_ForMixing']=merge([{'cfg':'MinBias_13TeV_pythia8_TuneCUETP8M1_cfi'},Kby(100,1000),step1FastPU17NewMixing]) - ### FastSim: template to produce signal and overlay with minbias events PUFS25={'--pileup':'AVE_35_BX_25ns', '--pileup_input':'das:/RelValMinBiasFS_13_ForMixing/%s/GEN-SIM-RECO'%(baseDataSetRelease[7],)} FS_UP15_PU25_OVERLAY = merge([PUFS25,Kby(100,500),steps['TTbarFS_13']] ) -### FastSim: template to produce signal and overlay with minbias events #PU50 -PUFSAVE50={'--pileup':'AVE_50_BX_25ns', - '--pileup_input':'das:/RelValMinBiasFS_13_UP17_ForMixing/%s/GEN-SIM-RECO'%(baseDataSetRelease[7],)} -FS_UP17_PU50_OVERLAY = merge([PUFSAVE50,Kby(100,500),steps['TTbarFS_13_UP17']] ) - ### FastSim: produce sample of premixed minbias events steps["FS_PREMIXUP15_PU25"] = merge([ {"cfg":"SingleNuE10_cfi", @@ -1027,53 +1016,6 @@ def genS(fragment,howMuch): key = "FS_" + x + "_UP15_PU25" steps[key] = merge([{"cfg":steps[x]["cfg"]},FS_UP15_PU25_OVERLAY]) -### FastSim: produce sample of premixed minbias events UP17 -steps["FS_PREMIXUP17_PU50"] = merge([ - {"cfg":"SingleNuE10_cfi", - "--fast":"", - "--conditions":"auto:phase1_2017_realistic", - "-s":"GEN,SIM,RECOBEFMIX,DIGI,L1,DIGI2RAW", - "--eventcontent":"PREMIX", - "--datatier":"GEN-SIM-DIGI-RAW", - "--procModifiers":"premix_stage1", - "--era":"Run2_2017_FastSim", - }, - PUFSAVE50,Kby(100,500)]) - -### Fastsim: template to produce signal and overlay it with premixed minbias events -FS_PREMIXUP17_PU50_OVERLAY = merge([ -# {"-s" : "GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,DATAMIX,L1,DIGI2RAW,L1Reco,RECO,HLT:@relval2016,VALIDATION", - {"-s" : "GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,DATAMIX,L1,DIGI2RAW,L1Reco,RECO,VALIDATION", - "--datamix" : "PreMix", - "--procModifiers": "premix_stage2", - "--pileup_input" : "dbs:/RelValFS_PREMIXUP17_PU50/%s/PREMIX"%(baseDataSetRelease[8],), - }, - Kby(100,500),step1FastUpg2017Defaults]) - -# For combined premixing stage1+stage2 workflow -FS_PREMIXUP17_PU50_LOCAL_OVERLAY = merge([ - {"--pileup_input": "file:step1.root" - }, - FS_PREMIXUP17_PU50_OVERLAY -]) - -### FastSim: list of processes used in FastSim validation -fs_proclist = ["ZEE_13",'TTbar_13','H125GGgluonfusion_13','ZTT_13','ZMM_13','NuGun_UP17','QCD_FlatPt_15_3000HS_13','SMS-T1tttt_mGl-1500_mLSP-100_13'] - -### FastSim: produces sample of signal events, overlayed with premixed minbias events -for x in fs_proclist: - key = "FS_" + x + "_PRMXUP17_PU50" - steps[key] = merge([FS_PREMIXUP17_PU50_OVERLAY,{"cfg":steps[x]["cfg"]}]) - - key = key.replace("PRMXUP17", "PRMXLOCALUP17") - steps[key] = merge([FS_PREMIXUP17_PU50_LOCAL_OVERLAY,{"cfg":steps[x]["cfg"]}]) - -### FastSim: produce sample of signal events, overlayed with minbias events -for x in fs_proclist: - key = "FS_" + x + "_UP17_PU50" - steps[key] = merge([{"cfg":steps[x]["cfg"]},FS_UP17_PU50_OVERLAY]) - -###end UP17 ### steps['TTbarSFS']=merge([{'cfg':'TTbar_8TeV_TuneCUETP8M1_cfi'}, {'-s':'GEN,SIM', @@ -2988,4 +2930,3 @@ def gen2018HiMix(fragment,howMuch): k=step+'_'+key if step in upgradeStepDict and key in upgradeStepDict[step]: steps[k]=merge([upgradeStepDict[step][key]]) -# my-new-feature