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

[12_4_X] Update Run3 MC GTs + swap update Vertex smearing + update offline Run3 GTs #39019

Merged
merged 6 commits into from Dec 3, 2022
Merged

[12_4_X] Update Run3 MC GTs + swap update Vertex smearing + update offline Run3 GTs #39019

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
162debd
swap Run3RoundOptics25ns13TeVLowSigmaZ with Realistic25ns13p6TeVEarly…
francescobrivio Aug 9, 2022
e8767dc
update BeamSpot in realistic Run 3 MC GTs and DMD tag in Express GT
francescobrivio Aug 10, 2022
c1d5757
Update Run3 MC and offline data GTs
francescobrivio Oct 22, 2022
b9be0bc
fix snapshot of run3_data_relval GT to be identical to run3_data GT
francescobrivio Oct 23, 2022
9c91e65
Update JEC AK4PFPuppi tag in Run3 offline and offline_relval GTs
francescobrivio Nov 1, 2022
fcb9b1b
Add MC GT for 2022 postEE leak
francescobrivio Nov 18, 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
18 changes: 10 additions & 8 deletions Configuration/AlCa/python/autoCond.py
View file
Open in desktop
Expand Up @@ -41,10 +41,10 @@
'run3_data_express' : '124X_dataRun3_Express_frozen_v6',
# GlobalTag for Run3 data relvals (prompt GT) - identical to 124X_dataRun3_Prompt_v5 but with snapshot at 2022-10-04 14:19:51 (UTC)
'run3_data_prompt' : '124X_dataRun3_Prompt_frozen_v5',
# GlobalTag for Run3 offline data reprocessing - snapshot at 2022-07-12 23:00:00 (UTC)
'run3_data' : '124X_dataRun3_v9',
# GlobalTag for Run3 offline data reprocessing - snapshot at 2022-11-01 12:00:00 (UTC)
'run3_data' : '124X_dataRun3_v11',
# GlobalTag for Run3 data relvals: allows customization to run with fixed L1 menu
'run3_data_relval' : '124X_dataRun3_relval_v8',
'run3_data_relval' : '124X_dataRun3_relval_v11',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot)
'phase1_2017_design' : '123X_mc2017_design_v2',
# GlobalTag for MC production with realistic conditions for Phase1 2017 detector
Expand All @@ -70,17 +70,19 @@
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2022
'phase1_2022_design' : '124X_mcRun3_2022_design_v7',
# GlobalTag for MC production with realistic conditions for Phase1 2022
'phase1_2022_realistic' : '124X_mcRun3_2022_realistic_v10',
'phase1_2022_realistic' : '124X_mcRun3_2022_realistic_v12',
# GlobalTag for MC production with realistic conditions for Phase1 2022 post-EE+ leak
'phase1_2022_realistic_postEE' : '124X_mcRun3_2022_realistic_postEE_v1',
# GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2022, Strip tracker in DECO mode
'phase1_2022_cosmics' : '124X_mcRun3_2022cosmics_realistic_deco_v11',
'phase1_2022_cosmics' : '124X_mcRun3_2022cosmics_realistic_deco_v13',
# GlobalTag for MC production (cosmics) with perfectly aligned and calibrated detector for Phase1 2022, Strip tracker in DECO mode
'phase1_2022_cosmics_design' : '124X_mcRun3_2022cosmics_design_deco_v7',
# GlobalTag for MC production with realistic conditions for Phase1 2022 detector for Heavy Ion
'phase1_2022_realistic_hi' : '124X_mcRun3_2022_realistic_HI_v10',
'phase1_2022_realistic_hi' : '124X_mcRun3_2022_realistic_HI_v12',
# GlobalTag for MC production with realistic conditions for Phase1 2023
'phase1_2023_realistic' : '124X_mcRun3_2023_realistic_v11',
'phase1_2023_realistic' : '124X_mcRun3_2023_realistic_v13',
# GlobalTag for MC production with realistic conditions for Phase1 2024
'phase1_2024_realistic' : '124X_mcRun3_2024_realistic_v11',
'phase1_2024_realistic' : '124X_mcRun3_2024_realistic_v13',
# GlobalTag for MC production with realistic conditions for Phase2
'phase2_realistic' : '124X_mcRun4_realistic_v8'
}
Expand Down
2 changes: 1 addition & 1 deletion Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Expand Up @@ -34,7 +34,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])
Copy link
Contributor

Choose a reason for hiding this comment

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

@cms-sw/alca-l2

I'm having trouble understanding why this change is needed (and two other ones below).

After this PR, the MC GTs for 2022_hi, 2023, and 2024 [1] still use the 'old' beamspot tags, i.e. Run3RoundOptics25ns13TeVLowSigmaZ (iiuc, this is because the PU samples of the corresponding RelVals were produced with the 'old' beamspot). At the same time, this PR changes the beamspot parameters used in the GEN-SIM step of those workflows to the 'new' one, i.e. Realistic25ns13p6TeVEarly2022Collision.

Taking wf 12434.0 as an example (pp 2023, no PU), step-1 is now as in [2], and this plot from the PR tests looks odd.

Am I missing something?

[1]

[2]

cmsDriver.py TTbar_14TeV_TuneCP5_cfi  -s GEN,SIM -n 10 \
 --conditions auto:phase1_2023_realistic --beamspot Realistic25ns13p6TeVEarly2022Collision \
 --datatier GEN-SIM --eventcontent FEVTDEBUG --geometry DB:Extended --era Run3 --relval 9000,100

Copy link
Contributor

@mmusich mmusich Dec 5, 2022 •
edited

Choose a reason for hiding this comment

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

This looks like a mistake.
In the master version of this PR: #38760 the >= 2022 scenarios got updated because the corresponding PR updating the PU libraries has changed the later Run-3 years as well (see #39041) but in this case this is not appropriate.
I suggest this bug-fix PR #40238 to resolve the issue.
Alternatively we'd need updates to GlobalTags as well as PU libraries.


steps = Steps()

Expand Down
6 changes: 3 additions & 3 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Expand Up @@ -1986,7 +1986,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 @@ -2002,15 +2002,15 @@ def condition(self, fragment, stepList, key, hasHarvest):
'GT' : 'auto:phase1_2023_realistic',
'HLTmenu': '@relval2022',
'Era' : 'Run3',
'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
Copy link
Contributor

Choose a reason for hiding this comment

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

See first comment.

'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
'2024' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2024_realistic',
'HLTmenu': '@relval2022',
'Era' : 'Run3',
'BeamSpot': 'Run3RoundOptics25ns13TeVLowSigmaZ',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
Copy link
Contributor

Choose a reason for hiding this comment

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

See first comment.

'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
}
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