Merge pull request #32886 from fabiocos/fc-fixETLv5

MTD geometry: remove obsolete geometry scenario D73, superseded by D75 and D76
cms-sw · Feb 14, 2021 · b68775c · b68775c
2 parents 5ac285a + 64ecbf2
commit b68775c
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 419 deletions.
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
@@ -93,7 +93,6 @@ Several detector combinations have been generated:
 * D70 = T21+C13+M7+I11+O6+F6
 * D71 = T21+C14+M7+I11+O7+F6
 * D72 = T21+C11+M6+I12+O5+F4
-* D73 = T21+C11+M6+I13+O5+F4
 * D74 = T21+C14+M9+I11+O7+F6
 * D75 = T21+C14+M7+I13+O7+F6
 * D76 = T21+C14+M9+I13+O7+F6

diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D73Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D73Reco_cff.py
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D73_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D73_cff.py
diff --git a/Configuration/Geometry/python/GeometryExtended2026D73Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D73Reco_cff.py
diff --git a/Configuration/Geometry/python/GeometryExtended2026D73_cff.py b/Configuration/Geometry/python/GeometryExtended2026D73_cff.py
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
@@ -1238,11 +1238,10 @@
     ("O6","T21","C13","M7","F6","I11") : "D70",
     ("O7","T21","C14","M7","F6","I11") : "D71",
     ("O5","T21","C11","M6","F4","I12") : "D72",
-    ("O5","T21","C11","M6","F4","I13") : "D73",
     ("O7","T21","C14","M9","F6","I11") : "D74",
     ("O7","T21","C14","M7","F6","I13") : "D75",
     ("O7","T21","C14","M9","F6","I13") : "D76",
  }
 
-deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63" ])
+deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D73" ])
 deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T5", "T6", "T7", "T8", "T9", "T10", "T11", "T12", "T13", "T14", "T16", "T17", "T18", "T19", "T20", "C1", "C2", "C3", "C5", "C7", "M1", "I1", "I2", "I3", "I4", "I6", "I8", "O1", "F1", "C4", "C6", "C8", "M2", "M3", "I5", "I7", "I9", "O2", "O3", "M5" ])
diff --git a/Configuration/PyReleaseValidation/python/relval_2026.py b/Configuration/PyReleaseValidation/python/relval_2026.py
@@ -30,7 +30,6 @@
 numWFIB.extend([32234.0]) #2026D70
 numWFIB.extend([32634.0]) #2026D71
 numWFIB.extend([33034.0]) #2026D72
-numWFIB.extend([33434.0]) #2026D73
 numWFIB.extend([33834.0]) #2026D74
 numWFIB.extend([34234.0]) #2026D75
 numWFIB.extend([34634.0]) #2026D76

diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -50,8 +50,6 @@
     '2026D71PU',
     '2026D72',
     '2026D72PU',
-    '2026D73',
-    '2026D73PU',
     '2026D74',
     '2026D74PU',
     '2026D75',
@@ -67,7 +65,7 @@
 }
 numWFSkip=200
 # temporary measure to keep other WF numbers the same
-numWFConflict = [[20000,23200],[23600,28200],[28600,29800],[50000,51000]]
+numWFConflict = [[20000,23200],[23600,28200],[28600,29800],[33400,33800],[50000,51000]]
 numWFAll={
     2017: [],
     2026: []
@@ -1168,13 +1166,6 @@ def condition(self, fragment, stepList, key, hasHarvest):
         'Era' : 'Phase2C11_etlV4',
         'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
     },
-    '2026D73' : {
-        'Geom' : 'Extended2026D73',
-        'HLTmenu': '@fake2',
-        'GT' : 'auto:phase2_realistic_T21',
-        'Era' : 'Phase2C11_etlV4',
-        'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
-    },
     '2026D74' : {
         'Geom' : 'Extended2026D74',
         'HLTmenu': '@fake2',

diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py
@@ -60,7 +60,6 @@
     'Extended2026D70' : 'Extended2026D70,Extended2026D70Reco',
     'Extended2026D71' : 'Extended2026D71,Extended2026D71Reco',
     'Extended2026D72' : 'Extended2026D72,Extended2026D72Reco',
-    'Extended2026D73' : 'Extended2026D73,Extended2026D73Reco',
     'Extended2026D74' : 'Extended2026D74,Extended2026D74Reco',
     'Extended2026D75' : 'Extended2026D75,Extended2026D75Reco',
     'Extended2026D76' : 'Extended2026D76,Extended2026D76Reco',

diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D73.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D73.xml