From 926448dbf6c2826eccf179cf3db96614fe2a3f21 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Tue, 27 Jul 2021 04:42:59 -0400 Subject: [PATCH 01/11] ensure no GEN-to-SIM vertex smearing for ClonseByParticleGun workflows --- Configuration/PyReleaseValidation/python/relval_upgrade.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index d25ad0787661b..7f82b77ba4520 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -31,8 +31,11 @@ def makeStepName(key,frag,step,suffix): for step in upgradeProperties[year][key]['ScenToRun']: stepMaker = makeStepName if 'Sim' in step: - if 'HLBeamSpot' in step and '14TeV' in frag: - step = 'GenSimHLBeamSpot14' + if 'HLBeamSpot' in step: + if '14TeV' in frag: + step = 'GenSimHLBeamSpot14' + if 'CloseByParticle' in frag or 'CE_E' in frag or 'CE_H' in frag: + step = 'GenSimHLBeamSpot14HGCALCloseBy' stepMaker = makeStepNameSim if 'HARVEST' in step: hasHarvest = True From be102cfb74605707cf0e68b73f34fb22e8dfb9d1 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Tue, 27 Jul 2021 04:53:23 -0400 Subject: [PATCH 02/11] ensure no GEN-to-SIM vertex smearing for ClonseByParticleGun workflows --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index d883afcf94f94..a4d3637735c28 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -157,6 +157,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'GenSim', 'GenSimHLBeamSpot', 'GenSimHLBeamSpot14', + 'GenSimHLBeamSpot14CloseBy', 'Digi', 'DigiTrigger', 'RecoLocal', From 58cd7b1efc1546d33bd2a50838ab3603a32a25d1 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Tue, 27 Jul 2021 06:23:53 -0400 Subject: [PATCH 03/11] ensure no GEN-to-SIM vertex smearing for CloseByParticleGun workflows --- Configuration/PyReleaseValidation/python/relval_steps.py | 9 +++++++++ .../python/upgradeWorkflowComponents.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 8783dc88aab5f..ecc16ce4de420 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3355,6 +3355,15 @@ def gen2021HiMix(fragment,howMuch): '--geometry' : geom } + upgradeStepDict['GenSimHLBeamSpot14HGCALCloseBy'][k]= {'-s' : 'GEN,SIM', + '-n' : 10, + '--conditions' : gt, + '--beamspot' : 'HLLHC14TeVHGCALCloseBy', + '--datatier' : 'GEN-SIM', + '--eventcontent': 'FEVTDEBUG', + '--geometry' : geom + } + upgradeStepDict['Digi'][k] = {'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:%s'%(hltversion), '--conditions':gt, '--datatier':'GEN-SIM-DIGI-RAW', diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index a4d3637735c28..0497268e92e0e 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -157,7 +157,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'GenSim', 'GenSimHLBeamSpot', 'GenSimHLBeamSpot14', - 'GenSimHLBeamSpot14CloseBy', + 'GenSimHLBeamSpot14HGCALCloseBy', 'Digi', 'DigiTrigger', 'RecoLocal', From c75c734050b606bff7e463b0a1d323d4d6b4ab20 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Tue, 27 Jul 2021 06:28:11 -0400 Subject: [PATCH 04/11] ensure no GEN-to-SIM vertex smearing for CloseByParticleGun workflows --- .../python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py new file mode 100644 index 0000000000000..a56395b31941f --- /dev/null +++ b/IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py @@ -0,0 +1,11 @@ +import FWCore.ParameterSet.Config as cms + +from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import * +HLLHCVtxSmearingParameters14TeV = HLLHCVtxSmearingParameters.clone( EprotonInGeV = cms.double(7000) ) +VtxSmeared = cms.EDProducer("HLLHCEvtVtxGenerator", + HLLHCVtxSmearingParameters14TeV, + VtxSmearedCommon +) +VtxSmeared.SigmaZ = cms.double(0) + + From e49a7a4b80e7600f1f53745de87f7219357ce643 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Tue, 27 Jul 2021 06:32:28 -0400 Subject: [PATCH 05/11] ensure no GEN-to-SIM vertex smearing for CloseByParticleGun workflows --- .../python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py index a56395b31941f..57fdcf93893c6 100644 --- a/IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py +++ b/IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py @@ -7,5 +7,3 @@ VtxSmearedCommon ) VtxSmeared.SigmaZ = cms.double(0) - - From 91680eba3592d7f8fe936b12ac5454ae6fac3b08 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Tue, 27 Jul 2021 06:45:34 -0400 Subject: [PATCH 06/11] ensure no GEN-to-SIM vertex smearing for CloseByParticleGun workflows --- Configuration/PyReleaseValidation/python/relval_steps.py | 2 +- Configuration/PyReleaseValidation/python/relval_upgrade.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index ecc16ce4de420..4c60670e107a1 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3358,7 +3358,7 @@ def gen2021HiMix(fragment,howMuch): upgradeStepDict['GenSimHLBeamSpot14HGCALCloseBy'][k]= {'-s' : 'GEN,SIM', '-n' : 10, '--conditions' : gt, - '--beamspot' : 'HLLHC14TeVHGCALCloseBy', + '--beamspot' : 'HGCALCloseBy', '--datatier' : 'GEN-SIM', '--eventcontent': 'FEVTDEBUG', '--geometry' : geom diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index 7f82b77ba4520..8e56b4c1eecb7 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -34,7 +34,7 @@ def makeStepName(key,frag,step,suffix): if 'HLBeamSpot' in step: if '14TeV' in frag: step = 'GenSimHLBeamSpot14' - if 'CloseByParticle' in frag or 'CE_E' in frag or 'CE_H' in frag: + if 'CloseByParticle' in frag: step = 'GenSimHLBeamSpot14HGCALCloseBy' stepMaker = makeStepNameSim From 926717d0bb02c5216745f33d3835ca3c4da818cc Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Tue, 27 Jul 2021 06:48:29 -0400 Subject: [PATCH 07/11] ensure no GEN-to-SIM vertex smearing for CloseByParticleGun workflows --- ...4TeVHGCALCloseBy_cfi.py => VtxSmearedHGCALCloseBy_cfi.py} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename IOMC/EventVertexGenerators/python/{VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py => VtxSmearedHGCALCloseBy_cfi.py} (60%) diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedHGCALCloseBy_cfi.py similarity index 60% rename from IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py rename to IOMC/EventVertexGenerators/python/VtxSmearedHGCALCloseBy_cfi.py index 57fdcf93893c6..edbe32cbfc126 100644 --- a/IOMC/EventVertexGenerators/python/VtxSmearedHLLHC14TeVHGCALCloseBy_cfi.py +++ b/IOMC/EventVertexGenerators/python/VtxSmearedHGCALCloseBy_cfi.py @@ -1,9 +1,10 @@ import FWCore.ParameterSet.Config as cms from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import * -HLLHCVtxSmearingParameters14TeV = HLLHCVtxSmearingParameters.clone( EprotonInGeV = cms.double(7000) ) VtxSmeared = cms.EDProducer("HLLHCEvtVtxGenerator", - HLLHCVtxSmearingParameters14TeV, + GaussVtxSmearingParameters, VtxSmearedCommon ) +VtxSmeared.SigmaX = cms.double(0) +VtxSmeared.SigmaY = cms.double(0) VtxSmeared.SigmaZ = cms.double(0) From e7da8e21f4f12aa1d0f6068c693ac7e85ab2e752 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Tue, 27 Jul 2021 07:56:58 -0400 Subject: [PATCH 08/11] ensure no GEN-to-SIM vertex smearing for CloseByParticleGun workflows --- IOMC/EventVertexGenerators/python/VtxSmearedHGCALCloseBy_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedHGCALCloseBy_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedHGCALCloseBy_cfi.py index edbe32cbfc126..a4029b1877f96 100644 --- a/IOMC/EventVertexGenerators/python/VtxSmearedHGCALCloseBy_cfi.py +++ b/IOMC/EventVertexGenerators/python/VtxSmearedHGCALCloseBy_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import * -VtxSmeared = cms.EDProducer("HLLHCEvtVtxGenerator", +VtxSmeared = cms.EDProducer("GaussEvtVtxGenerator", GaussVtxSmearingParameters, VtxSmearedCommon ) From 21741fd4aa8d95135a74a7c259c1a83e34ed79c2 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Tue, 27 Jul 2021 08:15:10 -0400 Subject: [PATCH 09/11] ensure no GEN-to-SIM vertex smearing for CloseByParticleGun workflows --- Configuration/StandardSequences/python/VtxSmeared.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Configuration/StandardSequences/python/VtxSmeared.py b/Configuration/StandardSequences/python/VtxSmeared.py index a5d1677bfb55e..7e1747948cf79 100644 --- a/Configuration/StandardSequences/python/VtxSmeared.py +++ b/Configuration/StandardSequences/python/VtxSmeared.py @@ -37,6 +37,7 @@ 'RealisticPbPBoost5TeV2016Collision': 'GeneratorInterface.HiGenCommon.VtxSmearedPbP5TeVBoost_cff', 'RealisticPPbBoost8TeV2016Collision': 'GeneratorInterface.HiGenCommon.VtxSmearedPPb8TeVBoost_cff', 'RealisticPbPBoost8TeV2016Collision': 'GeneratorInterface.HiGenCommon.VtxSmearedPbP8TeVBoost_cff', + 'HGCALCloseBy' : 'IOMC.EventVertexGenerators.VtxSmearedHGCALCloseBy_cfi', 'HLLHC' : 'IOMC.EventVertexGenerators.VtxSmearedHLLHC_cfi', 'HLLHC14TeV' : 'IOMC.EventVertexGenerators.VtxSmearedHLLHC14TeV_cfi', 'HLLHC_CK' : 'IOMC.EventVertexGenerators.VtxSmearedHLLHCCrabKissing_cfi', From 986c7ad646601ddc258375807c9dab12b9ff99b3 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Thu, 29 Jul 2021 05:40:22 -0400 Subject: [PATCH 10/11] Adding CE_H and CE_E bc CloseByP is used there as well --- Configuration/PyReleaseValidation/python/relval_upgrade.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index 8e56b4c1eecb7..4f4f93dd9d1ed 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -34,8 +34,8 @@ def makeStepName(key,frag,step,suffix): if 'HLBeamSpot' in step: if '14TeV' in frag: step = 'GenSimHLBeamSpot14' - if 'CloseByParticle' in frag: - step = 'GenSimHLBeamSpot14HGCALCloseBy' + if 'CloseByParticle' in frag or 'CE_E' in frag or 'CE_H' in frag: + step = 'GenSimHLBeamSpot14HGCALCloseBy' stepMaker = makeStepNameSim if 'HARVEST' in step: hasHarvest = True From 13f972bfcec41aa250042b32441a5f043066d157 Mon Sep 17 00:00:00 2001 From: Benedikt Maier Date: Mon, 2 Aug 2021 09:32:00 -0400 Subject: [PATCH 11/11] removing 14 tev label --- Configuration/PyReleaseValidation/python/relval_steps.py | 2 +- Configuration/PyReleaseValidation/python/relval_upgrade.py | 2 +- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 4c60670e107a1..5e99431babe4d 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -3355,7 +3355,7 @@ def gen2021HiMix(fragment,howMuch): '--geometry' : geom } - upgradeStepDict['GenSimHLBeamSpot14HGCALCloseBy'][k]= {'-s' : 'GEN,SIM', + upgradeStepDict['GenSimHLBeamSpotHGCALCloseBy'][k]= {'-s' : 'GEN,SIM', '-n' : 10, '--conditions' : gt, '--beamspot' : 'HGCALCloseBy', diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py index 4f4f93dd9d1ed..574bb2cff83a9 100644 --- a/Configuration/PyReleaseValidation/python/relval_upgrade.py +++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py @@ -35,7 +35,7 @@ def makeStepName(key,frag,step,suffix): if '14TeV' in frag: step = 'GenSimHLBeamSpot14' if 'CloseByParticle' in frag or 'CE_E' in frag or 'CE_H' in frag: - step = 'GenSimHLBeamSpot14HGCALCloseBy' + step = 'GenSimHLBeamSpotHGCALCloseBy' stepMaker = makeStepNameSim if 'HARVEST' in step: hasHarvest = True diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 0497268e92e0e..08631a3568c92 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -157,7 +157,7 @@ def condition(self, fragment, stepList, key, hasHarvest): 'GenSim', 'GenSimHLBeamSpot', 'GenSimHLBeamSpot14', - 'GenSimHLBeamSpot14HGCALCloseBy', + 'GenSimHLBeamSpotHGCALCloseBy', 'Digi', 'DigiTrigger', 'RecoLocal',