Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

relval matrix update + data relval HLT:@relval2016 #14098

Merged
merged 45 commits into from Apr 21, 2016
Merged

relval matrix update + data relval HLT:@relval2016 #14098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
9347c53
T2_Chen commented out to avoid eos errors
Apr 6, 2016
9ffb690
re-generation gen-sim update
Apr 10, 2016
7af7641
remove temp. T2_CH_CERN requirement
hengne Apr 11, 2016
3b7d09e
new GT for cosmic wf in fullSim noPU set
Apr 11, 2016
700120b
add experimental workflows to test digital signature to access Fronti…
hengne Apr 12, 2016
f1a1ec2
remove temp. T2_CH_CERN requirement
hengne Apr 11, 2016
8512e8a
add experimental workflows to test digital signature to access Fronti…
hengne Apr 12, 2016
83fd3ec
add Frontier Digital Signature test run1 fullSim workflow
hengne Apr 12, 2016
57eab4d
add frontier digital signature test run1 data workflows
hengne Apr 12, 2016
db69d5b
add frontier digital signature test run1 data HI workflow
hengne Apr 12, 2016
26f7eb2
add frontier digital signature test run2 data workflows
hengne Apr 12, 2016
11004bd
change a run2 data workflow to be a run2 data skimming workflow
hengne Apr 13, 2016
b27a439
add label for Frontier digi signature test workflows
hengne Apr 13, 2016
1a5fe28
add frontier digital signature test workflow of 2017 upgrade
hengne Apr 13, 2016
02c76d2
add frontier digital signature test workflow for run2 fastsim
hengne Apr 13, 2016
564c7b3
add 11425.0 upgrade frontier digital signature test workflow in ib test
hengne Apr 13, 2016
56d9115
update gensim input for 2017 workflows
hengne Apr 14, 2016
bdbf431
fix typo in gensim input string
hengne Apr 14, 2016
0d96830
Merge branch 'from-CMSSW_8_1_0_pre2_relval', remote branch 'mengqing/…
hengne Apr 15, 2016
9a7b249
clean up
hengne Apr 15, 2016
94c8733
fix conflict
hengne Apr 15, 2016
78dfd98
change to phase1 design GT with new gensim input
hengne Apr 14, 2016
87030e1
clearn up
hengne Apr 15, 2016
eaccb88
Merge branch 'from-CMSSW_8_1_0_pre2_relval_DigiSigTest' into from-CMS…
hengne Apr 15, 2016
50bc972
update data 2015d and fastsim workflows to use relval2016 HLT menu
hengne Apr 15, 2016
dcfd4e4
resolve conflict
mmusich Apr 14, 2016
07ec74b
resolve conflict
mmusich Apr 15, 2016
9f25003
resolve confilict
hengne Apr 15, 2016
d6b5d6c
resolve conflict
hengne Apr 15, 2016
60874bf
resolve conflict
hengne Apr 15, 2016
c004e5f
update phase1 gensim string
hengne Apr 15, 2016
59f28b2
clean up
hengne Apr 15, 2016
dfc8a69
change L1REPACK:GT2 to L1REPACK:Full for stage-2 L1
hengne Apr 15, 2016
a9493fd
era change to Run2_2016
hengne Apr 15, 2016
ba73fe9
update era to Run2_2016
hengne Apr 15, 2016
ea4a00f
Fixup crash observed in 0-event 1307.0 due to L1TGlobalSummary/L1TGlo…
Martin-Grunewald Apr 14, 2016
f4c12f6
revert back, to the version wo PR14077
hengne Apr 15, 2016
526919d
add back T2_CH_CERN requirement
hengne Apr 15, 2016
67bfe08
fix harvetst step name change in highstats workflows
hengne Apr 16, 2016
3817c24
remove frontier digi sig ib test workflows
hengne Apr 19, 2016
393a4dd
use era in data reco step
hengne Apr 19, 2016
4ac26bc
change fastSim HLT:@relval2016 back to relval25ns, because it meet a …
hengne Apr 19, 2016
f82e096
add back HLT:@relval2016 for fastsim noPU and classical PU workflows,…
hengne Apr 19, 2016
5236e4d
add hlt @relval2016 also for fastsim pu premixing
hengne Apr 19, 2016
bda7b3e
add DIGI2RAW before L1Reco for all fastSim workflows
hengne Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions Configuration/PyReleaseValidation/python/MatrixInjector.py
View file
Open in desktop
Expand Up @@ -185,11 +185,13 @@ def prepare(self,mReader, directories, mode='init'):
wmsplit['TTbarFS_ID']=1
wmsplit['RECODR2_50nsreHLT']=1
wmsplit['RECODR2_25nsreHLT']=1
wmsplit['RECODR2_2016sreHLT']=1
wmsplit['HLTDR2_50ns']=1
wmsplit['HLTDR2_25ns']=1
wmsplit['HLTDR2_2016']=1
wmsplit['Hadronizer']=1
wmsplit['DIGIUP15']=5
wmsplit['RECOUP15']=5
wmsplit['DIGIUP15']=1
wmsplit['RECOUP15']=1
wmsplit['RECOAODUP15']=5
wmsplit['DBLMINIAODMCUP15NODQM']=5
wmsplit['DigiFull']=5
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_2017.py
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
numWFStart=10000
numWFSkip=200
#2017 WFs to run in IB (TenMuE_0_200, TTbar, ZEE, MinBias, TTbar PU, ZEE PU)
numWFIB = [10021.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0]
numWFIB = [10021.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0]
numWFIB.extend([10821.0,10824.0,10825.0,10826.0]) #2023sim scenario
for i,key in enumerate(upgradeKeys):
numWF=numWFStart+i*numWFSkip
Expand Down
8 changes: 4 additions & 4 deletions Configuration/PyReleaseValidation/python/relval_highstats.py
View file
Open in desktop
Expand Up @@ -71,7 +71,7 @@
workflows[134]=['MinimumBiasBS',['RunMinBias2011B','RECODR1','ALCAPROMPT','ALCAHARVD']]

