Tune CaloGeometryBuilder for changing CMS configuration - backport #3…

…6814
cms-sw · Jan 27, 2022 · ea133ae · ea133ae
1 parent d0dc7d9
commit ea133ae
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -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']
+)