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

Update BeamSpot in Run3 MC GTs + swap Run3RoundOptics25ns13TeVLowSigmaZ with Realistic25ns13p6TeVEarly2022Collision vtx smearing #38760

Merged
merged 2 commits into from Aug 25, 2022
Merged

Update BeamSpot in Run3 MC GTs + swap Run3RoundOptics25ns13TeVLowSigmaZ with Realistic25ns13p6TeVEarly2022Collision vtx smearing #38760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44becb5
swap Run3RoundOptics25ns13TeVLowSigmaZ with Realistic25ns13p6TeVEarly…
mmusich Jul 15, 2022
d7e814e
Add new BeamSpot tags for Run3
francescobrivio Aug 9, 2022
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
10 changes: 5 additions & 5 deletions Configuration/AlCa/python/autoCond.py
View file
Open in desktop
Expand Up @@ -70,17 +70,17 @@
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2022
'phase1_2022_design' : '125X_mcRun3_2022_design_v2',
# GlobalTag for MC production with realistic conditions for Phase1 2022
'phase1_2022_realistic' : '125X_mcRun3_2022_realistic_v2',
'phase1_2022_realistic' : '125X_mcRun3_2022_realistic_v3',
# GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2022, Strip tracker in DECO mode
'phase1_2022_cosmics' : '125X_mcRun3_2022cosmics_realistic_deco_v2',
'phase1_2022_cosmics' : '125X_mcRun3_2022cosmics_realistic_deco_v3',
# GlobalTag for MC production (cosmics) with perfectly aligned and calibrated detector for Phase1 2022, Strip tracker in DECO mode
'phase1_2022_cosmics_design' : '125X_mcRun3_2022cosmics_design_deco_v2',
# GlobalTag for MC production with realistic conditions for Phase1 2022 detector for Heavy Ion
'phase1_2022_realistic_hi' : '125X_mcRun3_2022_realistic_HI_v2',
'phase1_2022_realistic_hi' : '125X_mcRun3_2022_realistic_HI_v3',
# GlobalTag for MC production with realistic conditions for Phase1 2023
'phase1_2023_realistic' : '125X_mcRun3_2023_realistic_v2',
'phase1_2023_realistic' : '125X_mcRun3_2023_realistic_v3',
# GlobalTag for MC production with realistic conditions for Phase1 2024
'phase1_2024_realistic' : '125X_mcRun3_2024_realistic_v2',
'phase1_2024_realistic' : '125X_mcRun3_2024_realistic_v3',
# GlobalTag for MC production with realistic conditions for Phase2
'phase2_realistic' : '125X_mcRun4_realistic_v2'
}
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@
# step1 gensim: for 2018 HI prod
step1Up2018HiProdDefaults = merge ([{'--eventcontent':'RAWSIM'},step1Up2018HiDefaults])
# step1 gensim: for 2021 HI prod
step1Up2021HiProdDefaults = merge ([{'--conditions':'auto:phase1_2022_realistic_hi','--era':'Run3_pp_on_PbPb','--beamspot':'Run3RoundOptics25ns13TeVLowSigmaZ','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018HiDefaults])
step1Up2021HiProdDefaults = merge ([{'--conditions':'auto:phase1_2022_realistic_hi','--era':'Run3_pp_on_PbPb','--beamspot':'Realistic25ns13p6TeVEarly2022Collision','--eventcontent':'RAWSIM','--geometry':'DB:Extended'},step1Up2018HiDefaults])

steps = Steps()

Expand Down
8 changes: 4 additions & 4 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Expand Up @@ -2041,7 +2041,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
'GT' : 'auto:phase1_2022_realistic',
'HLTmenu': '@relval2022',
'Era' : 'Run3',
'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
'2021Design' : {
Expand All @@ -2057,23 +2057,23 @@ def condition(self, fragment, stepList, key, hasHarvest):
'GT' : 'auto:phase1_2023_realistic',
'HLTmenu': '@relval2022',
'Era' : 'Run3',
'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
'2024' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2024_realistic',
'HLTmenu': '@relval2022',
'Era' : 'Run3',
'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
'2021FS' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2022_realistic',
'HLTmenu': '@relval2022',
'Era' : 'Run3_FastSim',
'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'],
},
}
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/CSCRawToDigi/test/testPackingUnpackingPreTriggers_cfg.py
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
process.load('Configuration.StandardSequences.Generator_cff')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.Digi_cff')
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CMSCommonData/test/run3.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
process.load("Configuration.Geometry.GeometryExtended2021_cff")
process.load("Configuration.StandardSequences.MagneticField_cff")
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/test/python/testPhase1_cfg.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HcalCommonData/test/python/testPhase2_cfg.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion Geometry/TrackerCommonData/test/python/run21.py
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
process.load('Geometry.MuonNumbering.muonGeometryConstants_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion Geometry/TrackerCommonData/test/python/run21Zero.py
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
process.load('Geometry.MuonNumbering.muonGeometryConstants_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion Geometry/TrackerCommonData/test/python/run21flat.py
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@
process.load('Geometry.MuonNumbering.muonGeometryConstants_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion Geometry/VeryForwardData/test/testRun3_cfg.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion SimG4CMS/Calo/test/python/dd4hep_SingleMuon_Step1_cfg.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion SimG4CMS/Calo/test/python/ddd_SingleMuon_Step1_cfg.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion SimG4CMS/Calo/test/python/runHF6_cfg.py
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
process.load('Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion SimG4CMS/Calo/test/python/runHFDD4HEP_cfg.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion SimG4CMS/Calo/test/python/runHFDDD_cfg.py
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion SimG4CMS/ShowerLibraryProducer/test/python/runHFShowerAnalyzer_cfg.py
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load('Configuration.StandardSequences.Generator_cff')
process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
#process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
#process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load("Configuration.Geometry.GeometryExtended2021_cff")
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
Expand Down
2 changes: 1 addition & 1 deletion SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step1_cfg.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down
2 changes: 1 addition & 1 deletion SimG4Core/Configuration/test/ddd_ZMM_Run3_Step1_cfg.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
process.load('SimGeneral.MixingModule.mixNoPU_cfi')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load('Configuration.StandardSequences.Generator_cff')
process.load('IOMC.EventVertexGenerators.VtxSmearedRun3RoundOptics25ns13TeVLowSigmaZ_cfi')
process.load('IOMC.EventVertexGenerators.VtxSmearedRealistic25ns13p6TeVEarly2022Collision_cfi')
process.load('GeneratorInterface.Core.genFilterSummary_cff')
process.load('Configuration.StandardSequences.SimIdeal_cff')
process.load('Configuration.StandardSequences.EndOfProcess_cff')
Expand Down