### HighStats HLT Physics 2015D ###
workflows[134.99901] = ['',['RunHLTPhy2015DHS','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.99901] = ['',['RunHLTPhy2015DHS','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]

## 13 TeV Run2 fullSim noPU
workflows[139901] = ['', ['ZMM_13_HS','DIGIUP15','RECOUP15','HARVESTUP15']]
Expand All @@ -83,9 +83,9 @@


## 2015HighLumi run High stats
workflows[134.99601] = ['',['RunJetHT2015HLHS','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.99602] = ['',['RunZeroBias2015HLHS','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.99603] = ['',['RunSingleMu2015HLHS','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.99601] = ['',['RunJetHT2015HLHS','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.99602] = ['',['RunZeroBias2015HLHS','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.99603] = ['',['RunSingleMu2015HLHS','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]



68 changes: 34 additions & 34 deletions Configuration/PyReleaseValidation/python/relval_standard.py
View file
Open in desktop
Expand Up @@ -107,45 +107,45 @@
workflows[140.53] = ['',['RunHI2011','RECOHID11','HARVESTDHI']]

### run2 2015B 50ns ###
workflows[134.701] = ['',['RunHLTPhy2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2_50nsreHLT']]
workflows[134.702] = ['',['RunDoubleEG2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2_50nsreHLT']]
workflows[134.703] = ['',['RunDoubleMuon2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2_50nsreHLT']]
workflows[134.704] = ['',['RunJetHT2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2_50nsreHLT']]
workflows[134.705] = ['',['RunMET2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2_50nsreHLT']]
workflows[134.706] = ['',['RunMuonEG2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2_50nsreHLT']]
workflows[134.707] = ['',['RunSingleEl2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2_50nsreHLT']]
workflows[134.708] = ['',['RunSingleMu2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2_50nsreHLT']]
workflows[134.709] = ['',['RunSinglePh2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2_50nsreHLT']]
workflows[134.710] = ['',['RunZeroBias2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2_50nsreHLT']]
workflows[134.701] = ['',['RunHLTPhy2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2']]
workflows[134.702] = ['',['RunDoubleEG2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2']]
workflows[134.703] = ['',['RunDoubleMuon2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2']]
workflows[134.704] = ['',['RunJetHT2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2']]
workflows[134.705] = ['',['RunMET2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2']]
workflows[134.706] = ['',['RunMuonEG2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2']]
workflows[134.707] = ['',['RunSingleEl2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2']]
workflows[134.708] = ['',['RunSingleMu2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2']]
workflows[134.709] = ['',['RunSinglePh2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2']]
workflows[134.710] = ['',['RunZeroBias2015B','HLTDR2_50ns','RECODR2_50nsreHLT','HARVESTDR2']]

### run 2015C 25ns ###
workflows[134.801] = ['',['RunHLTPhy2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.802] = ['',['RunDoubleEG2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.803] = ['',['RunDoubleMuon2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.804] = ['',['RunJetHT2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.805] = ['',['RunMET2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.806] = ['',['RunMuonEG2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.807] = ['',['RunDoubleEGPrpt2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.808] = ['',['RunSingleMuPrpt2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.809] = ['',['RunSingleEl2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.810] = ['',['RunSingleMu2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.811] = ['',['RunSinglePh2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.812] = ['',['RunZeroBias2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.801] = ['',['RunHLTPhy2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.802] = ['',['RunDoubleEG2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.803] = ['',['RunDoubleMuon2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.804] = ['',['RunJetHT2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.805] = ['',['RunMET2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.806] = ['',['RunMuonEG2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.807] = ['',['RunDoubleEGPrpt2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.808] = ['',['RunSingleMuPrpt2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.809] = ['',['RunSingleEl2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.810] = ['',['RunSingleMu2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.811] = ['',['RunSinglePh2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]
workflows[134.812] = ['',['RunZeroBias2015C','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2']]


### run 2015D 25ns ###
workflows[134.901] = ['',['RunHLTPhy2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.902] = ['',['RunDoubleEG2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.903] = ['',['RunDoubleMuon2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.904] = ['',['RunJetHT2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.905] = ['',['RunMET2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.906] = ['',['RunMuonEG2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.907] = ['',['RunDoubleEGPrpt2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.908] = ['',['RunSingleMuPrpt2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.909] = ['',['RunSingleEl2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.910] = ['',['RunSingleMu2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.911] = ['',['RunSinglePh2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.912] = ['',['RunZeroBias2015D','HLTDR2_25ns','RECODR2_25nsreHLT','HARVESTDR2_25nsreHLT']]
workflows[134.901] = ['',['RunHLTPhy2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.902] = ['',['RunDoubleEG2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.903] = ['',['RunDoubleMuon2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.904] = ['',['RunJetHT2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.905] = ['',['RunMET2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.906] = ['',['RunMuonEG2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.907] = ['',['RunDoubleEGPrpt2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.908] = ['',['RunSingleMuPrpt2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.909] = ['',['RunSingleEl2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.910] = ['',['RunSingleMu2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.911] = ['',['RunSinglePh2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]
workflows[134.912] = ['',['RunZeroBias2015D','HLTDR2_2016','RECODR2_2016reHLT','HARVESTDR2']]

### fastsim ###
workflows[5.1] = ['TTbar', ['TTbarFS','HARVESTFS']]
Expand Down
49 changes: 33 additions & 16 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -81,7 +81,6 @@
steps['RunHI2010']={'INPUT':InputInfo(dataSet='/HIAllPhysics/HIRun2010-v1/RAW',label='hi2010',run=[152698],events=10000,location='STD')}
steps['RunHI2011']={'INPUT':InputInfo(dataSet='/HIMinBiasUPC/HIRun2011-v1/RAW',label='hi2011',run=[182124],events=10000,location='STD')}


Run2012A=[191226]
Run2012ASk=Run2012A+[]
steps['RunMinBias2012A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012A-v1/RAW',label='mb2012A',run=Run2012A, events=100000,location='STD')}
Expand Down Expand Up @@ -286,12 +285,12 @@ def identitySim(wf):
'CMSSW_6_2_0_pre8-PRE_ST62_V8_FastSim-v1', # 2 for fastsim id test
# 'CMSSW_7_1_0_pre5-START71_V1-v2', # 3 8 TeV , for the one sample which is part of the routine relval production (RelValZmumuJets_Pt_20_300, because of -v2)
# 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_8_1_0_pre2-80X_mcRun2_asymptotic_v10_gs810pre2-v1', # 3 - 13 TeV samples with GEN-SIM from 810_p2; 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_8_1_0_pre1-PU25ns_80X_mcRun2_asymptotic_v6-v1', # 5 - fullSim PU 25ns premix for
'CMSSW_8_1_0_pre1-PU50ns_80X_mcRun2_startup_v6-v1', # 6 - fullSim PU 50ns premix for
'CMSSW_8_1_0_pre1-80X_mcRun2_asymptotic_v6_FastSim-v1', # 7 - fastSim MinBias for mixing
'CMSSW_8_1_0_pre1-PU25ns_80X_mcRun2_asymptotic_v6_FastSim-v1', # 8 - fastSim premixed MinBias
'CMSSW_8_1_0_pre2-PU25ns_80X_mcRun2_asymptotic_v10_gs810pre2-v1', # 5 - fullSim PU 25ns premix for 810pre2 + Gen-Sim_810pre2
'CMSSW_8_1_0_pre2-PU50ns_80X_mcRun2_startup_v10_gs810pre2-v1', # 6 - fullSim PU 50ns premix for 810pre2 + Gen-Sim_810pre2
'CMSSW_8_1_0_pre2-80X_mcRun2_asymptotic_v10_FastSim-v1', # 7 - fastSim MinBias for mixing for 810pre2
'CMSSW_8_1_0_pre2-PU25ns_80X_mcRun2_asymptotic_v10_FastSim-v1',# 8 - fastSim premixed MinBias for 810pre2
'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
Expand Down Expand Up @@ -549,14 +548,14 @@ def genS(fragment,howMuch):

#### fastsim section ####
##no forseen to do things in two steps GEN-SIM then FASTIM->end: maybe later
step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,L1Reco,RECO,EI,HLT:@fake,VALIDATION:@standardValidation,DQM:@standardDQM',
step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@fake,VALIDATION:@standardValidation,DQM:@standardDQM',
'--fast':'',
'--beamspot' : 'Realistic8TeVCollision',
'--eventcontent':'FEVTDEBUGHLT,DQM',
'--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
'--relval':'27000,3000'},
step1Defaults])
step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,L1Reco,RECO,EI,DIGI2RAW,HLT:@relval25ns,VALIDATION:@standardValidation,DQM:@standardDQM',
step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@relval2016,VALIDATION:@standardValidation,DQM:@standardDQM',
'--fast':'',
'--conditions' :'auto:run2_mc',
'--beamspot' : 'Realistic50ns13TeVCollision',
Expand Down Expand Up @@ -623,7 +622,7 @@ def genS(fragment,howMuch):

### Fastsim: template to produce signal and overlay it with premixed minbias events
FS_PREMIXUP15_PU25_OVERLAY = merge([
{"-s" : "GEN,SIM,RECOBEFMIX,DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,L1Reco,RECO,HLT:@relval25ns,VALIDATION",
{"-s" : "GEN,SIM,RECOBEFMIX,DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,L1Reco,RECO,HLT:@relval2016,VALIDATION",
"--datamix" : "PreMix",
"--pileup_input" : "dbs:/RelValFS_PREMIXUP15_PU25/%s/GEN-SIM-DIGI-RAW"%(baseDataSetRelease[8],),
"--customise":"SimGeneral/DataMixingModule/customiseForPremixingInput.customiseForPreMixingInput"
Expand Down Expand Up @@ -859,6 +858,7 @@ 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])

Expand Down Expand Up @@ -949,8 +949,11 @@ def identityFS(wf):
'--datatier': 'FEVTDEBUGHLT',
# '--output':'\'[{"e":"RAW","t":"RAW","o":["drop FEDRawDataCollection_rawDataCollector__LHC"]}]\'',
},])


steps['HLTDSKIM']=merge([{'--inputCommands':'"keep *","drop *_*_*_RECO"'},steps['HLTD']])


steps['RECOD']=merge([{'--scenario':'pp',},dataReco])
steps['RECODR1']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias,DQM:@standardDQMFakeHLT+@miniAODDQM'},dataReco])
steps['RECODAlCaCalo']=merge([{'--scenario':'pp',},dataRecoAlCaCalo])
Expand All @@ -964,9 +967,14 @@ def identityFS(wf):
steps['HLTDR2_25ns']=merge( [ {'-s':'L1REPACK:GT2,HLT:@%s'%hltKey25ns,},{'--conditions':'auto:run2_hlt_relval'},{'--era' : 'Run2_25ns'},steps['HLTD'] ] )


# custom function to be put back once the CSC tracked/untracked will have been fixed.. :-)
steps['RECODR2_50ns']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--customise':'Configuration/DataProcessing/RecoTLR.customiseDataRun2Common',},dataReco])
steps['RECODR2_25ns']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--customise':'Configuration/DataProcessing/RecoTLR.customiseDataRun2Common_25ns',},dataReco])
hltKey2016='relval2016'
menuR2_2016 = autoHLT[hltKey2016]
steps['HLTDR2_2016']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2016,},{'--conditions':'auto:run2_hlt_relval'},{'--era' : 'Run2_2016'},steps['HLTD'] ] )

# use --era
steps['RECODR2_50ns']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--era':'Run2_50ns',},dataReco])
steps['RECODR2_25ns']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--era':'Run2_25ns',},dataReco])
steps['RECODR2_2016']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--era':'Run2_2016',},dataReco])


steps['RECODR2AlCaEle']=merge([{'--scenario':'pp','--conditions':'auto:run2_data_relval','--customise':'Configuration/DataProcessing/RecoTLR.customisePromptRun2',},dataRecoAlCaCalo])
Expand Down Expand Up @@ -1077,17 +1085,23 @@ def identityFS(wf):
steps['RECOUP15']=merge([step3Up2015Defaults]) # todo: remove UP from label
steps['RECOUP15AlCaCalo']=merge([step3Up2015DefaultsAlCaCalo]) # todo: remove UP from label


#steps['RECOUP15PROD1']=merge([{ '-s' : 'RAW2DIGI,L1Reco,RECO,EI,DQM:DQMOfflinePOGMC', '--datatier' : 'AODSIM,DQMIO', '--eventcontent' : 'AODSIM,DQM'},step3Up2015Defaults])

steps['RECODreHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECOD']])
steps['RECODR1reHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECODR1']])


steps['RECODreHLTAlCaCalo']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECODAlCaCalo']])

steps['RECODR2_25nsreHLT']=merge([{'--hltProcess':'reHLT'},steps['RECODR2_25ns']])
steps['RECODR2_50nsreHLT']=merge([{'--hltProcess':'reHLT'},steps['RECODR2_50ns']])
steps['RECODR2_2016reHLT']=merge([{'--hltProcess':'reHLT'},steps['RECODR2_2016']])
steps['RECODR2reHLTAlCaEle']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run2_data_relval'},steps['RECODR2AlCaEle']])

steps['RECO']=merge([step3Defaults])


steps['RECOAlCaCalo']=merge([step3DefaultsAlCaCalo])
steps['RECODBG']=merge([{'--eventcontent':'RECODEBUG,DQM'},steps['RECO']])
steps['RECOPROD1']=merge([{ '-s' : 'RAW2DIGI,L1Reco,RECO,EI', '--datatier' : 'GEN-SIM-RECO,AODSIM', '--eventcontent' : 'RECOSIM,AODSIM'},step3Defaults])
Expand Down Expand Up @@ -1273,8 +1287,7 @@ def identityFS(wf):

steps['HARVESTDreHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu}, steps['HARVESTD'] ])
steps['HARVESTDR1reHLT'] = merge([ {'--conditions':'auto:run1_data_%s'%menu}, steps['HARVESTDR1'] ])
steps['HARVESTDR2_50nsreHLT'] = merge([ {'--conditions':'auto:run2_data_relval'}, steps['HARVESTD'] ])
steps['HARVESTDR2_25nsreHLT'] = merge([ {'--conditions':'auto:run2_data_relval'}, steps['HARVESTD'] ])
steps['HARVESTDR2'] = merge([ {'--conditions':'auto:run2_data_relval'}, steps['HARVESTD'] ])

steps['HARVESTDDQM']=merge([{'-s':'HARVESTING:@common+@muon+@hcal+@jetmet+@ecal'},steps['HARVESTD']])

Expand All @@ -1292,12 +1305,15 @@ def identityFS(wf):
'--data':'',
'--scenario':'HeavyIons'}


#MC
steps['HARVEST']={'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
'--conditions':'auto:run1_mc',
'--mc':'',
'--filetype':'DQM',
'--scenario':'pp'}


steps['HARVESTCOS']={'-s':'HARVESTING:dqmHarvesting',
'--conditions':'auto:run1_mc',
'--mc':'',
Expand Down Expand Up @@ -1344,6 +1360,7 @@ def identityFS(wf):
'--filetype':'DQM',
}


steps['HARVESTMINUP15']=merge([{'-s':'HARVESTING:validationHarvesting+dqmHarvesting'},steps['HARVESTUP15']])

steps['HARVESTUP15_PU25']=steps['HARVESTUP15']
Expand Down Expand Up @@ -1465,7 +1482,7 @@ def identityFS(wf):
from Configuration.PyReleaseValidation.upgradeWorkflowComponents import *

defaultDataSets={}
defaultDataSets['2017']='CMSSW_8_1_0_pre1-80X_upgrade2017_design_v4_UPG17-v'
defaultDataSets['2017']='CMSSW_8_1_0_pre2-80X_upgrade2017_realistic_v1_UPG17realGT-v'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looks like the datasets for 2017 are not available at CERN. So, pileup and recycled SIM matrix doesn't work.
Did somebody request transfer already?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it is requested automatically but it is stack there:

https://cmsweb.cern.ch/phedex/prod/Data::Subscriptions#state=create_since%3D1458743912%3Bfilter%3D%2F*%2FCMSSW_8_1_0_pre2-80X_upgrade2017_realistic_v1_UPG17realGT-v*%2FGEN-SIM%3Bnode%3DT2_CH_CERN

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Hengne,

the request was there for more than a week.
It looks like it has fallen through the cracks.
Maybe an email to dataops to get it going?

keys=defaultDataSets.keys()
for key in keys:
defaultDataSets[key+'PU']=defaultDataSets[key]
Expand Down Expand Up @@ -1515,7 +1532,7 @@ def identityFS(wf):
}
if cust!=None : upgradeStepDict['GenSimFull'][k]['--customise']=cust
if era is not None: upgradeStepDict['GenSimFull'][k]['--era']=era

upgradeStepDict['GenSimHLBeamSpotFull'][k]= {'-s' : 'GEN,SIM',
'-n' : 10,
'--conditions' : gt,
Expand Down