From 53637b01437978485c76ab99d06d2796f16a9bcd Mon Sep 17 00:00:00 2001 From: Hengne Date: Tue, 17 Nov 2015 08:11:59 +0100 Subject: [PATCH 1/7] update golden json file --- ...XXX_13TeV_PromptReco_Collisions15_JSON.txt | 114 +++++++++++++++--- 1 file changed, 95 insertions(+), 19 deletions(-) diff --git a/DPGAnalysis/Skims/data/Cert_246908-XXXXXX_13TeV_PromptReco_Collisions15_JSON.txt b/DPGAnalysis/Skims/data/Cert_246908-XXXXXX_13TeV_PromptReco_Collisions15_JSON.txt index 1bc7bcdc59522..9c04e3f1562d0 100644 --- a/DPGAnalysis/Skims/data/Cert_246908-XXXXXX_13TeV_PromptReco_Collisions15_JSON.txt +++ b/DPGAnalysis/Skims/data/Cert_246908-XXXXXX_13TeV_PromptReco_Collisions15_JSON.txt @@ -7,25 +7,101 @@ "251643": [[1, 216], [222, 606]], "251721": [[1, 36]], "251883": [[56, 56], [58, 60], [62, 437]], - "254231": [[1, 24]], - "254232": [[1, 81]], + "254231": [[1, 24]], + "254232": [[1, 81]], "254790": [[90, 90], [93, 630], [633, 697], [701, 715], [719, 784]], - "254852": [[47, 94]], + "254852": [[47, 94]], "254879": [[52, 52], [54, 140]], - "254906": [[1, 75]], - "254907": [[1, 52]], - "254914": [[32, 32], [34, 78]], - "256630": [[5, 26]], - "256673": [[55, 56]], - "256674": [[1, 2]], - "256675": [[1, 106], [111, 164]], - "256677": [[1, 291], [293, 390], [392, 397], [400, 455], [457, 482]], - "256729": [[1, 336], [346, 598], [600, 755], [758, 760], [765, 1165], [1167, 1292], [1295, 1327], [1329, 1732]], - "256734": [[1, 57], [60, 213]], - "256801": [[73, 263]], - "256842": [[131, 132]], - "256843": [[1, 204], [207, 284], [286, 378], [380, 461], [463, 587], [598, 627], [630, 661], [1001, 1034], [1036, 1081], [1083, 1191], [1193, 1193], [1195, 1329], [1331, 1332]], - "256866": [[34, 47]], - "256867": [[1, 16], [19, 94]], - "256869": [[1, 34]]} + "254906": [[1, 75]], + "254907": [[1, 52]], + "254914": [[32, 32], [34, 78]], + "256630": [[5, 26]], + "256673": [[55, 56]], + "256674": [[1, 2]], + "256675": [[1, 106], [111, 164]], + "256676": [[1, 160], [162, 208]], + "256677": [[1, 291], [293, 390], [392, 397], [400, 455], [457, 482]], + "256801": [[73, 263]], + "256842": [[131, 132]], + "256843": [[1, 204], [207, 284], [286, 378], [380, 461], [463, 587], [598, 627], [630, 661], [1001, 1034], [1036, 1081], [1083, 1191], [1193, 1193], [1195, 1329], [1331, 1332]], + "256866": [[34, 47]], + "256867": [[1, 16], [19, 94]], + "256868": [[5, 33], [35, 200], [202, 492]], + "256869": [[1, 34]], + "256926": [[35, 50], [53, 62], [64, 65]], + "256941": [[1, 17], [19, 29], [103, 105], [107, 126], [129, 129], [131, 168], [170, 170], [175, 290], [293, 294]], + "257461": [[44, 95]], + "257531": [[5, 45], [50, 143]], + "257599": [[42, 118]], + "257613": [[14, 1307]], + "257614": [[1, 16]], + "257645": [[37, 73], [75, 1096]], + "257682": [[66, 366]], + "257722": [[1, 19]], + "257723": [[1, 1], [3, 108], [114, 148]], + "257735": [[1, 15]], + "257751": [[1, 463]], + "257804": [[1, 17]], + "257805": [[1, 249]], + "257816": [[1, 385]], + "257819": [[1, 248]], + "257968": [[69, 326]], + "257969": [[1, 634]], + "258129": [[30, 124]], + "258136": [[1, 60]], + "258157": [[1, 56]], + "258158": [[1, 1088], [1091, 1786]], + "258159": [[1, 501]], + "258177": [[1, 342], [347, 724], [755, 1939]], + "258211": [[43, 129]], + "258213": [[1, 165]], + "258214": [[1, 217]], + "258215": [[1, 6]], + "258287": [[45, 144], [148, 227]], + "258403": [[1, 251]], + "258425": [[3, 136]], + "258426": [[1, 10]], + "258427": [[1, 107]], + "258428": [[1, 159]], + "258432": [[1, 4]], + "258434": [[1, 453]], + "258440": [[1, 442], [444, 732]], + "258444": [[1, 37]], + "258445": [[1, 302]], + "258446": [[1, 142]], + "258448": [[2, 100], [102, 731]], + "258655": [[60, 68]], + "258656": [[1, 334]], + "258694": [[23, 199]], + "258702": [[52, 402]], + "258703": [[1, 389]], + "258705": [[1, 100]], + "258706": [[1, 733]], + "258712": [[1, 524]], + "258713": [[1, 161]], + "258714": [[1, 67]], + "258741": [[22, 72]], + "258742": [[2, 693]], + "258745": [[1, 260]], + "258749": [[1, 204], [220, 604]], + "258750": [[1, 197]], + "259626": [[83, 106], [108, 111], [115, 166], [169, 215], [218, 437]], + "259637": [[1, 72], [75, 221]], + "259681": [[64, 98]], + "259683": [[5, 19], [22, 23], [25, 94]], + "259685": [[1, 209], [213, 240], [242, 290], [292, 445], [447, 538], [540, 544], [546, 630]], + "259686": [[1, 43], [45, 47], [49, 100], [102, 108], [110, 163], [165, 245], [248, 341]], + "259721": [[73, 99], [102, 408]], + "259809": [[53, 222]], + "259810": [[1, 113], [116, 116]], + "259811": [[1, 47], [50, 91]], + "259813": [[1, 10]], + "259817": [[1, 5]], + "259818": [[1, 160]], + "259820": [[1, 32], [36, 161]], + "259821": [[1, 75], [78, 212]], + "259822": [[1, 14], [17, 464]], + "259862": [[1, 13], [16, 532]], + "259890": [[1, 34], [37, 109]], + "259891": [[1, 108]]} From aa82887c05def14e6b59bb9b3b0481caef444e6b Mon Sep 17 00:00:00 2001 From: Hengne Date: Tue, 17 Nov 2015 17:46:59 +0100 Subject: [PATCH 2/7] update fullsim premixing input --- Configuration/PyReleaseValidation/python/MatrixUtil.py | 6 ++++-- Configuration/PyReleaseValidation/python/relval_steps.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/MatrixUtil.py b/Configuration/PyReleaseValidation/python/MatrixUtil.py index 3d979c176d744..2954461a910e4 100644 --- a/Configuration/PyReleaseValidation/python/MatrixUtil.py +++ b/Configuration/PyReleaseValidation/python/MatrixUtil.py @@ -158,9 +158,11 @@ def queries(self): return the_queries if len(self.run) is not 0: - return ["file {0}={1} run={2} site=T2_CH_CERN".format(query_by, query_source, query_run) for query_run in self.run] + #return ["file {0}={1} run={2} site=T2_CH_CERN".format(query_by, query_source, query_run) for query_run in self.run] + return ["file {0}={1} run={2} ".format(query_by, query_source, query_run) for query_run in self.run] else: - return ["file {0}={1} site=T2_CH_CERN".format(query_by, query_source)] + #return ["file {0}={1} site=T2_CH_CERN".format(query_by, query_source)] + return ["file {0}={1} ".format(query_by, query_source)] def __str__(self): if self.ib_block: diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 9c09fb532ed6b..b5c4a67ba9502 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -270,8 +270,8 @@ def identitySim(wf): # THIS ABOVE IS NOT USED, AT THE MOMENT 'CMSSW_7_6_0_pre7-76X_mcRun2_asymptotic_v9_realBS-v1', # 3 - 13 TeV samples with GEN-SIM from 750_p4; also GEN-SIM-DIGI-RAW-HLTDEBUG for id tests 'CMSSW_7_3_0_pre1-PRE_LS172_V15_FastSim-v1', # 4 - fast sim GEN-SIM-DIGI-RAW-HLTDEBUG for id tests - 'CMSSW_7_6_0_pre7-PU25ns_76X_mcRun2_asymptotic_v9_realBS-v1', # 5 - fullSim PU 25ns premix - 'CMSSW_7_6_0_pre7-PU50ns_76X_mcRun2_startup_v5-v1', # 6 - fullSim PU 50ns premix + 'CMSSW_8_0_0_pre2-PU25ns_76X_mcRun2_asymptotic_v12-v1', # 5 - fullSim PU 25ns premix + 'CMSSW_8_0_0_pre2-PU50ns_76X_mcRun2_startup_v11-v1', # 6 - fullSim PU 50ns premix 'CMSSW_7_6_0_pre7-76X_mcRun2_asymptotic_v6_FastSim-v1', # 7 - fastSim MinBias for mixing 'CMSSW_7_6_0_pre5-PU25ns_76X_mcRun2_asymptotic_v1_FastSim-v1', # 8 - fastSim premixed MinBias 'CMSSW_7_6_0_pre6-76X_mcRun2_HeavyIon_v4-v1' # 9 - Run2 HI GEN-SIM From 4ec67c7f7f26e0043a51417961d83cbca352cf58 Mon Sep 17 00:00:00 2001 From: Hengne Date: Tue, 17 Nov 2015 23:19:21 +0100 Subject: [PATCH 3/7] update fastSim minibias for mixing input --- 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 b5c4a67ba9502..d295d718629d2 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -272,7 +272,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_8_0_0_pre2-PU25ns_76X_mcRun2_asymptotic_v12-v1', # 5 - fullSim PU 25ns premix 'CMSSW_8_0_0_pre2-PU50ns_76X_mcRun2_startup_v11-v1', # 6 - fullSim PU 50ns premix - 'CMSSW_7_6_0_pre7-76X_mcRun2_asymptotic_v6_FastSim-v1', # 7 - fastSim MinBias for mixing + 'CMSSW_8_0_0_pre2-76X_mcRun2_asymptotic_v12_FastSim-v1', # 7 - fastSim MinBias for mixing 'CMSSW_7_6_0_pre5-PU25ns_76X_mcRun2_asymptotic_v1_FastSim-v1', # 8 - fastSim premixed MinBias 'CMSSW_7_6_0_pre6-76X_mcRun2_HeavyIon_v4-v1' # 9 - Run2 HI GEN-SIM ] From 66bd1ca50c4c7bb54d9134fc586bd00fc70416e5 Mon Sep 17 00:00:00 2001 From: Hengne Date: Wed, 18 Nov 2015 19:50:37 +0100 Subject: [PATCH 4/7] update fastsim premixing input --- 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 d295d718629d2..828ac77c73842 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -273,7 +273,7 @@ def identitySim(wf): 'CMSSW_8_0_0_pre2-PU25ns_76X_mcRun2_asymptotic_v12-v1', # 5 - fullSim PU 25ns premix 'CMSSW_8_0_0_pre2-PU50ns_76X_mcRun2_startup_v11-v1', # 6 - fullSim PU 50ns premix 'CMSSW_8_0_0_pre2-76X_mcRun2_asymptotic_v12_FastSim-v1', # 7 - fastSim MinBias for mixing - 'CMSSW_7_6_0_pre5-PU25ns_76X_mcRun2_asymptotic_v1_FastSim-v1', # 8 - fastSim premixed MinBias + 'CMSSW_8_0_0_pre2-PU25ns_76X_mcRun2_asymptotic_v12_FastSim-v1', # 8 - fastSim premixed MinBias 'CMSSW_7_6_0_pre6-76X_mcRun2_HeavyIon_v4-v1' # 9 - Run2 HI GEN-SIM ] From 25ba27708f7ba1aa93aabf1638c4c7dbd3a41cc1 Mon Sep 17 00:00:00 2001 From: Hengne Date: Thu, 19 Nov 2015 08:53:48 +0100 Subject: [PATCH 5/7] finner splitting jobs for 2015 data workflows to avoid RSS failure --- Configuration/PyReleaseValidation/python/MatrixInjector.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py index 983d88f9a8b7b..238f6e19d9c1a 100644 --- a/Configuration/PyReleaseValidation/python/MatrixInjector.py +++ b/Configuration/PyReleaseValidation/python/MatrixInjector.py @@ -179,8 +179,8 @@ def prepare(self,mReader, directories, mode='init'): wmsplit['TTbarFS_ID']=1 wmsplit['RECODR2_50nsreHLT']=1 wmsplit['RECODR2_25nsreHLT']=1 - wmsplit['HLTDR2_50ns']=3 - wmsplit['HLTDR2_25ns']=3 + wmsplit['HLTDR2_50ns']=1 + wmsplit['HLTDR2_25ns']=1 wmsplit['Hadronizer']=1 #import pprint From 46d07f599c3a3d459b470fdae0bf743b186334cb Mon Sep 17 00:00:00 2001 From: Hengne Date: Thu, 19 Nov 2015 17:23:07 +0100 Subject: [PATCH 6/7] forward port High Stats workflows and re-miniAOD test workflow from 76x --- .../python/MatrixInjector.py | 14 ++++++++ .../python/relval_highstats.py | 13 +++++++ .../python/relval_standard.py | 1 + .../python/relval_steps.py | 36 ++++++++++++++++++- 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py index 238f6e19d9c1a..5269ce75f5485 100644 --- a/Configuration/PyReleaseValidation/python/MatrixInjector.py +++ b/Configuration/PyReleaseValidation/python/MatrixInjector.py @@ -168,6 +168,8 @@ def prepare(self,mReader, directories, mode='init'): wmsplit['RECOUP15_PU50']=1 wmsplit['DIGIUP15_PU25']=1 wmsplit['RECOUP15_PU25']=1 + wmsplit['DIGIUP15_PU25HS']=1 + wmsplit['RECOUP15_PU25HS']=1 wmsplit['DIGIHIMIX']=5 wmsplit['RECOHIMIX']=5 wmsplit['RECODSplit']=1 @@ -182,6 +184,10 @@ def prepare(self,mReader, directories, mode='init'): wmsplit['HLTDR2_50ns']=1 wmsplit['HLTDR2_25ns']=1 wmsplit['Hadronizer']=1 + wmsplit['DIGIUP15']=5 + wmsplit['RECOUP15']=5 + wmsplit['RECOAODUP15']=5 + wmsplit['DBLMINIAODMCUP15NODQM']=5 #import pprint #pprint.pprint(wmsplit) @@ -207,6 +213,9 @@ def prepare(self,mReader, directories, mode='init'): if len( [step for step in s[3] if "HARVESTGEN" in step] )>0: chainDict['TimePerEvent']=0.01 thisLabel=thisLabel+"_gen" + # for double miniAOD test + if len( [step for step in s[3] if "DBLMINIAODMCUP15NODQM" in step] )>0: + thisLabel=thisLabel+"_dblMiniAOD" processStrPrefix='' setPrimaryDs=None for step in s[3]: @@ -313,6 +322,11 @@ def prepare(self,mReader, directories, mode='init'): chainDict['nowmTasklist'][-1]['AcquisitionEra']=chainDict['CMSSWVersion'] chainDict['nowmTasklist'][-1]['ProcessingString']=processStrPrefix+chainDict['nowmTasklist'][-1]['GlobalTag'].replace('::All','')+thisLabel + # specify different ProcessingString for double miniAOD dataset + if ('DBLMINIAODMCUP15NODQM' in step): + chainDict['nowmTasklist'][-1]['ProcessingString']=chainDict['nowmTasklist'][-1]['ProcessingString']+'_miniAOD' + + index+=1 #end of loop through steps chainDict['RequestString']='RV'+chainDict['CMSSWVersion']+s[1].split('+')[0] diff --git a/Configuration/PyReleaseValidation/python/relval_highstats.py b/Configuration/PyReleaseValidation/python/relval_highstats.py index 3e35992fb08b1..07c888a740d09 100644 --- a/Configuration/PyReleaseValidation/python/relval_highstats.py +++ b/Configuration/PyReleaseValidation/python/relval_highstats.py @@ -69,3 +69,16 @@ workflows[133]=['',['RSGrav','DIGI','RECO']] workflows[134]=['MinimumBiasBS',['RunMinBias2011B','RECOD','ALCAPROMPT','ALCAHARVD']] + +### HighStats HLT Physics 2015D ### +workflows[134.99901] = ['',['RunHLTPhy2015DHS','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']] + +## 13 TeV Run2 fullSim noPU +workflows[139901] = ['', ['ZMM_13_HS','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[139902] = ['', ['TTbar_13_HS','DIGIUP15','RECOUP15','HARVESTUP15']] + +## 13 TeV Run2 fullSim PU 25ns +workflows[13992501]=['',['ZMM_13_HS','DIGIUP15_PU25HS','RECOUP15_PU25HS','HARVESTUP15_PU25']] +workflows[13992502]=['',['TTbar_13_HS','DIGIUP15_PU25HS','RECOUP15_PU25HS','HARVESTUP15_PU25']] + + diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py index cd6ab6cb80cf6..55606d48d607e 100644 --- a/Configuration/PyReleaseValidation/python/relval_standard.py +++ b/Configuration/PyReleaseValidation/python/relval_standard.py @@ -254,6 +254,7 @@ workflows[1325] = ['', ['TTbar_13','DIGIUP15','RECOUP15','HARVESTUP15','ALCATTUP15']] workflows[1326] = ['', ['WE_13','DIGIUP15','RECOUP15','HARVESTUP15']] workflows[1329] = ['', ['ZEE_13','DIGIUP15','RECOUP15','HARVESTUP15']] +workflows[1356] = ['', ['ZEE_13_DBLMINIAOD','DIGIUP15','RECOAODUP15','HARVESTUP15','DBLMINIAODMCUP15NODQM']] workflows[1331] = ['', ['ZTT_13','DIGIUP15','RECOUP15','HARVESTUP15']] workflows[1332] = ['', ['H125GGgluonfusion_13','DIGIUP15','RECOUP15','HARVESTUP15']] workflows[1333] = ['', ['PhotonJets_Pt_10_13','DIGIUP15','RECOUP15','HARVESTUP15']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 828ac77c73842..a5ae2cee4f3a5 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -181,6 +181,10 @@ steps['RunSinglePh2015D']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2015D-v1/RAW',label='sigPh2015D',events=100000,location='STD', ls=Run2015D)} steps['RunZeroBias2015D']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2015D-v1/RAW',label='zb2015D',events=100000,location='STD',ib_block='38d4cab6-5d5f-11e5-824b-001e67ac06a0',ls=Run2015D)} +# Highstat HLTPhysics +Run2015DHS=selectedLS([258712,258713,258714,258741,258742,258745,258749,258750,259626,259637,259683,259685,259686,259721,259809,259810,259818,259820,259821,259822,259862,259890,259891]) +steps['RunHLTPhy2015DHS']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='hltPhy2015DHS',events=100000,location='STD', ls=Run2015DHS)} + def gen(fragment,howMuch): global step1Defaults @@ -239,6 +243,7 @@ def gen2015(fragment,howMuch): steps['TTbar_13']=gen2015('TTbar_13TeV_TuneCUETP8M1_cfi',Kby(9,50)) steps['TTbarLepton_13']=gen2015('TTbarLepton_13TeV_TuneCUETP8M1_cfi',Kby(9,100)) steps['ZEE_13']=gen2015('ZEE_13TeV_TuneCUETP8M1_cfi',Kby(9,50)) +steps['ZEE_13_DBLMINIAOD']=gen2015('ZEE_13TeV_TuneCUETP8M1_cfi',Kby(9,50)) steps['Wjet_Pt_80_120_13']=gen2015('Wjet_Pt_80_120_13TeV_TuneCUETP8M1_cfi',Kby(9,100)) steps['Wjet_Pt_3000_3500_13']=gen2015('Wjet_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi',Kby(9,50)) steps['SMS-T1tttt_mGl-1500_mLSP-100_13']=gen2015('SMS-T1tttt_mGl-1500_mLSP-100_13TeV-pythia8_cfi',Kby(9,50)) @@ -256,6 +261,12 @@ def gen2015(fragment,howMuch): steps['WpToENu_M-2000_13']=gen2015('WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_cff',Kby(9,100)) steps['DisplacedSUSY_stopToBottom_M_300_1000mm_13']=gen2015('DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_cff',Kby(9,100)) + +# 13TeV High Stats samples +steps['ZMM_13_HS']=gen2015('ZMM_13TeV_TuneCUETP8M1_cfi',Kby(209,100)) +steps['TTbar_13_HS']=gen2015('TTbar_13TeV_TuneCUETP8M1_cfi',Kby(100,50)) + + def identitySim(wf): return merge([{'--restoreRND':'SIM','--process':'SIM2', '--inputCommands':'"keep *","drop *TagInfo*_*_*_*"' },wf]) @@ -274,7 +285,9 @@ def identitySim(wf): 'CMSSW_8_0_0_pre2-PU50ns_76X_mcRun2_startup_v11-v1', # 6 - fullSim PU 50ns premix 'CMSSW_8_0_0_pre2-76X_mcRun2_asymptotic_v12_FastSim-v1', # 7 - fastSim MinBias for mixing 'CMSSW_8_0_0_pre2-PU25ns_76X_mcRun2_asymptotic_v12_FastSim-v1', # 8 - fastSim premixed MinBias - 'CMSSW_7_6_0_pre6-76X_mcRun2_HeavyIon_v4-v1' # 9 - Run2 HI GEN-SIM + 'CMSSW_7_6_0_pre6-76X_mcRun2_HeavyIon_v4-v1', # 9 - Run2 HI GEN-SIM + 'CMSSW_7_6_0-76X_mcRun2_asymptotic_v11-v1', # 10 - 13 TeV High Stats GEN-SIM + 'CMSSW_7_6_0_pre7-76X_mcRun2_asymptotic_v9_realBS-v1', # 11 - 13 TeV High Stats MiniBias for mixing GEN-SIM ] # note: INPUT commands to be added once GEN-SIM w/ 13TeV+PostLS1Geo will be available @@ -316,6 +329,7 @@ def identitySim(wf): steps['TTbar_13INPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['TTbarLepton_13INPUT']={'INPUT':InputInfo(dataSet='/RelValTTbarLepton_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['ZEE_13INPUT']={'INPUT':InputInfo(dataSet='/RelValZEE_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} +#steps['ZEE_13_DBLMINIAODINPUT']={'INPUT':InputInfo(dataSet='/RelValZEE_13_DBLMINIAOD/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['Wjet_Pt_80_120_13INPUT']={'INPUT':InputInfo(dataSet='/RelValWjet_Pt_80_120_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['Wjet_Pt_3000_3500_13INPUT']={'INPUT':InputInfo(dataSet='/RelValWjet_Pt_3000_3500_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} steps['SMS-T1tttt_mGl-1500_mLSP-100_13INPUT']={'INPUT':InputInfo(dataSet='/RelValSMS-T1tttt_mGl-1500_mLSP-100_13/%s/GEN-SIM'%(baseDataSetRelease[3],),location='STD')} @@ -378,6 +392,10 @@ def identitySim(wf): #input for fast sim workflows to be added - TODO +#input for 13 TeV High Stats samples +steps['ZMM_13_HSINPUT']={'INPUT':InputInfo(dataSet='/RelValZMM_13_HS/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} +steps['TTbar_13_HSINPUT']={'INPUT':InputInfo(dataSet='/RelValTTbar_13_HS/%s/GEN-SIM'%(baseDataSetRelease[10],),location='STD')} + ## high stat step1 ecalHcal={ @@ -772,6 +790,9 @@ def identityFS(wf): PUFSAVE35_DRMIX_ITO={'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBiasFS_13_ForMixing/%s/GEN-SIM-RECO'%(baseDataSetRelease[7],),'--era':'Run2_25ns','--customise':'FastSimulation/Configuration/Customs.disableOOTPU'} PUFS25={'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBiasFS_13_ForMixing/%s/GEN-SIM-RECO'%(baseDataSetRelease[7],)} +#pu25 for high stats workflows +PU25HS={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(baseDataSetRelease[11],)} + # steps['TTbarFSPU']=merge([PUFS,Kby(100,500),steps['TTbarFS']] ) @@ -808,6 +829,10 @@ def identityFS(wf): steps['DIGIUP15_PU25']=merge([PU25,step2Upg2015Defaults]) steps['DIGIUP15_PU50']=merge([PU50,step2Upg2015Defaults50ns]) +# PU25 for high stats workflows +steps['DIGIUP15_PU25HS']=merge([PU25HS,step2Upg2015Defaults]) + + steps['DIGIPROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@fake','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Defaults]) steps['DIGI']=merge([step2Defaults]) #steps['DIGI2']=merge([stCond,step2Defaults]) @@ -1037,6 +1062,7 @@ def identityFS(wf): steps['RECOHAL']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,ALCA:MuAlCalIsolatedMu,DQM','--scenario':'cosmics'},step3Up2015Hal]) steps['RECOMIN']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:SiStripCalZeroBias+SiStripCalMinBias,VALIDATION,DQM'},stCond,step3Defaults]) steps['RECOMINUP15']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:SiStripCalZeroBias+SiStripCalMinBias,VALIDATION,DQM'},step3Up2015Defaults]) +steps['RECOAODUP15']=merge([{'--datatier':'AODSIM,MINIAODSIM,DQMIO','--eventcontent':'AODSIM,MINIAODSIM,DQM'},step3Up2015Defaults]) steps['RECODDQM']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,DQM:@common+@muon+@hcal+@jetmet+@ecal'},steps['RECOD']]) @@ -1045,6 +1071,10 @@ def identityFS(wf): steps['RECOUP15_PU25']=merge([PU25,step3Up2015Defaults]) steps['RECOUP15_PU50']=merge([PU50,step3Up2015Defaults50ns]) +# for PU25 High stats workflows +steps['RECOUP15_PU25HS']=merge([PU25HS,step3Up2015Defaults]) + + # mask away - to be removed once we'll migrate the matrix to be fully unscheduled for RECO step #steps['RECOmAOD']=merge([step3DefaultsUnsch]) #steps['RECOmAODUP15']=merge([step3Up2015DefaultsUnsch]) @@ -1362,6 +1392,10 @@ def identityFS(wf): steps['MINIAODMCUP15FS'] =merge([{'--filein':'file:step1.root','--fast':''},stepMiniAODMC]) steps['MINIAODMCUP15FS50'] =merge([{'--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},steps['MINIAODMCUP15FS']]) +steps['DBLMINIAODMCUP15NODQM'] = merge([{'--conditions':'auto:run2_mc_'+autoHLT['relval25ns'], + '-s':'PAT', + '--datatier' : 'MINIAODSIM', + '--eventcontent':'MINIAOD',},stepMiniAODMC]) ################################################################################# ####From this line till the end of the file : From 30a18404f7fc6502bbbee9797d1404111c1cb76f Mon Sep 17 00:00:00 2001 From: Hengne Date: Wed, 25 Nov 2015 17:35:06 +0100 Subject: [PATCH 7/7] add back T2_CH_CERN requirement --- Configuration/PyReleaseValidation/python/MatrixUtil.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/MatrixUtil.py b/Configuration/PyReleaseValidation/python/MatrixUtil.py index 2954461a910e4..3d979c176d744 100644 --- a/Configuration/PyReleaseValidation/python/MatrixUtil.py +++ b/Configuration/PyReleaseValidation/python/MatrixUtil.py @@ -158,11 +158,9 @@ def queries(self): return the_queries if len(self.run) is not 0: - #return ["file {0}={1} run={2} site=T2_CH_CERN".format(query_by, query_source, query_run) for query_run in self.run] - return ["file {0}={1} run={2} ".format(query_by, query_source, query_run) for query_run in self.run] + return ["file {0}={1} run={2} site=T2_CH_CERN".format(query_by, query_source, query_run) for query_run in self.run] else: - #return ["file {0}={1} site=T2_CH_CERN".format(query_by, query_source)] - return ["file {0}={1} ".format(query_by, query_source)] + return ["file {0}={1} site=T2_CH_CERN".format(query_by, query_source)] def __str__(self): if self.ib_block: