Merged tob-connect56-overlap-fix from repository ianna

cms-sw · Jan 24, 2017 · 38ef649 · 38ef649
2 parents 06c3837 + 3459132
commit 38ef649
Show file tree

Hide file tree

Showing 3 changed files with 1,700 additions and 2 deletions.
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py
@@ -133,7 +133,7 @@
         'Geometry/TrackerCommonData/data/tobrod5l.xml',
         'Geometry/TrackerCommonData/data/tobrod5h.xml',
         'Geometry/TrackerCommonData/data/tobrod5.xml',
-        'Geometry/TrackerCommonData/data/tob.xml',
+        'Geometry/TrackerCommonData/data/v2/tob.xml',
         'Geometry/TrackerCommonData/data/tecmaterial.xml',
         'Geometry/TrackerCommonData/data/tecmodpar.xml',
         'Geometry/TrackerCommonData/data/tecmodule0.xml',
@@ -201,7 +201,7 @@
         'Geometry/TrackerCommonData/data/trackertid.xml',
         'Geometry/TrackerCommonData/data/trackertob.xml',
         'Geometry/TrackerCommonData/data/trackertec.xml',
-        'Geometry/TrackerCommonData/data/trackerbulkhead.xml',
+        'Geometry/TrackerCommonData/data/v2/trackerbulkhead.xml',
         'Geometry/TrackerCommonData/data/trackerother.xml',
         'Geometry/EcalCommonData/data/Run2/eregalgo.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',