Merge pull request #12908 from ianna/hgcal-v7-configuration

HGCal v7 Configuration
cms-sw · Jan 12, 2016 · 18ed0b2 · 18ed0b2
2 parents c00ad84 + 51b531b
commit 18ed0b2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/Configuration/Geometry/python/GeometryExtended2023DevReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023DevReco_cff.py
@@ -17,6 +17,7 @@
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
 from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
@@ -25,9 +26,8 @@
 trackerGeometry.applyAlignment = cms.bool(False)
 
 #  Calorimeters
-from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
-from Geometry.CaloEventSetup.HGCalTopology_cfi import *
-from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.HGCalV6Topology_cfi import *
+from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import *
 from Geometry.CaloEventSetup.CaloTopology_cfi import *
 from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
 
@@ -50,3 +50,4 @@
 from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
 from Geometry.EcalMapping.EcalMapping_cfi import *
 from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
diff --git a/Configuration/Geometry/python/GeometryExtended2023Dev_cff.py b/Configuration/Geometry/python/GeometryExtended2023Dev_cff.py
@@ -4,5 +4,5 @@
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
-from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import *
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023DevXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023DevXML_cfi.py
@@ -210,18 +210,19 @@
         'Geometry/EcalCommonData/data/PhaseII/escon.xml',
         'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
         'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalalgo.xml',
         'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml',
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalRecNumbering.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalRecNumbering.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcal.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcalHEsci.xml',
-        'Geometry/HGCalCommonData/data/v5/hgcalCons.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcal.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/v7/hgcalCons.xml',
         'Geometry/MuonCommonData/data/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/v1/mb1.xml',
         'Geometry/MuonCommonData/data/v1/mb2.xml',
@@ -258,12 +259,12 @@
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
         'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
         'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalsenspmf.xml',
+        'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsens.xml',
+        'Geometry/HGCalSimData/data/hgcsensv6.xml',
         'Geometry/HGCalSimData/data/hgccons.xml',
         'Geometry/HGCalSimData/data/hgcProdCuts.xml',
         'Geometry/MuonSimData/data/PhaseII/muonSens.xml',