Merge pull request #18586 from bsunanda/Run2-hcx126

Run2-hcx126 Reorder the xml files for HCAL to conform to the new idea
cms-sw · May 13, 2017 · 68456cf · 68456cf
2 parents 0ead9a0 + b031378
commit 68456cf
Show file tree

Hide file tree

Showing 154 changed files with 541 additions and 809 deletions.
diff --git a/Configuration/Geometry/python/dict2023Geometry.py b/Configuration/Geometry/python/dict2023Geometry.py
@@ -188,19 +188,19 @@
             'Geometry/EcalCommonData/data/eeB.xml',
             'Geometry/EcalCommonData/data/ectkcable.xml',
             'Geometry/HcalCommonData/data/hcalrotations.xml',
-            'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
+            'Geometry/HcalCommonData/data/hcal/PhaseII/hcalalgo.xml',
             'Geometry/HcalCommonData/data/hcalcablealgo.xml',
             'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-            'Geometry/HcalCommonData/data/PhaseII/hcalendcapalgo.xml',
+            'Geometry/HcalCommonData/data/hcalendcap/PhaseII/hcalendcapalgo.xml',
             'Geometry/HcalCommonData/data/hcalouteralgo.xml',
             'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/Run2/hcalSimNumbering16a.xml',
-            'Geometry/HcalCommonData/data/Run2/hcalRecNumbering16a.xml',
+            'Geometry/HcalCommonData/data/hcalSimNumbering/2016a/hcalSimNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalRecNumbering/2016a/hcalRecNumbering.xml',
             'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         ],
         3 : [
             'Geometry/EcalSimData/data/ecalsens.xml',
-            'Geometry/HcalCommonData/data/Phase0/hcalsenspmf.xml',
+            'Geometry/HcalCommonData/data/hcalsenspmf.xml',
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
@@ -248,13 +248,13 @@
             'Geometry/EcalCommonData/data/PhaseII/escon.xml',
             'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
             'Geometry/HcalCommonData/data/hcalrotations.xml',
-            'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalalgo.xml',
+            'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml',
             'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-            'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalendcapalgo.xml',
+            'Geometry/HcalCommonData/data/hcalendcap/HGCal/hcalendcapalgo.xml',
             'Geometry/HcalCommonData/data/hcalouteralgo.xml',
             'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
-            'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuild.xml',
+            'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml',
             'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v7/hgcal.xml',
             'Geometry/HGCalCommonData/data/hgcalEE/v7/hgcalEE.xml',
@@ -264,7 +264,7 @@
         ],
         3 : [
             'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-            'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalsenspmf.xml',
+            'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml',
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',
@@ -320,13 +320,13 @@
             'Geometry/EcalCommonData/data/PhaseII/escon.xml',
             'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
             'Geometry/HcalCommonData/data/hcalrotations.xml',
-            'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalalgo.xml',
+            'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml',
             'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-            'Geometry/HcalCommonData/data/PhaseII/SSAbsorber/hcalendcapalgo.xml',
+            'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml',
             'Geometry/HcalCommonData/data/hcalouteralgo.xml',
             'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/PhaseII/hcalSimNumbering.xml',
-            'Geometry/HcalCommonData/data/PhaseII/hcalRecNumberingRebuild.xml',
+            'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml',
+            'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml',
             'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
             'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml',
             'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml',
@@ -336,7 +336,7 @@
         ],
         3 : [
             'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-            'Geometry/HcalCommonData/data/PhaseII/HGCal/hcalsenspmf.xml',
+            'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml',
             'Geometry/HcalSimData/data/hf.xml',
             'Geometry/HcalSimData/data/hfpmt.xml',
             'Geometry/HcalSimData/data/hffibrebundle.xml',

diff --git a/Geometry/CMSCommonData/python/cmsAllGeometryXML_cfi.py b/Geometry/CMSCommonData/python/cmsAllGeometryXML_cfi.py
@@ -217,8 +217,8 @@
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardfibre.xml',
         'Geometry/HcalCommonData/data/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1.xml',
         'Geometry/MuonCommonData/data/mb2.xml',
@@ -240,7 +240,7 @@
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
         'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/plt.xml',   
+#        'Geometry/ForwardCommonData/data/plt.xml',   
         'Geometry/ForwardCommonData/data/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml',
@@ -254,7 +254,7 @@
         'Geometry/TrackerSimData/data/trackersens.xml',
         'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsens/Run1/hcalsens.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
         'Geometry/HcalSimData/data/hf.xml', 
         'Geometry/HcalSimData/data/hffibre.xml', 

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorMeasuredXML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystMinusXML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015CastorSystPlusXML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus05PercentXML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Run2/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2015/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatMinus10PercentXML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Run2/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2015/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus05PercentXML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Run2/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2015/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015FlatPlus10PercentXML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Run2/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2015/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015MuonGEMDevXML_cfi.py
@@ -8,6 +8,7 @@
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/cmsextent.xml',
         # 'Geometry/CMSCommonData/data/cms.xml',            # Phase-1 Muon
+        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
         'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml',      # Phase-2 Muon
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',      # Phase-2 Muon
         'Geometry/CMSCommonData/data/cmsMother.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015PilotXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015PilotXML_cfi.py
@@ -217,8 +217,8 @@
         'Geometry/HcalCommonData/data/hcalendcapalgo.xml',
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/MuonCommonData/data/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC2Gap_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC2Gap_cfi.py
@@ -218,8 +218,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/RPC2Gap/mbCommon.xml',
         'Geometry/MuonCommonData/data/RPC2Gap/mb1.xml',
         'Geometry/MuonCommonData/data/RPC2Gap/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC4RE11_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_RPC4RE11_cfi.py
@@ -218,8 +218,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1.xml',
         'Geometry/MuonCommonData/data/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015XML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Run2/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2015/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorMeasuredXML_cfi.py
@@ -220,8 +220,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystMinusXML_cfi.py
@@ -220,8 +220,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devCastorSystPlusXML_cfi.py
@@ -220,8 +220,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015devXML_cfi.py
@@ -220,8 +220,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Run2/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2015/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2015/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2016XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2016XML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Run2/hcalSimNumbering16.xml', 
-        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering16.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2016/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2016/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
@@ -258,7 +258,7 @@
         'Geometry/TrackerSimData/data/trackersens.xml',
         'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalsenspmf.xml',
+        'Geometry/HcalCommonData/data/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2016aXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2016aXML_cfi.py
@@ -219,8 +219,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/Run2/hcalSimNumbering16a.xml', 
-        'Geometry/HcalCommonData/data/Run2/hcalRecNumbering16a.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2016a/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2016a/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2015/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
@@ -258,7 +258,7 @@
         'Geometry/TrackerSimData/data/trackersens.xml',
         'Geometry/TrackerRecoData/data/trackerRecoMaterial.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
-        'Geometry/HcalCommonData/data/Phase0/hcalsenspmf.xml',
+        'Geometry/HcalCommonData/data/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',