Merge pull request #36663 from bsunanda/Run3-gex110X

Run3-gex110X Take care of Carl's comment for PR #36648
cms-sw · Jan 11, 2022 · d7e255e · d7e255e
2 parents 5f0565f + a60aaf2
commit d7e255e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Geometry/ForwardCommonData/data/dd4hep/testForwardGeometry.xml b/Geometry/ForwardCommonData/data/dd4hep/testForwardGeometry.xml
@@ -29,7 +29,7 @@
     <Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
     <Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
     <Include ref="Geometry/TrackerCommonData/data/pixfwdCommon.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/pixfwd.xml"/>
+    <Include ref="Geometry/ForwardCommonData/data/pixfwd/2021/v1/pixfwd.xml"/>
     <Include ref="Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml"/>
     <Include ref="Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml"/>
     <Include ref="Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml"/>

diff --git a/Geometry/ForwardCommonData/data/pixfwd.xml → ...CommonData/data/pixfwd/2021/v1/pixfwd.xml b/Geometry/ForwardCommonData/data/pixfwd.xml → ...CommonData/data/pixfwd/2021/v1/pixfwd.xml
diff --git a/Geometry/ForwardCommonData/python/testForwardXML_cfi.py b/Geometry/ForwardCommonData/python/testForwardXML_cfi.py
@@ -10,7 +10,7 @@
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/ForwardCommonData/data/pixfwd.xml',
+        'Geometry/ForwardCommonData/data/pixfwd/2021/v1/pixfwd.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
         'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
         'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml',