Skip to content

Commit a354170

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47188 from francescobrivio/fix_default_VtxSmearing
Update beamspot option in ConfigBuilder
2 parents 59c5d67 + 142a0ab commit a354170

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

‎Configuration/Applications/python/ConfigBuilder.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class Options:
6363
defaultOptions.inlineEventContent = True
6464
defaultOptions.inlineObjects =''
6565
defaultOptions.hideGen=False
66-
from Configuration.StandardSequences.VtxSmeared import VtxSmearedDefaultKey,VtxSmearedHIDefaultKey
66+
from Configuration.StandardSequences.VtxSmeared import VtxSmearedDefaultKey
6767
defaultOptions.beamspot=None
6868
defaultOptions.outputDefinition =''
6969
defaultOptions.inputCommands = None
@@ -1062,7 +1062,12 @@ def define_Configs(self):
10621062
self.EVTCONTDefaultCFF="Configuration/EventContent/EventContent_cff"
10631063

10641064
if not self._options.beamspot:
1065-
self._options.beamspot=VtxSmearedDefaultKey
1065+
# GEN step always requires to have a VtxSmearing scenario (--beamspot) defined
1066+
# ...unless it's a special gen-only request (GEN:pgen_genonly)
1067+
if 'GEN' in self.stepMap and not 'pgen_genonly' in self.stepMap['GEN']:
1068+
raise Exception("Missing \'--beamspot\' option in the GEN step of the cmsDriver command!")
1069+
else:
1070+
self._options.beamspot=VtxSmearedDefaultKey
10661071

10671072
# if its MC then change the raw2digi
10681073
if self._options.isMC==True:
@@ -1095,8 +1100,6 @@ def define_Configs(self):
10951100
self.DQMDefaultSeq='DQMOfflineCosmics'
10961101

10971102
if self._options.scenario=='HeavyIons':
1098-
if not self._options.beamspot:
1099-
self._options.beamspot=VtxSmearedHIDefaultKey
11001103
self.HLTDefaultSeq = 'HIon'
11011104
self.VALIDATIONDefaultCFF="Configuration/StandardSequences/ValidationHeavyIons_cff"
11021105
self.VALIDATIONDefaultSeq=''

‎Configuration/HLT/python/addOnTestsHLT.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
def addOnTestsHLT():
22

