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

Use correct beamspot for 2016 MC + update MC tracker alignment scenario for 2016 pre-VFP era #28624

Merged
merged 6 commits into from
Jan 8, 2020
Merged

Use correct beamspot for 2016 MC + update MC tracker alignment scenario for 2016 pre-VFP era #28624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e813bc9
Use realistic beamspot for 2016, with 25 ns rather than 50 ns bunch s…
christopheralanwest Dec 13, 2019
7b0f127
Use realistic beamspot for 2016 data rather than 2015 beamspot
christopheralanwest Dec 13, 2019
fe3f449
Revert change to auto:run2_mc_l1stage1 GT; existing beamspot tag bett…
christopheralanwest Dec 18, 2019
02a5e97
Use new standard beamspot for 2016
christopheralanwest Dec 18, 2019
7a0d99e
Use ideal beamspot for auto:run2_design global tag
christopheralanwest Dec 18, 2019
a1be73e
Update tracker alignment for 2016 pre-VFP era
christopheralanwest Dec 18, 2019
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
8 changes: 4 additions & 4 deletions Configuration/AlCa/python/autoCond.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
# GlobalTag for MC production (L1 Trigger Stage1) with starup-like alignment and calibrations for Run2, L1 trigger in Stage1 mode
'run2_mc_l1stage1' : '110X_mcRun2_asymptotic_l1stage1_v2',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : '110X_mcRun2_design_v3',
'run2_design' : '110X_mcRun2_design_v5',
#GlobalTag for MC production with optimistic alignment and calibrations for 2016, prior to VFP change
'run2_mc_pre_vfp' : '110X_mcRun2_asymptotic_preVFP_v1',
'run2_mc_pre_vfp' : '110X_mcRun2_asymptotic_preVFP_v3',
#GlobalTag for MC production with optimistic alignment and calibrations for 2016, after VFP change
'run2_mc' : '110X_mcRun2_asymptotic_v5',
'run2_mc' : '110X_mcRun2_asymptotic_v6',
# GlobalTag for MC production (cosmics) with starup-like alignment and calibrations for Run2, Strip tracker in peak mode
'run2_mc_cosmics' : '110X_mcRun2cosmics_startup_deco_v4',
'run2_mc_cosmics' : '110X_mcRun2cosmics_startup_deco_v5',
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : '110X_mcRun2_HeavyIon_v2',
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
Expand Down
8 changes: 4 additions & 4 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
step1Up2015Defaults = {'-s' : 'GEN,SIM',
'-n' : 10,
'--conditions' : 'auto:run2_mc',
'--beamspot' : 'Realistic50ns13TeVCollision',
'--beamspot' : 'Realistic25ns13TeV2016Collision',
'--datatier' : 'GEN-SIM',
'--eventcontent': 'FEVTDEBUG',
'--era' : 'Run2_2016'
Expand Down Expand Up @@ -971,7 +971,7 @@ def genS(fragment,howMuch):
step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
'--fast':'',
'--conditions' :'auto:run2_mc',
'--beamspot' : 'Realistic50ns13TeVCollision',
'--beamspot' : 'Realistic25ns13TeV2016Collision',
'--era' :'Run2_2016',
'--eventcontent':'FEVTDEBUGHLT,DQM',
'--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
Expand Down Expand Up @@ -1386,7 +1386,7 @@ def identityFS(wf):
'-s':'LHE,GEN,SIM',
'-n' : 10,
'--conditions' : 'auto:run2_mc',
'--beamspot' : 'Realistic50ns13TeVCollision',
'--beamspot' : 'Realistic25ns13TeV2016Collision',
'--datatier' : 'GEN-SIM,LHE',
'--eventcontent': 'FEVTDEBUG,LHE',
'--era' : 'Run2_2016',
Expand Down Expand Up @@ -1452,7 +1452,7 @@ def lhegensim2018(fragment,howMuch):
step1GENNormal = {'--relval' : '10000,50',
'-s' : 'GEN,SIM',
'--conditions' : 'auto:run2_mc',
'--beamspot' : 'Realistic50ns13TeVCollision',
'--beamspot' : 'Realistic25ns13TeV2016Collision',
'--eventcontent': 'FEVTDEBUG',
'--datatier' : 'GEN-SIM',
'--era' : 'Run2_2016',
Expand Down
4 changes: 2 additions & 2 deletions TauAnalysis/MCEmbeddingTools/test/runtests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ cmsDriver.py selecting -s RAW2DIGI,L1Reco,RECO,PAT --runUnscheduled --data --sce
cmsDriver.py LHEembeddingCLEAN --filein file:selected.root --runUnscheduled --fileout file:lhe_and_cleaned.root --data --scenario pp --conditions auto:run2_data --era Run2_2016_HIPM --eventcontent RAWRECO --datatier RAWRECO --step RAW2DIGI,RECO --customise Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016,TauAnalysis/MCEmbeddingTools/customisers.customiseLHEandCleaning -n -1 python_filename lheprodandcleaning.py || die 'Failure during LHE and Cleaning step' $?

### Do not run HLT in CMSSW_9_0_X so far since the RecoPixelVertexingPixelTrackFittingPlugins. seems not to work
cmsDriver.py TauAnalysis/MCEmbeddingTools/python/EmbeddingPythia8Hadronizer_cfi.py --filein file:lhe_and_cleaned.root --fileout file:simulated_and_cleaned.root --conditions auto:run2_mc --era Run2_2016 --eventcontent RAWRECO --step GEN,SIM,DIGI,L1,DIGI2RAW,RAW2DIGI,RECO --datatier RAWRECO --customise TauAnalysis/MCEmbeddingTools/customisers.customiseGenerator --beamspot Realistic50ns13TeVCollision -n -1 --customise_commands "process.generator.nAttempts = cms.uint32(1000)\n" --python_filename simulation.py || die 'Failure during Simulation step' $?
cmsDriver.py TauAnalysis/MCEmbeddingTools/python/EmbeddingPythia8Hadronizer_cfi.py --filein file:lhe_and_cleaned.root --fileout file:simulated_and_cleaned.root --conditions auto:run2_mc --era Run2_2016 --eventcontent RAWRECO --step GEN,SIM,DIGI,L1,DIGI2RAW,RAW2DIGI,RECO --datatier RAWRECO --customise TauAnalysis/MCEmbeddingTools/customisers.customiseGenerator --beamspot Realistic25ns13TeV2016Collision -n -1 --customise_commands "process.generator.nAttempts = cms.uint32(1000)\n" --python_filename simulation.py || die 'Failure during Simulation step' $?

cmsDriver.py MERGE -s PAT --filein file:simulated_and_cleaned.root --fileout file:merged.root --era Run2_2016_HIPM --runUnscheduled --data --scenario pp --conditions auto:run2_data --eventcontent MINIAODSIM --datatier USER --customise TauAnalysis/MCEmbeddingTools/customisers.customiseMerging --customise_commands "process.patTrigger.processName = cms.string('SIMembedding')" -n -1 || die 'Failure during merging step' $?

Expand All @@ -43,4 +43,4 @@ cmsDriver.py MERGE -s PAT --filein file:simulated_and_cleaned.root --fileout fi

popd
rm -rf ${wd}
popd
popd