From ea133ae23ff57425c880c01419794540598a2b50 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Thu, 27 Jan 2022 01:11:36 +0100 Subject: [PATCH] Tune CaloGeometryBuilder for changing CMS configuration - backport #36814 --- .../python/CaloGeometryBuilderPhaseII_cfi.py | 12 +++++++----- .../CaloEventSetup/python/CaloGeometryBuilder_cfi.py | 8 ++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Geometry/CaloEventSetup/python/CaloGeometryBuilderPhaseII_cfi.py b/Geometry/CaloEventSetup/python/CaloGeometryBuilderPhaseII_cfi.py index d927be6ad0eb7..dad1b41d7a17e 100644 --- a/Geometry/CaloEventSetup/python/CaloGeometryBuilderPhaseII_cfi.py +++ b/Geometry/CaloEventSetup/python/CaloGeometryBuilderPhaseII_cfi.py @@ -1,11 +1,13 @@ import FWCore.ParameterSet.Config as cms CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", - SelectedCalos = cms.vstring('HCAL' , - 'ZDC' , - 'CASTOR' , - 'EcalBarrel' , - 'TOWER' ) + SelectedCalos = cms.vstring('HCAL' , + 'ZDC' , + 'EcalBarrel' , + 'TOWER' , + 'HGCalEESensitive' , + 'HGCalHESiliconSensitive' , + 'HGCalHEScintillatorSensitive') ) diff --git a/Geometry/CaloEventSetup/python/CaloGeometryBuilder_cfi.py b/Geometry/CaloEventSetup/python/CaloGeometryBuilder_cfi.py index 251bdcfa169fd..8e7d95b3807c2 100644 --- a/Geometry/CaloEventSetup/python/CaloGeometryBuilder_cfi.py +++ b/Geometry/CaloEventSetup/python/CaloGeometryBuilder_cfi.py @@ -10,4 +10,12 @@ 'TOWER' ) ) +from Configuration.Eras.Modifier_run3_common_cff import run3_common +run3_common.toModify(CaloGeometryBuilder, + SelectedCalos = ['HCAL', 'ZDC', 'EcalBarrel', 'EcalEndcap', 'EcalPreshower', 'TOWER'] +) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toModify(CaloGeometryBuilder, + SelectedCalos = ['HCAL', 'ZDC', 'EcalBarrel', 'TOWER', 'HGCalEESensitive', 'HGCalHESiliconSensitive', 'HGCalHEScintillatorSensitive'] +)