33
addOnTestsHLT = {
4-
'hlt_mc_Fake' : ['cmsDriver.py TTbar_8TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run1_mc_Fake --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --fileout file:RelVal_Raw_Fake_MC.root',
4+
'hlt_mc_Fake' : ['cmsDriver.py TTbar_8TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run1_mc_Fake --beamspot DBrealistic --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --fileout file:RelVal_Raw_Fake_MC.root',
55
'HLTrigger/Configuration/test/OnLine_HLT_Fake.py',
66
'cmsDriver.py RelVal -s HLT:Fake,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run1_mc_Fake --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --processName=HLTRECO --filein file:RelVal_Raw_Fake_MC.root --fileout file:RelVal_Raw_Fake_MC_HLT_RECO.root'],
7-
'hlt_mc_Fake1': ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run2_mc_Fake1 --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_25ns --fileout file:RelVal_Raw_Fake1_MC.root',
7+
'hlt_mc_Fake1': ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run2_mc_Fake1 --beamspot DBrealistic --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_25ns --fileout file:RelVal_Raw_Fake1_MC.root',
88
'HLTrigger/Configuration/test/OnLine_HLT_Fake1.py',
99
'cmsDriver.py RelVal -s HLT:Fake1,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_Fake1 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run2_25ns --processName=HLTRECO --filein file:RelVal_Raw_Fake1_MC.root --fileout file:RelVal_Raw_Fake1_MC_HLT_RECO.root'],
10-
'hlt_mc_Fake2': ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run2_mc_Fake2 --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2016 --fileout file:RelVal_Raw_Fake2_MC.root',
10+
'hlt_mc_Fake2': ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run2_mc_Fake2 --beamspot DBrealistic --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2016 --fileout file:RelVal_Raw_Fake2_MC.root',
1111
'HLTrigger/Configuration/test/OnLine_HLT_Fake2.py',
1212
'cmsDriver.py RelVal -s HLT:Fake2,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run2_mc_Fake2 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run2_2016 --processName=HLTRECO --filein file:RelVal_Raw_Fake2_MC.root --fileout file:RelVal_Raw_Fake2_MC_HLT_RECO.root'],
13-
'hlt_mc_GRun' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_GRun --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2024 --fileout file:RelVal_Raw_GRun_MC.root',
13+
'hlt_mc_GRun' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_GRun --beamspot DBrealistic --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2024 --fileout file:RelVal_Raw_GRun_MC.root',
1414
'HLTrigger/Configuration/test/OnLine_HLT_GRun.py',
1515
'cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run3_mc_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run3_2024 --processName=HLTRECO --filein file:RelVal_Raw_GRun_MC.root --fileout file:RelVal_Raw_GRun_MC_HLT_RECO.root'],
16-
'hlt_mc_HIon' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_HIon --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_pp_on_PbPb_2024 --fileout file:RelVal_Raw_HIon_MC.root',
16+
'hlt_mc_HIon' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_HIon --beamspot DBrealistic --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_pp_on_PbPb_2024 --fileout file:RelVal_Raw_HIon_MC.root',
1717
'HLTrigger/Configuration/test/OnLine_HLT_HIon.py',
1818
'cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run3_mc_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run3_pp_on_PbPb_2024 --processName=HLTRECO --filein file:RelVal_Raw_HIon_MC.root --fileout file:RelVal_Raw_HIon_MC_HLT_RECO.root'],
19-
'hlt_mc_PIon' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_PIon --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2024 --fileout file:RelVal_Raw_PIon_MC.root',
19+
'hlt_mc_PIon' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_PIon --beamspot DBrealistic --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2024 --fileout file:RelVal_Raw_PIon_MC.root',
2020
'HLTrigger/Configuration/test/OnLine_HLT_PIon.py',
2121
'cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run3_mc_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run3_2024 --processName=HLTRECO --filein file:RelVal_Raw_PIon_MC.root --fileout file:RelVal_Raw_PIon_MC_HLT_RECO.root'],
22-
'hlt_mc_PRef' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_PRef --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2024 --fileout file:RelVal_Raw_PRef_MC.root',
22+
'hlt_mc_PRef' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_PRef --beamspot DBrealistic --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2024 --fileout file:RelVal_Raw_PRef_MC.root',
2323
'HLTrigger/Configuration/test/OnLine_HLT_PRef.py',
2424
'cmsDriver.py RelVal -s HLT:PRef,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run3_mc_PRef --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run3_2024 --processName=HLTRECO --filein file:RelVal_Raw_PRef_MC.root --fileout file:RelVal_Raw_PRef_MC_HLT_RECO.root'],
25-
'hlt_mc_Special' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_Special --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2024 --fileout file:RelVal_Raw_Special_MC.root',
25+
'hlt_mc_Special' : ['cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi -s GEN,SIM,DIGI,L1,DIGI2RAW --mc --scenario=pp -n 10 --conditions auto:run3_mc_Special --beamspot DBrealistic --relval 9000,50 --datatier "GEN-SIM-RAW" --eventcontent RAWSIM --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2024 --fileout file:RelVal_Raw_Special_MC.root',
2626
'HLTrigger/Configuration/test/OnLine_HLT_Special.py',
2727
'cmsDriver.py RelVal -s HLT:Special,RAW2DIGI,L1Reco,RECO --mc --scenario=pp -n 10 --conditions auto:run3_mc_Special --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run3_2024 --processName=HLTRECO --filein file:RelVal_Raw_Special_MC.root --fileout file:RelVal_Raw_Special_MC_HLT_RECO.root'],
2828
'hlt_data_Fake' : ['cmsDriver.py RelVal -s L1REPACK:GT1 --data --scenario=pp -n 10 --conditions auto:run1_hlt_Fake --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --fileout file:RelVal_Raw_Fake_DATA.root --filein /store/data/Run2012A/MuEG/RAW/v1/000/191/718/14932935-E289-E111-830C-5404A6388697.root',

‎Configuration/PyReleaseValidation/python/relval_steps.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,6 +1491,7 @@ def genS(fragment,howMuch):
14911491
{"cfg":"SingleNuE10_cfi",
14921492
"--fast":"",
14931493
"--conditions":"auto:run2_mc",
1494+
"--beamspot":"DBrealistic",
14941495
"-s":"GEN,SIM,RECOBEFMIX,DIGI",
14951496
"--eventcontent":"PREMIX",
14961497
"--datatier":"PREMIX",
@@ -1537,6 +1538,7 @@ def genS(fragment,howMuch):
15371538
{"cfg":"SingleNuE10_cfi",
15381539
"--fast":"",
15391540
"--conditions":"auto:phase1_2017_realistic",
1541+
"--beamspot":"DBrealistic",
15401542
"-s":"GEN,SIM,RECOBEFMIX,DIGI",
15411543
"--eventcontent":"PREMIX",
15421544
"--datatier":"PREMIX",
@@ -1586,6 +1588,7 @@ def genS(fragment,howMuch):
15861588
{"cfg":"SingleNuE10_cfi",
15871589
"--fast":"",
15881590
"--conditions":"auto:phase1_2018_realistic",
1591+
"--beamspot":"DBrealistic",
15891592
"-s":"GEN,SIM,RECOBEFMIX,DIGI",
15901593
"--eventcontent":"PREMIX",
15911594
"--datatier":"PREMIX",
@@ -2101,6 +2104,7 @@ def lhegensim2018ml(fragment,howMuch):
21012104
'-s' : 'GEN,SIM,DIGI:pdigi_valid',
21022105
'-n' : '10',
21032106
'--conditions' : 'auto:run2_mc', # 25ns GT; dedicated dict for 50ns
2107+
'--beamspot' : 'DBrealistic',
21042108
'--datatier' : 'PREMIX',
21052109
'--eventcontent': 'PREMIX',
21062110
'--procModifiers':'premix_stage1',

‎Configuration/StandardSequences/python/VtxSmeared.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,4 @@
7676
'Realistic2024ppRefCollision' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic2024ppRefCollision_cfi',
7777
'Realistic2024PbPbCollision' : 'IOMC.EventVertexGenerators.VtxSmearedRealistic2024PbPbCollision_cfi',
7878
}
79-
VtxSmearedDefaultKey='Realistic50ns13TeVCollision'
80-
VtxSmearedHIDefaultKey='RealisticPbPbCollision2018'
79+
VtxSmearedDefaultKey='DBrealistic'

0 commit comments

Comments
 (0)