Merge pull request #22221 from boudoul/killT4

Removing Obsolete Phase2 Tracker (T4) and the corresponding WF (2023D20)

Configuration/Geometry/README.md

@@ -3,7 +3,6 @@ The Phase2 geometries are automatically created using the script [generate2023Ge
 Different versions of various subdetectors can be combined. The available versions are:
 
 Tracker:
-* T4: Phase2 flat tracker (v2016-04-12) w/ phase 2 pixel (v4.0.2.6)
 * T5: Phase2 tilted tracker (v6.1.3) w/ phase 2 pixel (v4.0.2.5) 
 * T6: Phase2 tilted tracker (v6.1.3) w/ phase 2 pixel (v4.0.4) (Inner Tracker barrel has lower radii than TDR T5 geometry)
 
@@ -24,7 +23,6 @@ The script also handles the common and forward elements of the geometry:
 Several detector combinations have been generated:
 * D17 = T5+C3+M2+I1+O2+F2 
 * D19 = T5+C3+M2+I2+O2+F2 
-* D20 = T4+C3+M2+I1+O2+F2 
 * D21 = T6+C3+M2+I1+O2+F2 
 
 Currently, D17 is considered to be the baseline for the Phase 2 Muon and Barrel TDRs.

Configuration/Geometry/python/dict2023Geometry.py

@@ -37,41 +37,6 @@
     "abbrev" : "T",
     "name" : "tracker",
     "default" : 5,
-    "T4" : {
-        1 : [
-	    'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-            'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixfwd.xml', 
-            'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixbar.xml', 
-            'Geometry/TrackerCommonData/data/trackermaterial.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/tracker.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixel.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/trackerbar.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/trackerfwd.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/trackerStructureTopology.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/FlatTracker/pixelStructureTopology.xml',
-            'Geometry/TrackerSimData/data/PhaseII/FlatTracker/trackersens.xml',
-            'Geometry/TrackerSimData/data/PhaseII/FlatTracker/pixelsens.xml',
-            'Geometry/TrackerRecoData/data/PhaseII/FlatTracker/trackerRecoMaterial.xml',
-            'Geometry/TrackerSimData/data/PhaseII/FlatTracker/trackerProdCuts.xml',
-            'Geometry/TrackerSimData/data/PhaseII/FlatTracker/pixelProdCuts.xml',
-            'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-
-        ],
-        "sim" : [
-            'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
-            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkFlat_cff import *',
-        ],
-        "reco" : [
-            'from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *',
-            'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *',
-            'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
-        ],
-        "era" : "phase2_tracker, trackingPhase2PU140",
-    },
     "T5" : {
         1 : [
             'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
@@ -334,9 +299,8 @@
 detectorVersionDict = {
     ("O2","T5","C3","M2","F2","I1") : "D17",
     ("O2","T5","C3","M2","F2","I2") : "D19",
-    ("O2","T4","C3","M2","F2","I1") : "D20",
     ("O2","T6","C3","M2","F2","I1") : "D21",
 }
 
-deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D18" ])
-deprecatedSubdets = set([ "T1", "T2" ,"T3", "C1", "C2", "M1", "O1", "F1" ])
+deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D18","D20" ])
+deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "C1", "C2", "M1", "O1", "F1" ])

Configuration/PyReleaseValidation/python/relval_2023.py

@@ -15,7 +15,6 @@
 #2023 WFs to run in IB (TTbar, TTbar+Timing)
 numWFIB = [20034.0,20034.1,20034.11] #2023D17 w/ special tracking and timing workflows
 numWFIB.extend([20434.0]) #2023D19 (already has timing)
-numWFIB.extend([20834.0,20834.11]) #2023D20
 numWFIB.extend([21234.0,21234.11]) #2023D21  
 for numWF in numWFIB:
     workflows[numWF] = _upgrade_workflows[numWF]

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -2230,7 +2230,6 @@ def gen2018HiMix(fragment,howMuch):
 #defaultDataSets['2019Design']=''
 defaultDataSets['2023D17']=''
 defaultDataSets['2023D19']=''
-defaultDataSets['2023D20']=''
 defaultDataSets['2023D21']=''
 
 keys=defaultDataSets.keys()

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -24,8 +24,6 @@
     '2023D17PU',
     '2023D19',
     '2023D19PU',
-    '2023D20',
-    '2023D20PU',
     '2023D21',
     '2023D21PU',
 ]
@@ -37,7 +35,7 @@
 }
 numWFSkip=200
 # temporary measure to keep other WF numbers the same
-numWFConflict = [[11800,12000],[12200,12400],[25000,26000],[50000,51000]]
+numWFConflict = [[11800,12000],[12200,12400],[20800,21200],[25000,26000],[50000,51000]]
 numWFAll={
     2017: [],
     2023: []
@@ -242,13 +240,6 @@
         'Era' : 'Phase2_timing_layer',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
-    '2023D20' : {
-        'Geom' : 'Extended2023D20',
-        'GT' : 'auto:phase2_realistic',
-        'HLTmenu': '@fake2',
-        'Era' : 'Phase2',
-        'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFull','RecoFullGlobal','HARVESTFullGlobal'],
-    },
     '2023D21' : {
         'Geom' : 'Extended2023D21',
         'HLTmenu': '@fake2',
@@ -265,8 +256,6 @@
 upgradeProperties[2023]['2023D17PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 upgradeProperties[2023]['2023D19PU'] = deepcopy(upgradeProperties[2023]['2023D19'])
 upgradeProperties[2023]['2023D19PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
-upgradeProperties[2023]['2023D20PU'] = deepcopy(upgradeProperties[2023]['2023D20'])
-upgradeProperties[2023]['2023D20PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 upgradeProperties[2023]['2023D21PU'] = deepcopy(upgradeProperties[2023]['2023D21'])
 upgradeProperties[2023]['2023D21PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 

Configuration/StandardSequences/python/GeometryConf.py

@@ -30,6 +30,5 @@
     'HCal'        : 'Configuration.Geometry.GeometrySimHCAL_cff,Configuration.Geometry.GeometryRecoHCAL_cff',
     'Extended2023D17' : 'Extended2023D17,Extended2023D17Reco',
     'Extended2023D19' : 'Extended2023D19,Extended2023D19Reco',
-    'Extended2023D20' : 'Extended2023D20,Extended2023D20Reco',
     'Extended2023D21' : 'Extended2023D21,Extended2023D21Reco',
     }

DetectorDescription/RegressionTest/test/run_DOMCount.sh

@@ -34,7 +34,6 @@ cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometry2017XML_cfi"
 cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometry2019XML_cfi"
 cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometry2023D17XML_cfi"
 cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometry2023D19XML_cfi"
-cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometry2023D20XML_cfi"
 cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometryGFlashXML_cfi"
 cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometryHFLibraryNoCastorXML_cfi"
 cfiFiles="${cfiFiles} Geometry/CMSCommonData/cmsExtendedGeometryHFLibraryXML_cfi"

Fireworks/Geometry/python/dumpRecoGeometry_cfg.py

@@ -3,7 +3,7 @@
 import FWCore.ParameterSet.VarParsing as VarParsing
 from FWCore.Utilities.Enumerate import Enumerate
 
-varType = Enumerate ("Run1 2015 2017 2019 2023D17 2023D19 2023D20 MaPSA")
+varType = Enumerate ("Run1 2015 2017 2019 2023D17 2023D19 MaPSA")
 
 def help():
    print "Usage: cmsRun dumpFWRecoGeometry_cfg.py  tag=TAG "