From 07049b60dfd17db4cce7b1ea8cd78166614d6653 Mon Sep 17 00:00:00 2001 From: Hengne Date: Thu, 29 Oct 2015 17:36:11 +0100 Subject: [PATCH 01/10] keep only gensim step for fullsim nopu workflows --- .../python/relval_standard.py | 116 +++++++++--------- 1 file changed, 57 insertions(+), 59 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index b3f7f3ee99661..f95eef86f2ae9 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -12,9 +12,9 @@ workflows[1] = ['', ['ProdMinBias','DIGIPROD1','RECOPROD1']] workflows[2] = ['', ['ProdTTbar','DIGIPROD1','RECOPROD1']] workflows[3] = ['', ['ProdQCD_Pt_3000_3500','DIGIPROD1','RECOPROD1']] -workflows[1301] = ['', ['ProdMinBias_13','DIGIUP15PROD1','RECOPRODUP15']] -workflows[1302] = ['', ['ProdTTbar_13','DIGIUP15PROD1','RECOPRODUP15']] -workflows[1303] = ['', ['ProdQCD_Pt_3000_3500_13','DIGIUP15PROD1','RECOPRODUP15']] +workflows[1301] = ['', ['ProdMinBias_13']] +workflows[1302] = ['', ['ProdTTbar_13']] +workflows[1303] = ['', ['ProdQCD_Pt_3000_3500_13']] ### data ### workflows[4.5] = ['', ['RunCosmicsA','RECOCOSD','ALCACOSD','HARVESTDC']] @@ -135,16 +135,16 @@ workflows[21] = ['', ['SingleMuPt100','DIGI','RECO','HARVEST']] workflows[22] = ['', ['SingleMuPt1000','DIGI','RECO','HARVEST']] ## particle guns postLS1 -workflows[1315] = ['', ['SingleElectronPt10_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1316] = ['', ['SingleElectronPt1000_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1317] = ['', ['SingleElectronPt35_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1318] = ['', ['SingleGammaPt10_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1319] = ['', ['SingleGammaPt35_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1306] = ['', ['SingleMuPt1_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1320] = ['', ['SingleMuPt10_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1321] = ['', ['SingleMuPt100_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1322] = ['', ['SingleMuPt1000_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1323] = ['', ['NuGun_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1315] = ['', ['SingleElectronPt10_UP15']] +workflows[1316] = ['', ['SingleElectronPt1000_UP15']] +workflows[1317] = ['', ['SingleElectronPt35_UP15']] +workflows[1318] = ['', ['SingleGammaPt10_UP15']] +workflows[1319] = ['', ['SingleGammaPt35_UP15']] +workflows[1306] = ['', ['SingleMuPt1_UP15']] +workflows[1320] = ['', ['SingleMuPt10_UP15']] +workflows[1321] = ['', ['SingleMuPt100_UP15']] +workflows[1322] = ['', ['SingleMuPt1000_UP15']] +workflows[1323] = ['', ['NuGun_UP15']] #workflows[140.1] = ['',['HydjetQ_MinBias_2760GeV_UP15','DIGIHIUP15','RECOHIUP15','HARVESTHI']] # need new GEN-SIM for this one ## 8 TeV @@ -185,54 +185,52 @@ workflows[45] = ['', ['ZpTT_1500_8TeV_Tauola','DIGI','RECO','HARVEST']] ## 13 TeV and postLS1 geometry -workflows[1324] = ['', ['TTbarLepton_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1335] = ['', ['Wjet_Pt_80_120_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1336] = ['', ['Wjet_Pt_3000_3500_13','DIGIUP15','RECOUP15','HARVESTUP15']] -#workflows[1337] = ['', ['LM1_sfts_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1337] = ['', ['SMS-T1tttt_mGl-1500_mLSP-100_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1338] = ['', ['QCD_FlatPt_15_3000HS_13','DIGIUP15','RECOUP15','HARVESTUP15']] - -workflows[1309] = ['', ['Higgs200ChargedTaus_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1313] = ['', ['QCD_Pt_3000_3500_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1339] = ['', ['QCD_Pt_600_800_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1325] = ['', ['TTbar_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCATT']] -workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCAELE']] -workflows[1331] = ['', ['ZTT_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1332] = ['', ['H130GGgluonfusion_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1333] = ['', ['PhotonJets_Pt_10_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1334] = ['', ['QQH1352T_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1324] = ['', ['TTbarLepton_13']] +workflows[1335] = ['', ['Wjet_Pt_80_120_13']] +workflows[1336] = ['', ['Wjet_Pt_3000_3500_13']] +workflows[1337] = ['', ['SMS-T1tttt_mGl-1500_mLSP-100_13']] +workflows[1338] = ['', ['QCD_FlatPt_15_3000HS_13']] + +workflows[1309] = ['', ['Higgs200ChargedTaus_13']] +workflows[1313] = ['', ['QCD_Pt_3000_3500_13']] +workflows[1339] = ['', ['QCD_Pt_600_800_13']] +workflows[1325] = ['', ['TTbar_13','ALCATT']] +workflows[1326] = ['', ['WE_13']] +workflows[1329] = ['', ['ZEE_13']] +workflows[1331] = ['', ['ZTT_13']] +workflows[1332] = ['', ['H130GGgluonfusion_13']] +workflows[1333] = ['', ['PhotonJets_Pt_10_13']] +workflows[1334] = ['', ['QQH1352T_13']] workflows[1346] = ['', ['ZmumuJets_Pt_20_300_13']] -workflows[1347] = ['', ['Upsilon1SToMuMu_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1348] = ['', ['BuToKstarMuMu_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1349] = ['', ['BsToMuMu_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1350] = ['', ['JpsiMuMu_Pt-15','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1351] = ['', ['BuToKstarPsi2S_13','DIGIUP15','RECOUP15','HARVESTUP15']] - -#workflows[1307] = ['', ['Cosmics_UP15','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']] -workflows[1307] = ['', ['CosmicsSPLoose_UP15','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']] -workflows[1308] = ['', ['BeamHalo_13','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']] -workflows[1311] = ['', ['MinBias_13','DIGIUP15','RECOMINUP15','HARVESTUP15','ALCAMIN']] -workflows[1328] = ['', ['QCD_Pt_80_120_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1327] = ['', ['WM_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1330] = ['', ['ZMM_13','DIGIUP15','RECOUP15','HARVESTUP15']] - -workflows[1310] = ['', ['ADDMonoJet_d3MD3_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1312] = ['', ['ZpMM_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1314] = ['', ['WpM_13','DIGIUP15','RECOUP15','HARVESTUP15']] - -workflows[1340] = ['', ['BuJpsiK_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1341] = ['', ['RSKKGluon_m3000GeV_13','DIGIUP15','RECOUP15','HARVESTUP15']] - -workflows[1343] = ['', ['ZpMM_2250_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1344] = ['', ['ZpEE_2250_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1345] = ['', ['ZpTT_1500_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1352] = ['', ['HSCPstop_M_200_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1353] = ['', ['RSGravitonToGaGa_13','DIGIUP15','RECOUP15','HARVESTUP15']] -workflows[1354] = ['', ['WpToENu_M-2000_13','DIGIUP15','RECOUP15','HARVESTUP15']] - -workflows[1355] = ['', ['DisplacedSUSY_stopToBottom_M_300_1000mm_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1347] = ['', ['Upsilon1SToMuMu_13']] +workflows[1348] = ['', ['BuToKstarMuMu_13']] +workflows[1349] = ['', ['BsToMuMu_13']] +workflows[1350] = ['', ['JpsiMuMu_Pt-15']] +workflows[1351] = ['', ['BuToKstarPsi2S_13']] + +workflows[1307] = ['', ['CosmicsSPLoose_UP15']] +workflows[1308] = ['', ['BeamHalo_13']] +workflows[1311] = ['', ['MinBias_13']] +workflows[1328] = ['', ['QCD_Pt_80_120_13']] +workflows[1327] = ['', ['WM_13']] +workflows[1330] = ['', ['ZMM_13']] + +workflows[1310] = ['', ['ADDMonoJet_d3MD3_13']] +workflows[1312] = ['', ['ZpMM_13']] +workflows[1314] = ['', ['WpM_13']] + +workflows[1340] = ['', ['BuJpsiK_13']] +workflows[1341] = ['', ['RSKKGluon_m3000GeV_13']] + +workflows[1343] = ['', ['ZpMM_2250_13']] +workflows[1344] = ['', ['ZpEE_2250_13']] +workflows[1345] = ['', ['ZpTT_1500_13']] +workflows[1352] = ['', ['HSCPstop_M_200_13']] +workflows[1353] = ['', ['RSGravitonToGaGa_13']] +workflows[1354] = ['', ['WpToENu_M-2000_13']] + +workflows[1355] = ['', ['DisplacedSUSY_stopToBottom_M_300_1000mm_13']] ### HI test ### From 8fd4627e2ef291831bbb0d6618e56055a5ebbbe0 Mon Sep 17 00:00:00 2001 From: Hengne Date: Thu, 29 Oct 2015 18:14:52 +0100 Subject: [PATCH 02/10] keep only gensim: better clean up --- Configuration/PyReleaseValidation/python/relval_standard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index f95eef86f2ae9..f7131ebb93990 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -194,7 +194,7 @@ workflows[1309] = ['', ['Higgs200ChargedTaus_13']] workflows[1313] = ['', ['QCD_Pt_3000_3500_13']] workflows[1339] = ['', ['QCD_Pt_600_800_13']] -workflows[1325] = ['', ['TTbar_13','ALCATT']] +workflows[1325] = ['', ['TTbar_13']] workflows[1326] = ['', ['WE_13']] workflows[1329] = ['', ['ZEE_13']] workflows[1331] = ['', ['ZTT_13']] From d8075f2049283f9bc6d57740064ab421a7f2a06e Mon Sep 17 00:00:00 2001 From: Hengne Date: Mon, 2 Nov 2015 14:52:14 +0100 Subject: [PATCH 03/10] change H130GGgluonfusion_13 to H125GGgluonfusion_13 --- ...cfi.py => H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py} | 0 Configuration/PyReleaseValidation/python/relval_pileup.py | 4 ++-- Configuration/PyReleaseValidation/python/relval_premix.py | 4 ++-- .../PyReleaseValidation/python/relval_standard.py | 8 ++++---- Configuration/PyReleaseValidation/python/relval_steps.py | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) rename Configuration/Generator/python/{H130GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py => H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py} (100%) diff --git a/Configuration/Generator/python/H130GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py similarity index 100% rename from Configuration/Generator/python/H130GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py rename to Configuration/Generator/python/H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py diff --git a/Configuration/PyReleaseValidation/python/relval_pileup.py b/Configuration/PyReleaseValidation/python/relval_pileup.py index 30a7cab7a7b56..9d516036f1f0f 100644 --- a/Configuration/PyReleaseValidation/python/relval_pileup.py +++ b/Configuration/PyReleaseValidation/python/relval_pileup.py @@ -31,7 +31,7 @@ workflows[50200]=['',['ZEE_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']] workflows[50201]=['',['ZmumuJets_Pt_20_300_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']] workflows[50202]=['',['TTbar_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']] -workflows[50203]=['',['H130GGgluonfusion_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']] +workflows[50203]=['',['H125GGgluonfusion_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']] workflows[50204]=['',['QQH1352T_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']] workflows[50205]=['',['ZTT_13','DIGIUP15_PU50','RECOUP15_PU50','HARVEST','MINIAODMC50']] @@ -42,7 +42,7 @@ workflows[25201]=['',['ZmumuJets_Pt_20_300_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']] # cannot be recycled => GEN SIM NEEDED! workflows[25202]=['',['TTbar_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']] -workflows[25203]=['',['H130GGgluonfusion_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']] +workflows[25203]=['',['H125GGgluonfusion_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']] workflows[25204]=['',['QQH1352T_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']] workflows[25205]=['',['ZTT_13','DIGIUP15_PU25','RECOUP15_PU25','HARVEST','MINIAODMC']] diff --git a/Configuration/PyReleaseValidation/python/relval_premix.py b/Configuration/PyReleaseValidation/python/relval_premix.py index f1c650a115fec..bdffa905bfa7a 100644 --- a/Configuration/PyReleaseValidation/python/relval_premix.py +++ b/Configuration/PyReleaseValidation/python/relval_premix.py @@ -18,7 +18,7 @@ workflows[250200]=['',['ZEE_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']] workflows[250201]=['',['ZmumuJets_Pt_20_300_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']] workflows[250202]=['',['TTbar_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']] -workflows[250203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']] +workflows[250203]=['',['H125GGgluonfusion_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']] workflows[250204]=['',['QQH1352T_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']] workflows[250205]=['',['ZTT_13','DIGIPRMXUP15_PU25','RECOPRMXUP15_PU25','HARVEST']] @@ -27,7 +27,7 @@ workflows[500200]=['',['ZEE_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']] workflows[500201]=['',['ZmumuJets_Pt_20_300_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']] workflows[500202]=['',['TTbar_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']] -workflows[500203]=['',['H130GGgluonfusion_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']] +workflows[500203]=['',['H125GGgluonfusion_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']] workflows[500204]=['',['QQH1352T_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']] workflows[500205]=['',['ZTT_13','DIGIPRMXUP15_PU50','RECOPRMXUP15_PU50','HARVEST']] diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index f7131ebb93990..5f52319b421f1 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -108,7 +108,7 @@ workflows[5.5] = ['ZTT',['ZTTFS','HARVESTFS']] workflows[5.6] = ['QCD_FlatPt_15_3000', ['QCDFlatPt153000FS','HARVESTFS']] -workflows[5.7] = ['H130GGgluonfusion', ['H130GGgluonfusionFS','HARVESTFS']] +workflows[5.7] = ['H125GGgluonfusion', ['H125GGgluonfusionFS','HARVESTFS']] ### fastsim_13 TeV ### workflows[135.1] = ['TTbar_13', ['TTbarFS_13','HARVESTUP15FS']] @@ -118,7 +118,7 @@ workflows[135.5] = ['ZTT_13',['ZTTFS_13','HARVESTUP15FS']] workflows[135.6] = ['QCD_FlatPt_15_3000_13', ['QCDFlatPt153000FS_13','HARVESTUP15FS']] -workflows[135.7] = ['H130GGgluonfusion_13', ['H130GGgluonfusionFS_13','HARVESTUP15FS']] +workflows[135.7] = ['H125GGgluonfusion_13', ['H125GGgluonfusionFS_13','HARVESTUP15FS']] ### MinBias fastsim_13 TeV for mixing ### workflows[135.8] = ['',['MinBiasFS_13_ForMixing']] @@ -163,7 +163,7 @@ workflows[26] = ['', ['WE','DIGI','RECO','HARVEST']] workflows[29] = ['', ['ZEE','DIGI','RECO','HARVEST','ALCAELE']] workflows[31] = ['', ['ZTT','DIGI','RECO','HARVEST']] -workflows[32] = ['', ['H130GGgluonfusion','DIGI','RECO','HARVEST']] +workflows[32] = ['', ['H125GGgluonfusion','DIGI','RECO','HARVEST']] workflows[33] = ['', ['PhotonJets_Pt_10','DIGI','RECO','HARVEST']] workflows[34] = ['', ['QQH1352T','DIGI','RECO','HARVEST']] workflows[46] = ['', ['ZmumuJets_Pt_20_300']] @@ -198,7 +198,7 @@ workflows[1326] = ['', ['WE_13']] workflows[1329] = ['', ['ZEE_13']] workflows[1331] = ['', ['ZTT_13']] -workflows[1332] = ['', ['H130GGgluonfusion_13']] +workflows[1332] = ['', ['H125GGgluonfusion_13']] workflows[1333] = ['', ['PhotonJets_Pt_10_13']] workflows[1334] = ['', ['QQH1352T_13']] workflows[1346] = ['', ['ZmumuJets_Pt_20_300_13']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 6d427cff44f6f..238e03f193862 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -404,7 +404,7 @@ def identitySim(wf): steps['ZMM_13INPUT']={'INPUT':InputInfo(dataSet='/RelValZMM_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['ZpMM_13INPUT']={'INPUT':InputInfo(dataSet='/RelValZpMM_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['ZTT_13INPUT']={'INPUT':InputInfo(dataSet='/RelValZTT_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} -steps['H130GGgluonfusion_13INPUT']={'INPUT':InputInfo(dataSet='/RelValH130GGgluonfusion_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} +steps['H125GGgluonfusion_13INPUT']={'INPUT':InputInfo(dataSet='/RelValH125GGgluonfusion_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['PhotonJets_Pt_10_13INPUT']={'INPUT':InputInfo(dataSet='/RelValPhotonJets_Pt_10_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} # temp. comment 1 line below because no corresponding GEN-SIM have been generated yet #steps['QQH1352T_13INPUT']={'INPUT':InputInfo(dataSet='/RelValQQH1352T_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} @@ -485,7 +485,7 @@ def genS(fragment,howMuch): steps['PhotonJets_Pt_10']=genS('PhotonJet_Pt_10_8TeV_TuneCUETP8M1_cfi',Kby(9,150)) steps['QQH1352T']=genS('QQH1352T_8TeV_TuneCUETP8M1_cfi',Kby(9,100)) steps['ZTT_13']=gen2015('ZTT_Tauola_All_hadronic_13TeV_TuneCUETP8M1_cfi',Kby(9,150)) -steps['H130GGgluonfusion_13']=gen2015('H130GGgluonfusion_13TeV_TuneCUETP8M1_cfi',Kby(9,100)) +steps['H125GGgluonfusion_13']=gen2015('H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi',Kby(9,100)) steps['PhotonJets_Pt_10_13']=gen2015('PhotonJet_Pt_10_13TeV_TuneCUETP8M1_cfi',Kby(9,150)) steps['QQH1352T_13']=gen2015('QQH1352T_13TeV_TuneCUETP8M1_cfi',Kby(9,100)) steps['ZmumuJets_Pt_20_300']=gen('ZmumuJets_Pt_20_300_GEN_8TeV_TuneCUETP8M1_cfg',Kby(25,100)) @@ -885,7 +885,7 @@ def addForAll(steps,d): steps['QCDFlatPt153000FS_13']=merge([{'cfg':'QCDForPF_13TeV_TuneCUETP8M1_cfi'},Kby(27,2000),step1FastUpg2015Defaults]) steps['QCD_Pt_80_120FS_13']=merge([{'cfg':'QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi'},Kby(100,500),step1FastUpg2015Defaults]) steps['QCD_Pt_3000_3500FS_13']=merge([{'cfg':'QCD_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi'},Kby(100,500),step1FastUpg2015Defaults]) -steps['H130GGgluonfusionFS_13']=merge([{'cfg':'H130GGgluonfusion_13TeV_TuneCUETP8M1_cfi'},step1FastUpg2015Defaults]) +steps['H125GGgluonfusionFS_13']=merge([{'cfg':'H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi'},step1FastUpg2015Defaults]) steps['SingleMuPt10FS_UP15']=merge([{'cfg':'SingleMuPt10_cfi'},step1FastUpg2015Defaults]) steps['SingleMuPt100FS_UP15']=merge([{'cfg':'SingleMuPt100_cfi'},step1FastUpg2015Defaults]) From 67e5c7fb26172ee9e93dc1abd22b439faa0c9a4d Mon Sep 17 00:00:00 2001 From: Hengne Date: Mon, 2 Nov 2015 15:57:58 +0100 Subject: [PATCH 04/10] fix bug in changing H130to H125, and replace 3 old BPH workflows with 3 new. --- ...nFilter_forSTEAM_13TeV_TuneCUETP8M1_cfi.py | 60 +++++++++++++++++++ ...JpsiJpsi_forSTEAM_TuneCUEP8M1_13TeV_cfi.py | 59 ++++++++++++++++++ ...YTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff.py | 44 ++++++++++++++ .../python/relval_standard.py | 10 ++-- .../python/relval_steps.py | 12 ++-- 5 files changed, 174 insertions(+), 11 deletions(-) create mode 100644 Configuration/Generator/python/BuMixing_BMuonFilter_forSTEAM_13TeV_TuneCUETP8M1_cfi.py create mode 100644 Configuration/Generator/python/EtaBToJpsiJpsi_forSTEAM_TuneCUEP8M1_13TeV_cfi.py create mode 100644 Configuration/Generator/python/PYTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff.py diff --git a/Configuration/Generator/python/BuMixing_BMuonFilter_forSTEAM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/BuMixing_BMuonFilter_forSTEAM_13TeV_TuneCUETP8M1_cfi.py new file mode 100644 index 0000000000000..4338732dc1be4 --- /dev/null +++ b/Configuration/Generator/python/BuMixing_BMuonFilter_forSTEAM_13TeV_TuneCUETP8M1_cfi.py @@ -0,0 +1,60 @@ +##!!!For BPH Trigger and Generator study only, not ok for physics use. +import FWCore.ParameterSet.Config as cms +from Configuration.Generator.Pythia8CommonSettings_cfi import * +from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * +from GeneratorInterface.EvtGenInterface.EvtGenSetting_cff import * +generator = cms.EDFilter("Pythia8GeneratorFilter", +pythiaPylistVerbosity = cms.untracked.int32(0), +pythiaHepMCVerbosity = cms.untracked.bool(False), +comEnergy = cms.double(13000.0), +maxEventsToPrint = cms.untracked.int32(0), +ExternalDecays = cms.PSet( +EvtGen130 = cms.untracked.PSet( +decay_table = cms.string('GeneratorInterface/EvtGenInterface/data/DECAY_2010.DEC'), +particle_property_file = cms.FileInPath('GeneratorInterface/EvtGenInterface/data/evt.pdl'), +user_decay_file = cms.vstring('GeneratorInterface/ExternalDecays/data/Bu_Mixing.dec'), +list_forced_decays = cms.vstring('MyB+', +'MyB-'), +operates_on_particles = cms.vint32() +), +parameterSets = cms.vstring('EvtGen130') +), +PythiaParameters = cms.PSet( +pythia8CommonSettingsBlock, +pythia8CUEP8M1SettingsBlock, +processParameters = cms.vstring( +'HardQCD:all = on', +'PhaseSpace:pTHatMin = 8', +), +parameterSets = cms.vstring('pythia8CommonSettings', +'pythia8CUEP8M1Settings', +'processParameters', +) +) +) +generator.PythiaParameters.processParameters.extend(EvtGenExtraParticles) +configurationMetadata = cms.untracked.PSet( +version = cms.untracked.string('$Revision: 1.1 $'), +name = cms.untracked.string('$Source: Configuration/Generator/python/BuToKstarMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py $'), +annotation = cms.untracked.string('Summer14: Pythia8+EvtGen130 generation of Bu --> K* Mu+Mu-, 13TeV, Tune CUETP8M1') +) + +mumugenfilter = cms.EDFilter("MCParticlePairFilter", + Status = cms.untracked.vint32(1, 1), + MinPt = cms.untracked.vdouble(0.5, 0.5), + MinP = cms.untracked.vdouble(0., 0.), + MaxEta = cms.untracked.vdouble(2.5, 2.5), + MinEta = cms.untracked.vdouble(-2.5, -2.5), + MinInvMass = cms.untracked.double(2.0), + MaxInvMass = cms.untracked.double(4.0), + ParticleCharge = cms.untracked.int32(-1), + ParticleID1 = cms.untracked.vint32(13), + ParticleID2 = cms.untracked.vint32(13) +) + +########### +# Filters # +########### +# Filter only pp events which produce a B+: +bufilter = cms.EDFilter("PythiaFilter", ParticleID = cms.untracked.int32(521)) +ProductionFilterSequence = cms.Sequence(generator*bufilter*mumugenfilter) diff --git a/Configuration/Generator/python/EtaBToJpsiJpsi_forSTEAM_TuneCUEP8M1_13TeV_cfi.py b/Configuration/Generator/python/EtaBToJpsiJpsi_forSTEAM_TuneCUEP8M1_13TeV_cfi.py new file mode 100644 index 0000000000000..1f887fc068ed4 --- /dev/null +++ b/Configuration/Generator/python/EtaBToJpsiJpsi_forSTEAM_TuneCUEP8M1_13TeV_cfi.py @@ -0,0 +1,59 @@ +# For BPH trigger study only +import FWCore.ParameterSet.Config as cms +from Configuration.Generator.Pythia8CommonSettings_cfi import * +from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * +generator = cms.EDFilter("Pythia8GeneratorFilter", +maxEventsToPrint = cms.untracked.int32(1), +pythiaPylistVerbosity = cms.untracked.int32(1), +filterEfficiency = cms.untracked.double(1.0), +pythiaHepMCVerbosity = cms.untracked.bool(False), +comEnergy = cms.double(13000.), +PythiaParameters = cms.PSet( +pythia8CommonSettingsBlock, +pythia8CUEP8M1SettingsBlock, +pythiaEtab = cms.vstring( +'Higgs:useBSM = on', +'HiggsBSM:gg2H2 = on', +'HiggsH2:coup2d = 10.0', +'HiggsH2:coup2u = 10.0', +'HiggsH2:coup2Z = 0.0', +'HiggsH2:coup2W = 0.0', +'HiggsA3:coup2H2Z = 0.0', +'HiggsH2:coup2A3A3 = 0.0', +'HiggsH2:coup2H1H1 = 0.0', +'443:onMode = off', +'443:onIfMatch 13 13', +'333:onMode = off', +'333:onIfMatch 13 13', +'553:onMode = off', +'553:onIfMatch 13 13', +############# For Fixed Mass Distribution############# +'35:mMin = 0', +'35:mMax = 50.0', +'35:m0 = 7.0', +'35:mWidth = 0.00', +'35:addChannel 1 1.00 100 443 443', +'35:onMode = off', +'35:onIfMatch 443 443'), ## JpsiJpsi +# This is a vector of ParameterSet names to be read, in this order +parameterSets = cms.vstring('pythia8CommonSettings', +'pythia8CUEP8M1Settings', +'pythiaEtab') +) +) +etafilter = cms.EDFilter("PythiaFilter", +MaxEta = cms.untracked.double(9999.0), +MinEta = cms.untracked.double(-9999.0), +ParticleID = cms.untracked.int32(35) +) +jpsifilter = cms.EDFilter("PythiaDauVFilter", +MotherID = cms.untracked.int32(10551), +verbose = cms.untracked.int32(0), +ParticleID = cms.untracked.int32(443), +MaxEta = cms.untracked.vdouble(2.6, 2.6), +MinEta = cms.untracked.vdouble(-2.6, -2.6), +DaughterIDs = cms.untracked.vint32(13, -13), +MinPt = cms.untracked.vdouble(1.8, 1.8), +NumberDaughters = cms.untracked.int32(2) +) +ProductionFilterSequence = cms.Sequence(generator*etafilter) diff --git a/Configuration/Generator/python/PYTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff.py b/Configuration/Generator/python/PYTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff.py new file mode 100644 index 0000000000000..88fd27297769b --- /dev/null +++ b/Configuration/Generator/python/PYTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff.py @@ -0,0 +1,44 @@ +# For BPH Trigger Study Only +import FWCore.ParameterSet.Config as cms +from Configuration.Generator.Pythia8CommonSettings_cfi import * +from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * + +generator = cms.EDFilter("Pythia8GeneratorFilter", + maxEventsToPrint = cms.untracked.int32(1), + pythiaPylistVerbosity = cms.untracked.int32(1), + filterEfficiency = cms.untracked.double(1.0), + pythiaHepMCVerbosity = cms.untracked.bool(False), + comEnergy = cms.double(13000.), + PythiaParameters = cms.PSet( + pythia8CommonSettingsBlock, + pythia8CUEP8M1SettingsBlock, + pythiaPhi = cms.vstring( + 'SoftQCD:nonDiffractive = on', + 'SoftQCD:singleDiffractive = on', + 'SoftQCD:doubleDiffractive = on', + '333:onMode = off', + '333:onIfMatch 13 13'), + parameterSets = cms.vstring('pythia8CommonSettings', + 'pythia8CUEP8M1Settings', + 'pythiaPhi') +) +) + +phifilter = cms.EDFilter("PythiaFilter", +Status = cms.untracked.int32(2), +MaxEta = cms.untracked.double(1000.0), +MinEta = cms.untracked.double(-1000.0), +MinPt = cms.untracked.double(-1.0), +ParticleID = cms.untracked.int32(333) +) + +mumugenfilter = cms.EDFilter("MCParticlePairFilter", +Status = cms.untracked.vint32(1, 1), +MinPt = cms.untracked.vdouble(0.0, 0.0), +MaxEta = cms.untracked.vdouble(2.5, 2.5), +MinEta = cms.untracked.vdouble(-2.5, -2.5), +ParticleCharge = cms.untracked.int32(-1), +ParticleID1 = cms.untracked.vint32(13), +ParticleID2 = cms.untracked.vint32(13) +) +ProductionFilterSequence = cms.Sequence(generator*phifilter*mumugenfilter) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index 5f52319b421f1..f1420b831e8b4 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -108,7 +108,7 @@ workflows[5.5] = ['ZTT',['ZTTFS','HARVESTFS']] workflows[5.6] = ['QCD_FlatPt_15_3000', ['QCDFlatPt153000FS','HARVESTFS']] -workflows[5.7] = ['H125GGgluonfusion', ['H125GGgluonfusionFS','HARVESTFS']] +workflows[5.7] = ['H130GGgluonfusion', ['H130GGgluonfusionFS','HARVESTFS']] ### fastsim_13 TeV ### workflows[135.1] = ['TTbar_13', ['TTbarFS_13','HARVESTUP15FS']] @@ -163,7 +163,7 @@ workflows[26] = ['', ['WE','DIGI','RECO','HARVEST']] workflows[29] = ['', ['ZEE','DIGI','RECO','HARVEST','ALCAELE']] workflows[31] = ['', ['ZTT','DIGI','RECO','HARVEST']] -workflows[32] = ['', ['H125GGgluonfusion','DIGI','RECO','HARVEST']] +workflows[32] = ['', ['H130GGgluonfusion','DIGI','RECO','HARVEST']] workflows[33] = ['', ['PhotonJets_Pt_10','DIGI','RECO','HARVEST']] workflows[34] = ['', ['QQH1352T','DIGI','RECO','HARVEST']] workflows[46] = ['', ['ZmumuJets_Pt_20_300']] @@ -204,10 +204,10 @@ workflows[1346] = ['', ['ZmumuJets_Pt_20_300_13']] workflows[1347] = ['', ['Upsilon1SToMuMu_13']] -workflows[1348] = ['', ['BuToKstarMuMu_13']] +workflows[1348] = ['', ['EtaBToJpsiJpsi_13']] workflows[1349] = ['', ['BsToMuMu_13']] workflows[1350] = ['', ['JpsiMuMu_Pt-15']] -workflows[1351] = ['', ['BuToKstarPsi2S_13']] +workflows[1351] = ['', ['BuMixing_13']] workflows[1307] = ['', ['CosmicsSPLoose_UP15']] workflows[1308] = ['', ['BeamHalo_13']] @@ -220,7 +220,7 @@ workflows[1312] = ['', ['ZpMM_13']] workflows[1314] = ['', ['WpM_13']] -workflows[1340] = ['', ['BuJpsiK_13']] +workflows[1340] = ['', ['PhiToMuMu_13']] workflows[1341] = ['', ['RSKKGluon_m3000GeV_13']] workflows[1343] = ['', ['ZpMM_2250_13']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 238e03f193862..e02294831a000 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -393,10 +393,10 @@ def identitySim(wf): steps['MinBiasHS_13INPUT']={'INPUT':InputInfo(dataSet='/RelValMinBiasHS_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['Higgs200ChargedTaus_13INPUT']={'INPUT':InputInfo(dataSet='/RelValHiggs200ChargedTaus_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['Upsilon1SToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValUpsilon1SToMuMu_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} -steps['BuToKstarMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBuToKstarMuMu_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} +steps['EtaBToJpsiJpsi_13INPUT']={'INPUT':InputInfo(dataSet='/RelValEtaBToJpsiJpsi_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['BsToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBsToMuMu_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['JpsiMuMu_Pt-15INPUT']={'INPUT':InputInfo(dataSet='/RelValJpsiMuMu_Pt-15/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} -steps['BuToKstarPsi2S_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBuToKstarPsi2S_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} +steps['BuMixing_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBuMixing_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['JpsiMM_13INPUT']={'INPUT':InputInfo(dataSet='/RelValJpsiMM_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['WE_13INPUT']={'INPUT':InputInfo(dataSet='/RelValWE_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['WM_13INPUT']={'INPUT':InputInfo(dataSet='/RelValWM_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} @@ -469,10 +469,10 @@ def genS(fragment,howMuch): steps['ZpMM']=genS('ZpMM_8TeV_TuneCUETP8M1_cfi',Kby(9,200)) steps['Higgs200ChargedTaus_13']=gen2015('H200ChargedTaus_Tauola_13TeV_cfi',Kby(9,100)) steps['Upsilon1SToMuMu_13']=gen2015('Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi',Kby(17,190)) -steps['BuToKstarMuMu_13']=gen2015('BuToKstarMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi',Kby(2250,25000)) +steps['EtaBToJpsiJpsi_13']=gen2015('EtaBToJpsiJpsi_forSTEAM_TuneCUEP8M1_13TeV_cfi',Kby(9,100)) steps['BsToMuMu_13']=gen2015('BsToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi',Kby(30000,333333)) steps['JpsiMuMu_Pt-15']=gen2015('JpsiMuMu_Pt-15_forSTEAM_13TeV_cfi',Kby(11000,122000)) -steps['BuToKstarPsi2S_13']=gen2015('BuToKstarPsi2S_forSTEAM_13TeV_TuneCUETP8M1_cfi',Kby(16000,176000)) +steps['BuMixing_13']=gen2015('BuMixing_BMuonFilter_forSTEAM_13TeV_TuneCUETP8M1_cfi',Kby(900,10000)) steps['JpsiMM_13']=gen2015('JpsiMM_13TeV_TuneCUETP8M1_cfi',Kby(66,1000)) steps['WE_13']=gen2015('WE_13TeV_TuneCUETP8M1_cfi',Kby(9,100)) steps['WM_13']=gen2015('WM_13TeV_TuneCUETP8M1_cfi',Kby(9,200)) @@ -493,9 +493,9 @@ def genS(fragment,howMuch): steps['ADDMonoJet_d3MD3']=genS('ADDMonoJet_8TeV_d3MD3_TuneCUETP8M1_cfi',Kby(9,100)) steps['ADDMonoJet_d3MD3_13']=gen2015('ADDMonoJet_13TeV_d3MD3_TuneCUETP8M1_cfi',Kby(9,100)) steps['RSKKGluon_m3000GeV_13']=gen2015('RSKKGluon_m3000GeV_13TeV_TuneCUETP8M1_cff',Kby(9,100)) -steps['BuJpsiK_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBuJpsiK_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} +steps['PhiToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValPhiToMuMu_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['Pythia6_BuJpsiK_TuneZ2star_13']=gen2015('Pythia8_BuJpsiK_13TeV_TuneCUETP8M1_cfi',Kby(36000,400000)) # check recycling a the next GEN-SIM refresh -steps['BuJpsiK_13']=gen2015('Pythia8_BuJpsiK_13TeV_TuneCUETP8M1_cfi',Kby(36000,400000)) +steps['PhiToMuMu_13']=gen2015('PYTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff',Kby(100,1100)) steps['MinBias2INPUT']={'INPUT':InputInfo(dataSet='/RelValMinBias/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} steps['Higgs200ChargedTausINPUT']={'INPUT':InputInfo(dataSet='/RelValHiggs200ChargedTaus/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')} From abdfb8508ab5bcbf9fa6cff87cba6fbe7a558aa4 Mon Sep 17 00:00:00 2001 From: Hengne Date: Mon, 2 Nov 2015 17:19:20 +0100 Subject: [PATCH 05/10] add missing piece for BuMixing workflow --- .../ExternalDecays/data/Bu_Mixing.dec | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 GeneratorInterface/ExternalDecays/data/Bu_Mixing.dec diff --git a/GeneratorInterface/ExternalDecays/data/Bu_Mixing.dec b/GeneratorInterface/ExternalDecays/data/Bu_Mixing.dec new file mode 100644 index 0000000000000..ec973ec0867d7 --- /dev/null +++ b/GeneratorInterface/ExternalDecays/data/Bu_Mixing.dec @@ -0,0 +1,47 @@ +#This is the decay file for the decay B+ -> MU+ MU- K*+(-> Ks pi+) +# +# Descriptor: [B+ -> mu+ mu- {,gamma} {,gamma} (K*+ -> Ks pi+)]cc +# +# NickName: +# +# Physics: Includes radiative mode +# +# Tested: Yes +# Original By: K. Ulmer +# Date: 2-26-08 +# +Alias MyB+ B+ +Alias MyB- B- +ChargeConj MyB+ MyB- +Alias MyK*+ K*+ +Alias MyK*- K*- +ChargeConj MyK*+ MyK*- +Alias MyK_S0 K_S0 +ChargeConj MyK_S0 MyK_S0 +Alias MyJpsi J/psi +ChargeConj MyJpsi MyJpsi +Alias MyPsi psi(2S) +ChargeConj MyPsi MyPsi +# +Decay MyB+ +0.33333333 MyK*+ mu+ mu- BTOSLLBALL; +0.33333334 MyJpsi K+ SVS; +0.33333333 MyPsi MyK*+ SVV_HELAMP 0.159 1.563 0.775 0.0 0.612 2.712; +Enddecay +CDecay MyB- +# +Decay MyK*+ +1.000 MyK_S0 pi+ VSS; +Enddecay +CDecay MyK*- +# +Decay MyK_S0 +1.000 pi+ pi- PHSP; +Enddecay +Decay MyJpsi +1.000 mu+ mu- PHOTOS VLL; +Enddecay +Decay MyPsi +1.000 mu+ mu- PHOTOS VLL; +Enddecay +End From da2e76cef5eb81bbca6dc8257e9b598651446524 Mon Sep 17 00:00:00 2001 From: Hengne Date: Mon, 2 Nov 2015 17:28:53 +0100 Subject: [PATCH 06/10] temp comment gensim inputs for new workflows --- .../PyReleaseValidation/python/relval_steps.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index e02294831a000..b4a307242fdfc 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -393,10 +393,12 @@ def identitySim(wf): steps['MinBiasHS_13INPUT']={'INPUT':InputInfo(dataSet='/RelValMinBiasHS_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['Higgs200ChargedTaus_13INPUT']={'INPUT':InputInfo(dataSet='/RelValHiggs200ChargedTaus_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['Upsilon1SToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValUpsilon1SToMuMu_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} -steps['EtaBToJpsiJpsi_13INPUT']={'INPUT':InputInfo(dataSet='/RelValEtaBToJpsiJpsi_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} +# temp. comment, new workflow, no gensim input +#steps['EtaBToJpsiJpsi_13INPUT']={'INPUT':InputInfo(dataSet='/RelValEtaBToJpsiJpsi_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['BsToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBsToMuMu_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['JpsiMuMu_Pt-15INPUT']={'INPUT':InputInfo(dataSet='/RelValJpsiMuMu_Pt-15/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} -steps['BuMixing_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBuMixing_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} +# temp. comment, new workflow, no gensim input +#steps['BuMixing_13INPUT']={'INPUT':InputInfo(dataSet='/RelValBuMixing_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['JpsiMM_13INPUT']={'INPUT':InputInfo(dataSet='/RelValJpsiMM_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['WE_13INPUT']={'INPUT':InputInfo(dataSet='/RelValWE_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['WM_13INPUT']={'INPUT':InputInfo(dataSet='/RelValWM_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} @@ -404,7 +406,8 @@ def identitySim(wf): steps['ZMM_13INPUT']={'INPUT':InputInfo(dataSet='/RelValZMM_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['ZpMM_13INPUT']={'INPUT':InputInfo(dataSet='/RelValZpMM_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['ZTT_13INPUT']={'INPUT':InputInfo(dataSet='/RelValZTT_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} -steps['H125GGgluonfusion_13INPUT']={'INPUT':InputInfo(dataSet='/RelValH125GGgluonfusion_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} +# temp. comment, new workflow, no gensim input +#steps['H125GGgluonfusion_13INPUT']={'INPUT':InputInfo(dataSet='/RelValH125GGgluonfusion_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['PhotonJets_Pt_10_13INPUT']={'INPUT':InputInfo(dataSet='/RelValPhotonJets_Pt_10_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} # temp. comment 1 line below because no corresponding GEN-SIM have been generated yet #steps['QQH1352T_13INPUT']={'INPUT':InputInfo(dataSet='/RelValQQH1352T_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} @@ -493,7 +496,8 @@ def genS(fragment,howMuch): steps['ADDMonoJet_d3MD3']=genS('ADDMonoJet_8TeV_d3MD3_TuneCUETP8M1_cfi',Kby(9,100)) steps['ADDMonoJet_d3MD3_13']=gen2015('ADDMonoJet_13TeV_d3MD3_TuneCUETP8M1_cfi',Kby(9,100)) steps['RSKKGluon_m3000GeV_13']=gen2015('RSKKGluon_m3000GeV_13TeV_TuneCUETP8M1_cff',Kby(9,100)) -steps['PhiToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValPhiToMuMu_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} +# temp. comment, new workflow, no gensim input +#steps['PhiToMuMu_13INPUT']={'INPUT':InputInfo(dataSet='/RelValPhiToMuMu_13/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} steps['Pythia6_BuJpsiK_TuneZ2star_13']=gen2015('Pythia8_BuJpsiK_13TeV_TuneCUETP8M1_cfi',Kby(36000,400000)) # check recycling a the next GEN-SIM refresh steps['PhiToMuMu_13']=gen2015('PYTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff',Kby(100,1100)) From e07ace5267db459b97aaae503c23a17ddde6ffd8 Mon Sep 17 00:00:00 2001 From: Hengne Date: Mon, 2 Nov 2015 18:14:57 +0100 Subject: [PATCH 07/10] update to realistic BS --- Configuration/PyReleaseValidation/python/relval_steps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index b4a307242fdfc..875d559fb4600 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -114,7 +114,7 @@ def merge(dictlist,TELL=False): step1Up2015Defaults = {'-s' : 'GEN,SIM', '-n' : 10, '--conditions' : 'auto:run2_mc', - '--beamspot' : 'NominalCollision2015', + '--beamspot' : 'Realistic50ns13TeVCollision', '--datatier' : 'GEN-SIM', '--eventcontent': 'FEVTDEBUG', '--magField' : '38T_PostLS1', @@ -848,7 +848,7 @@ def addForAll(steps,d): step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECO,EI,HLT:@relval,VALIDATION', '--fast':'', '--conditions' :'auto:run2_mc', - '--beamspot' :'NominalCollision2015', + '--beamspot' :'Realistic50ns13TeVCollision', '--magField' :'38T_PostLS1', '--customise' :'SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1', '--eventcontent':'FEVTDEBUGHLT,DQM', From 4736d62dfe98bd7382a60de153f5a135c3ad5077 Mon Sep 17 00:00:00 2001 From: Hengne Date: Thu, 5 Nov 2015 12:33:04 +0100 Subject: [PATCH 08/10] add back digi/reco steps --- .../python/relval_standard.py | 115 +++++++++--------- 1 file changed, 57 insertions(+), 58 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index f1420b831e8b4..3e5c1d2729549 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -12,9 +12,9 @@ workflows[1] = ['', ['ProdMinBias','DIGIPROD1','RECOPROD1']] workflows[2] = ['', ['ProdTTbar','DIGIPROD1','RECOPROD1']] workflows[3] = ['', ['ProdQCD_Pt_3000_3500','DIGIPROD1','RECOPROD1']] -workflows[1301] = ['', ['ProdMinBias_13']] -workflows[1302] = ['', ['ProdTTbar_13']] -workflows[1303] = ['', ['ProdQCD_Pt_3000_3500_13']] +workflows[1301] = ['', ['ProdMinBias_13','DIGIUP15PROD1','RECOPRODUP15']] +workflows[1302] = ['', ['ProdTTbar_13','DIGIUP15PROD1','RECOPRODUP15']] +workflows[1303] = ['', ['ProdQCD_Pt_3000_3500_13','DIGIUP15PROD1','RECOPRODUP15']] ### data ### workflows[4.5] = ['', ['RunCosmicsA','RECOCOSD','ALCACOSD','HARVESTDC']] @@ -135,16 +135,16 @@ workflows[21] = ['', ['SingleMuPt100','DIGI','RECO','HARVEST']] workflows[22] = ['', ['SingleMuPt1000','DIGI','RECO','HARVEST']] ## particle guns postLS1 -workflows[1315] = ['', ['SingleElectronPt10_UP15']] -workflows[1316] = ['', ['SingleElectronPt1000_UP15']] -workflows[1317] = ['', ['SingleElectronPt35_UP15']] -workflows[1318] = ['', ['SingleGammaPt10_UP15']] -workflows[1319] = ['', ['SingleGammaPt35_UP15']] -workflows[1306] = ['', ['SingleMuPt1_UP15']] -workflows[1320] = ['', ['SingleMuPt10_UP15']] -workflows[1321] = ['', ['SingleMuPt100_UP15']] -workflows[1322] = ['', ['SingleMuPt1000_UP15']] -workflows[1323] = ['', ['NuGun_UP15']] +workflows[1315] = ['', ['SingleElectronPt10_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1316] = ['', ['SingleElectronPt1000_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1317] = ['', ['SingleElectronPt35_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1318] = ['', ['SingleGammaPt10_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1319] = ['', ['SingleGammaPt35_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1306] = ['', ['SingleMuPt1_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1320] = ['', ['SingleMuPt10_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1321] = ['', ['SingleMuPt100_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1322] = ['', ['SingleMuPt1000_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1323] = ['', ['NuGun_UP15','DIGIUP15','RECOUP15','HARVESTUP15']] #workflows[140.1] = ['',['HydjetQ_MinBias_2760GeV_UP15','DIGIHIUP15','RECOHIUP15','HARVESTHI']] # need new GEN-SIM for this one ## 8 TeV @@ -185,53 +185,52 @@ workflows[45] = ['', ['ZpTT_1500_8TeV_Tauola','DIGI','RECO','HARVEST']] ## 13 TeV and postLS1 geometry -workflows[1324] = ['', ['TTbarLepton_13']] -workflows[1335] = ['', ['Wjet_Pt_80_120_13']] -workflows[1336] = ['', ['Wjet_Pt_3000_3500_13']] -workflows[1337] = ['', ['SMS-T1tttt_mGl-1500_mLSP-100_13']] -workflows[1338] = ['', ['QCD_FlatPt_15_3000HS_13']] - -workflows[1309] = ['', ['Higgs200ChargedTaus_13']] -workflows[1313] = ['', ['QCD_Pt_3000_3500_13']] -workflows[1339] = ['', ['QCD_Pt_600_800_13']] -workflows[1325] = ['', ['TTbar_13']] -workflows[1326] = ['', ['WE_13']] -workflows[1329] = ['', ['ZEE_13']] -workflows[1331] = ['', ['ZTT_13']] -workflows[1332] = ['', ['H125GGgluonfusion_13']] -workflows[1333] = ['', ['PhotonJets_Pt_10_13']] -workflows[1334] = ['', ['QQH1352T_13']] +workflows[1324] = ['', ['TTbarLepton_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1335] = ['', ['Wjet_Pt_80_120_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1336] = ['', ['Wjet_Pt_3000_3500_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1337] = ['', ['SMS-T1tttt_mGl-1500_mLSP-100_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1338] = ['', ['QCD_FlatPt_15_3000HS_13','DIGIUP15','RECOUP15','HARVESTUP15']] + +workflows[1309] = ['', ['Higgs200ChargedTaus_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1313] = ['', ['QCD_Pt_3000_3500_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1339] = ['', ['QCD_Pt_600_800_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1325] = ['', ['TTbar_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCATT']] +workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCAELE']] +workflows[1331] = ['', ['ZTT_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1332] = ['', ['H125GGgluonfusion_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1333] = ['', ['PhotonJets_Pt_10_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1334] = ['', ['QQH1352T_13','DIGIUP15','RECOUP15','HARVESTUP15']] workflows[1346] = ['', ['ZmumuJets_Pt_20_300_13']] -workflows[1347] = ['', ['Upsilon1SToMuMu_13']] -workflows[1348] = ['', ['EtaBToJpsiJpsi_13']] -workflows[1349] = ['', ['BsToMuMu_13']] -workflows[1350] = ['', ['JpsiMuMu_Pt-15']] -workflows[1351] = ['', ['BuMixing_13']] - -workflows[1307] = ['', ['CosmicsSPLoose_UP15']] -workflows[1308] = ['', ['BeamHalo_13']] -workflows[1311] = ['', ['MinBias_13']] -workflows[1328] = ['', ['QCD_Pt_80_120_13']] -workflows[1327] = ['', ['WM_13']] -workflows[1330] = ['', ['ZMM_13']] - -workflows[1310] = ['', ['ADDMonoJet_d3MD3_13']] -workflows[1312] = ['', ['ZpMM_13']] -workflows[1314] = ['', ['WpM_13']] - -workflows[1340] = ['', ['PhiToMuMu_13']] -workflows[1341] = ['', ['RSKKGluon_m3000GeV_13']] - -workflows[1343] = ['', ['ZpMM_2250_13']] -workflows[1344] = ['', ['ZpEE_2250_13']] -workflows[1345] = ['', ['ZpTT_1500_13']] -workflows[1352] = ['', ['HSCPstop_M_200_13']] -workflows[1353] = ['', ['RSGravitonToGaGa_13']] -workflows[1354] = ['', ['WpToENu_M-2000_13']] - -workflows[1355] = ['', ['DisplacedSUSY_stopToBottom_M_300_1000mm_13']] - +workflows[1347] = ['', ['Upsilon1SToMuMu_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1348] = ['', ['EtaBToJpsiJpsi_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1349] = ['', ['BsToMuMu_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1350] = ['', ['JpsiMuMu_Pt-15','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1351] = ['', ['BuMixing_13','DIGIUP15','RECOUP15','HARVESTUP15']] + +workflows[1307] = ['', ['CosmicsSPLoose_UP15','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']] +workflows[1308] = ['', ['BeamHalo_13','DIGIHAL','RECOHAL','ALCAHAL','HARVESTHAL']] +workflows[1311] = ['', ['MinBias_13','DIGIUP15','RECOMINUP15','HARVESTUP15','ALCAMIN']] +workflows[1328] = ['', ['QCD_Pt_80_120_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1327] = ['', ['WM_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1330] = ['', ['ZMM_13','DIGIUP15','RECOUP15','HARVESTUP15']] + +workflows[1310] = ['', ['ADDMonoJet_d3MD3_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1312] = ['', ['ZpMM_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1314] = ['', ['WpM_13','DIGIUP15','RECOUP15','HARVESTUP15']] + +workflows[1340] = ['', ['PhiToMuMu_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1341] = ['', ['RSKKGluon_m3000GeV_13','DIGIUP15','RECOUP15','HARVESTUP15']] + +workflows[1343] = ['', ['ZpMM_2250_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1344] = ['', ['ZpEE_2250_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1345] = ['', ['ZpTT_1500_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1352] = ['', ['HSCPstop_M_200_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1353] = ['', ['RSGravitonToGaGa_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1354] = ['', ['WpToENu_M-2000_13','DIGIUP15','RECOUP15','HARVESTUP15']] + +workflows[1355] = ['', ['DisplacedSUSY_stopToBottom_M_300_1000mm_13','DIGIUP15','RECOUP15','HARVESTUP15']] ### HI test ### workflows[140] = ['',['HydjetQ_MinBias_2760GeV','DIGIHI','RECOHI','HARVESTHI']] From ab636e36412ca6a0af8b1d40632dd17e0a6ec98b Mon Sep 17 00:00:00 2001 From: Hengne Date: Thu, 5 Nov 2015 14:04:38 +0100 Subject: [PATCH 09/10] update gensim recycling input to 7_1_20_patch2 version with realistic BS --- Configuration/PyReleaseValidation/python/relval_steps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 875d559fb4600..7ff916f9ee844 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -330,7 +330,7 @@ def identitySim(wf): 'CMSSW_6_2_0_pre8-PRE_SH62_V15-v2', # Run1 HI GEN-SIM (only HydjetQ_B3_2760) 'CMSSW_6_1_0_pre6-STARTHI61_V6-v1', # Run1 HI GEN-SIM (only HydjetQ_B0_2760) 'CMSSW_6_2_0_pre8-PRE_ST62_V8-v3', # pPb - 'CMSSW_7_1_0_pre5-POSTLS171_V1-v1', # 13 TeV samples with postLs1 geometry and updated mag field + 'CMSSW_7_1_20_patch2-MCRUN2_71_V1_GsRealBS-v1', # 13 TeV samples with postLs1 geometry and updated mag field 'CMSSW_6_2_0_pre8-PRE_SH62_V15-v1', # Run1 HI GEN-SIM (only HydjetQ_B8_2760) 'CMSSW_7_1_0_pre5-START71_V1-v1', # 8 TeV , for the one sample which is part of the routine relval production (MinBias) 'CMSSW_7_1_0_pre5-START71_V1-v2', # 8 TeV , for the one sample which is part of the routine relval production (RelValZmumuJets_Pt_20_300, because of -v2) From 7527ed181c32b6af439b75af8884ce8bb7edede7 Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 6 Nov 2015 11:54:49 +0100 Subject: [PATCH 10/10] New Realistic 2015 reco beamspot in run2 simulation GT --- Configuration/AlCa/python/autoCond.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py index e66be5ace25bb..3d27714d3f451 100644 --- a/Configuration/AlCa/python/autoCond.py +++ b/Configuration/AlCa/python/autoCond.py @@ -13,8 +13,8 @@ # then it should point to the GR_H tag and override the connection string and pfnPrefix for use offline 'hltonline' : 'GR_H_V37::All,frontier://FrontierProd/CMS_COND_31X_GLOBALTAG,frontier://FrontierProd/', # GlobalTag for POSTLS1 upgrade studies: - 'upgradePLS1' : 'MCRUN2_71_V1::All', - 'upgradePLS150ns' : 'MCRUN2_71_V0::All', + 'upgradePLS1' : 'MCRUN2_71_V3::All', + 'upgradePLS150ns' : 'MCRUN2_71_V2::All', 'upgrade2017' : 'DES17_70_V2::All', # placeholder (GT not meant for standard RelVal) 'upgrade2019' : 'DES19_70_V2::All', # placeholder (GT not meant for standard RelVal) 'upgradePLS3' : 'POSTLS262_V1::All', # placeholder (GT not meant for standard RelVal) @@ -29,11 +29,11 @@ # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1 'run1_mc_pPb' : 'STARTHI71_V16::All', # GlobalTag for MC production with perfectly aligned and calibrated detector for Run2 - 'run2_design' : 'DESRUN2_71_V0::All', + 'run2_design' : 'DESRUN2_71_V1::All', # GlobalTag for MC production with pessimistic alignment and calibrations for Run2 - 'run2_mc_50ns' : 'MCRUN2_71_V0::All', + 'run2_mc_50ns' : 'MCRUN2_71_V2::All', #GlobalTag for MC production with optimistic alignment and calibrations for Run2 - 'run2_mc' : 'MCRUN2_71_V1::All', + 'run2_mc' : 'MCRUN2_71_V3::All', # GlobalTag for Run1 data reprocessing 'run1_data' : 'GR_R_71_V7::All', # GlobalTag for Run2 data reprocessing