Merge pull request #16143 from ianna/2017-totem

Update TOTEM in 2017 scenarios
cms-sw · Oct 26, 2016 · 2095290 · 2095290
2 parents ff3bc38 + 7a8e6c5
commit 2095290
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_NewFPix_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_NewFPix_cfi.py
@@ -239,10 +239,10 @@
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm.xml',
-        'Geometry/ForwardCommonData/data/totemMaterials.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemMaterials.xml',
         'Geometry/ForwardCommonData/data/totemRotations.xml',
-        'Geometry/ForwardCommonData/data/totemt1.xml',
-        'Geometry/ForwardCommonData/data/totemt2.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemt1.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemt2.xml',
         'Geometry/ForwardCommonData/data/ionpump.xml',
         'Geometry/ForwardCommonData/data/Run2/castor.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py
@@ -239,10 +239,10 @@
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm.xml',
-        'Geometry/ForwardCommonData/data/totemMaterials.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemMaterials.xml',
         'Geometry/ForwardCommonData/data/totemRotations.xml',
-        'Geometry/ForwardCommonData/data/totemt1.xml',
-        'Geometry/ForwardCommonData/data/totemt2.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemt1.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemt2.xml',
         'Geometry/ForwardCommonData/data/ionpump.xml',
         'Geometry/ForwardCommonData/data/Run2/castor.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017devXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017devXML_cfi.py
@@ -240,10 +240,10 @@
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm.xml',
-        'Geometry/ForwardCommonData/data/totemMaterials.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemMaterials.xml',
         'Geometry/ForwardCommonData/data/totemRotations.xml',
-        'Geometry/ForwardCommonData/data/totemt1.xml',
-        'Geometry/ForwardCommonData/data/totemt2.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemt1.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemt2.xml',
         'Geometry/ForwardCommonData/data/ionpump.xml',
         'Geometry/ForwardCommonData/data/Run2/castor.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017newXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017newXML_cfi.py
@@ -240,10 +240,10 @@
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm.xml',
-        'Geometry/ForwardCommonData/data/totemMaterials.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemMaterials.xml',
         'Geometry/ForwardCommonData/data/totemRotations.xml',
-        'Geometry/ForwardCommonData/data/totemt1.xml',
-        'Geometry/ForwardCommonData/data/totemt2.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemt1.xml',
+        'Geometry/ForwardCommonData/data/Run2/totemt2.xml',
         'Geometry/ForwardCommonData/data/ionpump.xml',
         'Geometry/ForwardCommonData/data/Run2/castor.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',