Merge pull request #9832 from ianna/hcal-specpars-in-all-scenarios

Hcal SpecPars in All Scenarios
cms-sw · Jun 26, 2015 · 2f125eb · 2f125eb
2 parents e56b6ac + 05f64b0
commit 2f125eb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015XML_cfi.py
@@ -217,6 +217,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/MuonCommonData/data/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/v1/mb1.xml',
         'Geometry/MuonCommonData/data/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometry2015devXML_cfi.py
@@ -217,6 +217,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/MuonCommonData/data/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/v1/mb1.xml',
         'Geometry/MuonCommonData/data/v1/mb2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsIdealGeometryXML_cfi.py b/Geometry/CMSCommonData/python/cmsIdealGeometryXML_cfi.py
@@ -213,7 +213,9 @@
         'Geometry/HcalCommonData/data/hcalendcapalgo.xml', 
         'Geometry/HcalCommonData/data/hcalouteralgo.xml', 
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 
-        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', 
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml',
         'Geometry/MuonCommonData/data/mbCommon.xml', 
         'Geometry/MuonCommonData/data/mb1.xml', 
         'Geometry/MuonCommonData/data/mb2.xml', 
@@ -229,7 +231,7 @@
         'Geometry/ForwardCommonData/data/totemRotations.xml', 
         'Geometry/ForwardCommonData/data/totemt1.xml',
         'Geometry/ForwardCommonData/data/totemt2.xml', 
-        'Geometry/ForwardCommonData/data/ionpump.xml', 
+        'Geometry/ForwardCommonData/data/ionpump.xml')+cms.vstring(
         'Geometry/MuonCommonData/data/muonNumbering.xml', 
         'Geometry/TrackerCommonData/data/trackerStructureTopology.xml', 
         'Geometry/TrackerSimData/data/trackersens.xml',