Propagate changes from master branch to cmsExtendedGeometry for D80/81

forthommel · Mar 18, 2021 · 15c94cd · 15c94cd
1 parent ebf48b5
commit 15c94cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D80XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D80XML_cfi.py
@@ -53,7 +53,7 @@
         'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
         'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
         'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
         'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
@@ -105,7 +105,7 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv9.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D81XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D81XML_cfi.py
@@ -53,7 +53,7 @@
         'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
         'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
         'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
         'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
@@ -105,7 +105,7 @@
         'Geometry/HcalSimData/data/hf.xml',
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil/2026/v2/CaloUtil.xml',
+        'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml',
         'Geometry/HGCalSimData/data/hgcsensv9.xml',
         'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',