Merge pull request #32511 from ghugo83/dd4hep_perf_2

Improve DD4hep workflow perf, step 2: Remove regex from Phase 1 trackerRecoMaterial.xml
cms-sw · Dec 21, 2020 · da19975 · da19975
2 parents 0f97856 + 8b3d69f
commit da19975
Show file tree

Hide file tree

Showing 19 changed files with 2,791 additions and 110 deletions.
diff --git a/Configuration/Geometry/python/dict2021Geometry.py b/Configuration/Geometry/python/dict2021Geometry.py
@@ -335,8 +335,8 @@
             'Geometry/TrackerCommonData/data/trackerother.xml',
             'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-            'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-            'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+            'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+            'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
@@ -538,7 +538,7 @@
             'Geometry/TrackerCommonData/data/trackerother.xml',
             'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-            'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
+            'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
@@ -740,8 +740,8 @@
             'Geometry/TrackerCommonData/data/trackerother.xml',
             'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-            'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-            'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+            'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+            'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
@@ -943,8 +943,8 @@
             'Geometry/TrackerCommonData/data/trackerother.xml',
             'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-            'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-            'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+            'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+            'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
@@ -1147,8 +1147,8 @@
             'Geometry/TrackerCommonData/data/trackerother.xml',
             'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-            'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-            'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+            'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+            'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
@@ -1351,8 +1351,8 @@
             'Geometry/TrackerCommonData/data/trackerother.xml',
             'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-            'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-            'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+            'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+            'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
@@ -1555,8 +1555,8 @@
             'Geometry/TrackerCommonData/data/trackerother.xml',
             'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-            'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-            'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+            'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+            'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
@@ -1759,8 +1759,8 @@
             'Geometry/TrackerCommonData/data/trackerother.xml',
             'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-            'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-            'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+            'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+            'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
             'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
@@ -208,8 +208,8 @@
     <Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
-    <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
+    <Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
+    <Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
@@ -208,8 +208,8 @@
     <Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
-    <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
+    <Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
+    <Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
@@ -208,8 +208,8 @@
     <Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
-    <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
+    <Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
+    <Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
@@ -208,8 +208,8 @@
     <Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
-    <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
+    <Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
+    <Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
@@ -208,8 +208,8 @@
     <Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
-    <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
+    <Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
+    <Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
@@ -208,8 +208,8 @@
     <Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
-    <Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
+    <Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
+    <Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus05PercentXML_cfi.py
@@ -209,8 +209,8 @@
         'Geometry/TrackerCommonData/data/trackerother.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-        'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-        'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+        'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+        'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatMinus10PercentXML_cfi.py
@@ -209,8 +209,8 @@
         'Geometry/TrackerCommonData/data/trackerother.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-        'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-        'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+        'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+        'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus05PercentXML_cfi.py
@@ -209,8 +209,8 @@
         'Geometry/TrackerCommonData/data/trackerother.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-        'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-        'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+        'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+        'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021FlatPlus10PercentXML_cfi.py
@@ -209,8 +209,8 @@
         'Geometry/TrackerCommonData/data/trackerother.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-        'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-        'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+        'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+        'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -209,8 +209,8 @@
         'Geometry/TrackerCommonData/data/trackerother.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-        'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-        'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+        'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+        'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
@@ -209,8 +209,8 @@
         'Geometry/TrackerCommonData/data/trackerother.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
-        'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
-        'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
+        'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
+        'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml',