Merge pull request #32776 from bsunanda/Run3-gex51

Run3-gex51 Use the modified tob.xml in Run3 scenario
cms-sw · Feb 4, 2021 · c64a902 · c64a902
2 parents ba877ae + c556b66
commit c64a902
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 59 deletions.
diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -264,7 +264,7 @@
             'Geometry/TrackerCommonData/data/tobrod5l.xml',
             'Geometry/TrackerCommonData/data/tobrod5h.xml',
             'Geometry/TrackerCommonData/data/tobrod5.xml',
-            'Geometry/TrackerCommonData/data/v2/tob.xml',
+            'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
             'Geometry/TrackerCommonData/data/tecmaterial.xml',
             'Geometry/TrackerCommonData/data/tecmodpar.xml',
             'Geometry/TrackerCommonData/data/tecmodule0.xml',
@@ -467,7 +467,7 @@
             'Geometry/TrackerCommonData/data/tobrod5l.xml',
             'Geometry/TrackerCommonData/data/tobrod5h.xml',
             'Geometry/TrackerCommonData/data/tobrod5.xml',
-            'Geometry/TrackerCommonData/data/v2/tob.xml',
+            'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
             'Geometry/TrackerCommonData/data/tecmaterial/2017ZeroMaterial/v1/tecmaterial.xml',
             'Geometry/TrackerCommonData/data/tecmodpar.xml',
             'Geometry/TrackerCommonData/data/tecmodule0.xml',
@@ -669,7 +669,7 @@
             'Geometry/TrackerCommonData/data/tobrod5l.xml',
             'Geometry/TrackerCommonData/data/tobrod5h.xml',
             'Geometry/TrackerCommonData/data/tobrod5.xml',
-            'Geometry/TrackerCommonData/data/v2/tob.xml',
+            'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
             'Geometry/TrackerCommonData/data/tecmaterial/2021/v1/tecmaterial.xml',
             'Geometry/TrackerCommonData/data/tecmodpar.xml',
             'Geometry/TrackerCommonData/data/tecmodule0.xml',
@@ -872,7 +872,7 @@
             'Geometry/TrackerCommonData/data/tobrod5l.xml',
             'Geometry/TrackerCommonData/data/tobrod5h.xml',
             'Geometry/TrackerCommonData/data/tobrod5.xml',
-            'Geometry/TrackerCommonData/data/v2/tob.xml',
+            'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
             'Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/tecmaterial.xml',
             'Geometry/TrackerCommonData/data/tecmodpar.xml',
             'Geometry/TrackerCommonData/data/tecmodule0.xml',
@@ -1077,7 +1077,7 @@
             'Geometry/TrackerCommonData/data/tobrod5l.xml',
             'Geometry/TrackerCommonData/data/tobrod5h.xml',
             'Geometry/TrackerCommonData/data/tobrod5.xml',
-            'Geometry/TrackerCommonData/data/v2/tob.xml',
+            'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
             'Geometry/TrackerCommonData/data/tecmodpar.xml',
             'Geometry/TrackerCommonData/data/tecmodule0.xml',
             'Geometry/TrackerCommonData/data/tecmodule0r.xml',
@@ -1281,7 +1281,7 @@
             'Geometry/TrackerCommonData/data/tobrod5l.xml',
             'Geometry/TrackerCommonData/data/tobrod5h.xml',
             'Geometry/TrackerCommonData/data/tobrod5.xml',
-            'Geometry/TrackerCommonData/data/v2/tob.xml',
+            'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
             'Geometry/TrackerCommonData/data/tecmodpar.xml',
             'Geometry/TrackerCommonData/data/tecmodule0.xml',
             'Geometry/TrackerCommonData/data/tecmodule0r.xml',
@@ -1485,7 +1485,7 @@
             'Geometry/TrackerCommonData/data/tobrod5l.xml',
             'Geometry/TrackerCommonData/data/tobrod5h.xml',
             'Geometry/TrackerCommonData/data/tobrod5.xml',
-            'Geometry/TrackerCommonData/data/v2/tob.xml',
+            'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
             'Geometry/TrackerCommonData/data/tecmodpar.xml',
             'Geometry/TrackerCommonData/data/tecmodule0.xml',
             'Geometry/TrackerCommonData/data/tecmodule0r.xml',
@@ -1689,7 +1689,7 @@
             'Geometry/TrackerCommonData/data/tobrod5l.xml',
             'Geometry/TrackerCommonData/data/tobrod5h.xml',
             'Geometry/TrackerCommonData/data/tobrod5.xml',
-            'Geometry/TrackerCommonData/data/v2/tob.xml',
+            'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
             'Geometry/TrackerCommonData/data/tecmodpar.xml',
             'Geometry/TrackerCommonData/data/tecmodule0.xml',
             'Geometry/TrackerCommonData/data/tecmodule0r.xml',
