Merge pull request #33424 from bsunanda/Run3-gex67

Run3-gex67 Modify Run3 workflows with changed version of RP devices
cms-sw · Apr 16, 2021 · df1b846 · df1b846
2 parents 8e42dc0 + df99358
commit df1b846
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 30 deletions.
diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -1994,8 +1994,8 @@
             'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
             'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
             'Geometry/VeryForwardData/data/RP_Device.xml',
-            'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
-            'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+            'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml',
+            'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml',
             'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml',
             'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml',
             'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml',
@@ -2097,8 +2097,8 @@
             'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
             'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
             'Geometry/VeryForwardData/data/RP_Device.xml',
-            'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
-            'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+            'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml',
+            'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml',
             'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station.xml',
             'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station.xml',
             'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station.xml',
@@ -2200,8 +2200,8 @@
             'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
             'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
             'Geometry/VeryForwardData/data/RP_Device.xml',
-            'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
-            'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+            'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml',
+            'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml',
             'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
             'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
             'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -313,8 +313,8 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
@@ -313,8 +313,8 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
@@ -313,8 +313,8 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
@@ -313,8 +313,8 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
@@ -313,8 +313,8 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
@@ -313,8 +313,8 @@
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml'/>
     <Include ref='Geometry/VeryForwardData/data/RP_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device.xml'/>
-    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml'/>
+    <Include ref='Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml'/>
     <Include ref='Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
@@ -316,8 +316,8 @@
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
         'Geometry/VeryForwardData/data/RP_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
@@ -316,8 +316,8 @@
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
         'Geometry/VeryForwardData/data/RP_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
@@ -316,8 +316,8 @@
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
         'Geometry/VeryForwardData/data/RP_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
@@ -316,8 +316,8 @@
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
         'Geometry/VeryForwardData/data/RP_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -316,8 +316,8 @@
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
         'Geometry/VeryForwardData/data/RP_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
@@ -316,8 +316,8 @@
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
         'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
         'Geometry/VeryForwardData/data/RP_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
-        'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/v1/RP_Vertical_Device.xml',
+        'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/v1/RP_Horizontal_Device.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Right_Station/v1/CTPPS_220_Right_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_220_Left_Station/v1/CTPPS_220_Left_Station.xml',
         'Geometry/VeryForwardData/data/CTPPS_2018/CTPPS_210_Right_Station/v1/CTPPS_210_Right_Station.xml',