Merge pull request #35290 from bsunanda/Run3-gex93A

Run3-gex93A Modify the run3 scenarios with the modified material xml files
cms-sw · Sep 17, 2021 · fad898f · fad898f
2 parents 443c56f + a565857
commit fad898f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 1,112 deletions.
diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -146,7 +146,7 @@
     "O6" : {
         1 : [
             'Geometry/CMSCommonData/data/materials/2021/v3/materials.xml',
-            'Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml',
+            'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
             'Geometry/CMSCommonData/data/rotations.xml',
             'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml',
             'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
@@ -613,8 +613,8 @@
             'Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml',
             'Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml',
             'Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml',
-            'Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v1/tibtidcommonmaterial.xml',
-            'Geometry/TrackerCommonData/data/tibmaterial/2021/v1/tibmaterial.xml',
+            'Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v2/tibtidcommonmaterial.xml',
+            'Geometry/TrackerCommonData/data/tibmaterial/2021/v2/tibmaterial.xml',
             'Geometry/TrackerCommonData/data/tibmodpar.xml',
             'Geometry/TrackerCommonData/data/tibmodule0.xml',
             'Geometry/TrackerCommonData/data/tibmodule0a.xml',
@@ -647,7 +647,7 @@
             'Geometry/TrackerCommonData/data/tiblayer2.xml',
             'Geometry/TrackerCommonData/data/tiblayer3.xml',
             'Geometry/TrackerCommonData/data/tib.xml',
-            'Geometry/TrackerCommonData/data/tidmaterial/2021/v1/tidmaterial.xml',
+            'Geometry/TrackerCommonData/data/tidmaterial/2021/v2/tidmaterial.xml',
             'Geometry/TrackerCommonData/data/tidmodpar.xml',
             'Geometry/TrackerCommonData/data/tidmodule0.xml',
             'Geometry/TrackerCommonData/data/tidmodule0r.xml',
@@ -670,7 +670,7 @@
             'Geometry/TrackerCommonData/data/tibtidservices.xml',
             'Geometry/TrackerCommonData/data/tibtidservicesf.xml',
             'Geometry/TrackerCommonData/data/tibtidservicesb.xml',
-            'Geometry/TrackerCommonData/data/tobmaterial/2021/v1/tobmaterial.xml',
+            'Geometry/TrackerCommonData/data/tobmaterial/2021/v2/tobmaterial.xml',
             'Geometry/TrackerCommonData/data/tobmodpar.xml',
             'Geometry/TrackerCommonData/data/tobmodule0.xml',
             'Geometry/TrackerCommonData/data/tobmodule2.xml',

diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -978,7 +978,7 @@
         1 : [
             'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
             'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+            'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
             'Geometry/EcalCommonData/data/ebalgo.xml',
             'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
             'Geometry/EcalCommonData/data/ebrot.xml',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -5,7 +5,7 @@
 
   <IncludeSection>
     <Include ref='Geometry/CMSCommonData/data/materials/2021/v3/materials.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v3/cmsextent.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
@@ -53,8 +53,8 @@
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v1/tibtidcommonmaterial.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/tibmaterial/2021/v1/tibmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v2/tibtidcommonmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tibmaterial/2021/v2/tibmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tibmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tibmodule0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tibmodule0a.xml'/>
@@ -87,7 +87,7 @@
     <Include ref='Geometry/TrackerCommonData/data/tiblayer2.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tiblayer3.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tib.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/tidmaterial/2021/v1/tidmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tidmaterial/2021/v2/tidmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tidmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tidmodule0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tidmodule0r.xml'/>
@@ -110,7 +110,7 @@
     <Include ref='Geometry/TrackerCommonData/data/tibtidservices.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tibtidservicesf.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tibtidservicesb.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/tobmaterial/2021/v1/tobmaterial.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/tobmaterial/2021/v2/tobmaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobmodpar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobmodule0.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/tobmodule2.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D86.xml
@@ -44,7 +44,7 @@
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml'/>
+    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -6,7 +6,7 @@
 XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
     geomXMLFiles = cms.vstring(
         'Geometry/CMSCommonData/data/materials/2021/v3/materials.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial/2021/v2/trackermaterial.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/v3/cmsextent.xml',
         'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
@@ -54,8 +54,8 @@
         'Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml',
         'Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml',
         'Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml',
-        'Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v1/tibtidcommonmaterial.xml',
-        'Geometry/TrackerCommonData/data/tibmaterial/2021/v1/tibmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v2/tibtidcommonmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibmaterial/2021/v2/tibmaterial.xml',
         'Geometry/TrackerCommonData/data/tibmodpar.xml',
         'Geometry/TrackerCommonData/data/tibmodule0.xml',
         'Geometry/TrackerCommonData/data/tibmodule0a.xml',
@@ -88,7 +88,7 @@
         'Geometry/TrackerCommonData/data/tiblayer2.xml',
         'Geometry/TrackerCommonData/data/tiblayer3.xml',
         'Geometry/TrackerCommonData/data/tib.xml',
-        'Geometry/TrackerCommonData/data/tidmaterial/2021/v1/tidmaterial.xml',
+        'Geometry/TrackerCommonData/data/tidmaterial/2021/v2/tidmaterial.xml',
         'Geometry/TrackerCommonData/data/tidmodpar.xml',
         'Geometry/TrackerCommonData/data/tidmodule0.xml',
         'Geometry/TrackerCommonData/data/tidmodule0r.xml',
@@ -111,7 +111,7 @@
         'Geometry/TrackerCommonData/data/tibtidservices.xml',
         'Geometry/TrackerCommonData/data/tibtidservicesf.xml',
         'Geometry/TrackerCommonData/data/tibtidservicesb.xml',
-        'Geometry/TrackerCommonData/data/tobmaterial/2021/v1/tobmaterial.xml',
+        'Geometry/TrackerCommonData/data/tobmaterial/2021/v2/tobmaterial.xml',
         'Geometry/TrackerCommonData/data/tobmodpar.xml',
         'Geometry/TrackerCommonData/data/tobmodule0.xml',
         'Geometry/TrackerCommonData/data/tobmodule2.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D86XML_cfi.py
@@ -45,7 +45,7 @@
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
         'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',