@@ -1784,15 +1784,15 @@
     "default" : 1,
     "C1" : {
         1 : [
+            'Geometry/EcalCommonData/data/ebcon.xml',
+            'Geometry/EcalCommonData/data/eecon.xml',
+            'Geometry/EcalCommonData/data/escon.xml',
             'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
-            'Geometry/EcalCommonData/data/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',
-            'Geometry/EcalCommonData/data/eecon.xml',
             'Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml',
             'Geometry/EcalCommonData/data/eehier.xml',
             'Geometry/EcalCommonData/data/eealgo.xml',
-            'Geometry/EcalCommonData/data/escon.xml',
             'Geometry/EcalCommonData/data/esalgo.xml',
             'Geometry/EcalCommonData/data/eeF.xml',
             'Geometry/EcalCommonData/data/eeB.xml',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -137,7 +137,7 @@
     <Include ref='Geometry/TrackerCommonData/data/tobrod5l.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5h.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/v2/tob.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tob/v3/tob.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmaterial/2021/v1/tecmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodule0.xml'/>
@@ -212,15 +212,15 @@
     <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eehier.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eealgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/esalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeF.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeB.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
@@ -138,7 +138,7 @@
     <Include ref='Geometry/TrackerCommonData/data/tobrod5l.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5h.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/v2/tob.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tob/v3/tob.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodule0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodule0r.xml'/>
@@ -212,15 +212,15 @@
     <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eehier.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eealgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/esalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeF.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeB.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
@@ -138,7 +138,7 @@
     <Include ref='Geometry/TrackerCommonData/data/tobrod5l.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5h.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/v2/tob.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tob/v3/tob.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodule0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodule0r.xml'/>
@@ -212,15 +212,15 @@
     <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eehier.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eealgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/esalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeF.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeB.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
@@ -138,7 +138,7 @@
     <Include ref='Geometry/TrackerCommonData/data/tobrod5l.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5h.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/v2/tob.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tob/v3/tob.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodule0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodule0r.xml'/>
@@ -212,15 +212,15 @@
     <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eehier.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eealgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/esalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeF.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeB.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
@@ -138,7 +138,7 @@
     <Include ref='Geometry/TrackerCommonData/data/tobrod5l.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5h.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/v2/tob.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tob/v3/tob.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodule0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodule0r.xml'/>
@@ -212,15 +212,15 @@
     <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eehier.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eealgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/esalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeF.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeB.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
@@ -137,7 +137,7 @@
     <Include ref='Geometry/TrackerCommonData/data/tobrod5l.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5h.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobrod5.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/v2/tob.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tob/v3/tob.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/tecmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tecmodule0.xml'/>
@@ -212,15 +212,15 @@
     <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eehier.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eealgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/escon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/esalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeF.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eeB.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
@@ -139,7 +139,7 @@
         'Geometry/TrackerCommonData/data/tobrod5l.xml',
         'Geometry/TrackerCommonData/data/tobrod5h.xml',
         'Geometry/TrackerCommonData/data/tobrod5.xml',
-        'Geometry/TrackerCommonData/data/v2/tob.xml',
+        'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
         'Geometry/TrackerCommonData/data/tecmodpar.xml',
         'Geometry/TrackerCommonData/data/tecmodule0.xml',
         'Geometry/TrackerCommonData/data/tecmodule0r.xml',
@@ -213,15 +213,15 @@
         'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/eecon.xml',
+        'Geometry/EcalCommonData/data/escon.xml',
         'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/EcalCommonData/data/eecon.xml',
         'Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml',
         'Geometry/EcalCommonData/data/eehier.xml',
         'Geometry/EcalCommonData/data/eealgo.xml',
-        'Geometry/EcalCommonData/data/escon.xml',
         'Geometry/EcalCommonData/data/esalgo.xml',
         'Geometry/EcalCommonData/data/eeF.xml',
         'Geometry/EcalCommonData/data/eeB.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
@@ -139,7 +139,7 @@
         'Geometry/TrackerCommonData/data/tobrod5l.xml',
         'Geometry/TrackerCommonData/data/tobrod5h.xml',
         'Geometry/TrackerCommonData/data/tobrod5.xml',
-        'Geometry/TrackerCommonData/data/v2/tob.xml',
+        'Geometry/TrackerCommonData/data/tob/v3/tob.xml',
         'Geometry/TrackerCommonData/data/tecmodpar.xml',
         'Geometry/TrackerCommonData/data/tecmodule0.xml',
         'Geometry/TrackerCommonData/data/tecmodule0r.xml',
@@ -213,15 +213,15 @@
         'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI/v1/trackingMaterialGroups_ForPhaseI.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/eecon.xml',
+        'Geometry/EcalCommonData/data/escon.xml',
         'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/EcalCommonData/data/eecon.xml',
         'Geometry/EcalCommonData/data/eefixed/2021/v1/eefixed.xml',
         'Geometry/EcalCommonData/data/eehier.xml',
         'Geometry/EcalCommonData/data/eealgo.xml',
-        'Geometry/EcalCommonData/data/escon.xml',
         'Geometry/EcalCommonData/data/esalgo.xml',
         'Geometry/EcalCommonData/data/eeF.xml',
         'Geometry/EcalCommonData/data/eeB.xml',