Add Phase 2 Outer Tracker with sensors updates + OTST MB update. Remove T18.

Configuration/Geometry/README.md

@@ -9,8 +9,8 @@ Tracker:
 * T15: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Active geometry: same as T14. Material Budget: major update in IT, gathering info from recent Mechanical designs.)
 * T16: Active geometry: skewed Inner Tracker geometry. Material Budget: same as T15.
 * T17: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.5) TFPX: Changed sensors spacing within all double-disks + Increased distance between Disks 6 and 7 + Put TBPX portcards between Disks 6 and 7.
-* T18: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.6) TFPX: Shift all double-disks by + 25mm in Z. All services volumes (& TBPX portcards) are also shifted.
 * T19: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v7.0.0) Inner Tracker description with 3D sensors in TBPX L1 + TBPX L2 + TFPX R1.
+* T20: Phase2 tilted tracker (v6.1.6) Outer Tracker: All sensors 200 um -> 290 um + Update in Module MB + PS modules: s-sensor 164 um longer + Major update in OTST MB. Inner Tracker: (v6.1.5) from T17 is called.
 
 Calorimeters:
 * C4: HGCal (v9) + Phase2 HCAL and EB
@@ -52,9 +52,9 @@ Several detector combinations have been generated:
 * D49 = T15+C9+M4+I10+O4+F2
 * D50 = T15+C9+M4+I11+O4+F2
 * D51 = T17+C9+M4+I10+O4+F2
-* D52 = T18+C9+M4+I10+O4+F2
 * D53 = T15+C9+M4+I12+O4+F2
 * D54 = T19+C9+M4+I10+O4+F2
 * D55 = T19+C9+M5+I10+O4+F2
+* D56 = T20+C9+M4+I10+O4+F2
 
 D35 is the MTD TDR baseline, D41 is the L1T TDR baseline, and D49 is the HLT TDR baseline.

Configuration/Geometry/python/GeometryExtended2026D52Reco_cff.py → Configuration/Geometry/python/GeometryExtended2026D56Reco_cff.py

@@ -3,7 +3,7 @@
 # This config was generated automatically using generate2026Geometry.py
 # If you notice a mistake, please update the generating script, not just this config
 
-from Configuration.Geometry.GeometryExtended2026D52_cff import *
+from Configuration.Geometry.GeometryExtended2026D56_cff import *
 
 # tracker
 from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *

Configuration/Geometry/python/GeometryExtended2026D52_cff.py → Configuration/Geometry/python/GeometryExtended2026D56_cff.py

@@ -3,7 +3,7 @@
 # This config was generated automatically using generate2026Geometry.py
 # If you notice a mistake, please update the generating script, not just this config
 
-from Geometry.CMSCommonData.cmsExtendedGeometry2026D52XML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2026D56XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

Configuration/Geometry/python/dict2026Geometry.py

@@ -300,7 +300,7 @@
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
     },
-   "T18" : {
+   "T19" : {
         1 : [
             'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
             'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
@@ -309,16 +309,16 @@
             'Geometry/TrackerCommonData/data/trackermaterial.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker616/pixel.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker700/pixel.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker700/pixelStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
+            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelsens.xml',
+            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker700/trackerRecoMaterial.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
+            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
         "sim" : [
@@ -335,25 +335,25 @@
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
     },
-   "T19" : {
+   "T20" : {
         1 : [
             'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
             'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixfwd.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml',
             'Geometry/TrackerCommonData/data/trackermaterial.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker700/pixel.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/tracker.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker615/pixel.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker700/pixelStructureTopology.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelsens.xml',
-            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker700/trackerRecoMaterial.xml',
+            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
+            'Geometry/TrackerRecoData/data/PhaseII/OuterTracker616_2020_04/trackerRecoMaterial.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelProdCuts.xml',
+            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
         "sim" : [
@@ -1198,11 +1198,11 @@
     ("O4","T15","C9","M4","F2","I10") : "D49",
     ("O4","T15","C9","M4","F2","I11") : "D50",
     ("O4","T17","C9","M4","F2","I10") : "D51",
-    ("O4","T18","C9","M4","F2","I10") : "D52",
     ("O4","T15","C9","M4","F2","I12") : "D53",
     ("O4","T19","C9","M4","F2","I10") : "D54",
     ("O4","T19","C9","M5","F2","I10") : "D55",
+    ("O4","T20","C9","M4","F2","I10") : "D56",
  }
 
-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" ])
-deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T7", "T8", "T9", "T10", "T11", "T12", "T13", "C1", "C2", "C3", "C5", "C7", "M1", "I1", "I2", "I3", "I4", "I6", "I8", "O1", "F1" ])
+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", "D52" ])
+deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T7", "T8", "T9", "T10", "T11", "T12", "T13", "T18", "C1", "C2", "C3", "C5", "C7", "M1", "I1", "I2", "I3", "I4", "I6", "I8", "O1", "F1" ])

Configuration/PyReleaseValidation/python/relval_2026.py

@@ -27,9 +27,9 @@
 numWFIB.extend([22834.0]) #2026D48
 numWFIB.extend([23234.0,23234.1001,23434.1001]) #2026D49, TestOldDigi, TestOldDigi w/ PU
 numWFIB.extend([23634.0]) #2026D51
-numWFIB.extend([24034.0]) #2026D52
 numWFIB.extend([24834.0]) #2026D54
 numWFIB.extend([26234.0]) #2026D55
+numWFIB.extend([26634.0]) #2026D56
 
 for numWF in numWFIB:
     workflows[numWF] = _upgrade_workflows[numWF]

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -47,14 +47,14 @@
     '2026D49PU',
     '2026D51',
     '2026D51PU',
-    '2026D52',
-    '2026D52PU',
     '2026D53',
     '2026D53PU',
     '2026D54',
     '2026D54PU',
     '2026D55',
     '2026D55PU',
+    '2026D56',
+    '2026D56PU',
 ]
 
 # pre-generation of WF numbers
@@ -64,7 +64,7 @@
 }
 numWFSkip=200
 # temporary measure to keep other WF numbers the same
-numWFConflict = [[25000,26000],[50000,51000]]
+numWFConflict = [[24000,24400],[25000,26000],[50000,51000]]
 numWFAll={
     2017: [],
     2026: []
@@ -718,13 +718,6 @@ def workflow_(self, workflows, num, fragment, stepList):
         'Era' : 'Phase2C9',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
-    '2026D52' : {
-        'Geom' : 'Extended2026D52',
-        'HLTmenu': '@fake2',
-        'GT' : 'auto:phase2_realistic_T15',
-        'Era' : 'Phase2C9',
-        'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
-    },
     '2026D53' : {
         'Geom' : 'Extended2026D53',
         'HLTmenu': '@fake2',
@@ -748,6 +741,13 @@ def workflow_(self, workflows, num, fragment, stepList):
         'Era' : 'Phase2C9',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
+    '2026D56' : {
+        'Geom' : 'Extended2026D56',
+        'HLTmenu': '@fake2',
+        'GT' : 'auto:phase2_realistic_T15',
+        'Era' : 'Phase2C9',
+        'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
+    },
 }
 
 # standard PU sequences

Configuration/StandardSequences/python/GeometryConf.py

@@ -40,8 +40,8 @@
     'Extended2026D49' : 'Extended2026D49,Extended2026D49Reco',
     'Extended2026D50' : 'Extended2026D50,Extended2026D50Reco',
     'Extended2026D51' : 'Extended2026D51,Extended2026D51Reco',
-    'Extended2026D52' : 'Extended2026D52,Extended2026D52Reco',
     'Extended2026D53' : 'Extended2026D53,Extended2026D53Reco',
     'Extended2026D54' : 'Extended2026D54,Extended2026D54Reco',
     'Extended2026D55' : 'Extended2026D55,Extended2026D55Reco',
+    'Extended2026D56' : 'Extended2026D56,Extended2026D56Reco',
     }

Geometry/CMSCommonData/python/cmsExtendedGeometry2026D52XML_cfi.py → Geometry/CMSCommonData/python/cmsExtendedGeometry2026D56XML_cfi.py

@@ -26,19 +26,19 @@
         'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/pixbar.xml',
         'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker616/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker615/pixel.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/OuterTracker616_2020_04/trackerRecoMaterial.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',

Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+============= XML GENERATION METADATA HEADER =============
+tkLayout revision: dev-3395-24c2c32 on [email protected]:ghugo83/tkLayout.git
+generated by: Gabrielle (ghugo on pc46.home)
+generation date: 2020-04-30.17:29:07
+note: see OT616_IT615_cmssw_2020_04_30.cfg for full config files
+=========== END XML GENERATION METADATA HEADER ===========
+-->
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+<MaterialSection label="otst.xml">
+<CompositeMaterial name="supportcompositeR1191Z1325" density="3.7448*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.827815">
+<rMaterial name="tracker:tkLayout_CFRP_OTST"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.172185">
+<rMaterial name="tracker:tkLayout_HexWebHRH10_OTST"/>
+</MaterialFraction>
+</CompositeMaterial>
+</MaterialSection>
+<LogicalPartSection label="otst.xml">
+<LogicalPart name="supportR1191Z1325" category="unspecified">
+<rSolid name="otst:supportR1191Z1325"/>
+<rMaterial name="otst:supportcompositeR1191Z1325"/>
+</LogicalPart>
+</LogicalPartSection>
+<SolidSection label="otst.xml">
+<Tubs name="supportR1191Z1325" rMin="1191.5*mm" rMax="1193.5*mm" dz="1325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+</SolidSection>
+<PosPartSection label="otst.xml">
+<PosPart copyNumber="1">
+<rParent name="tracker:Tracker"/>
+<rChild name="otst:supportR1191Z1325"/>
+<Translation x="0*mm" y="0*mm" z="1325*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="tracker:Tracker"/>
+<rChild name="otst:supportR1191Z1325"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-1325*mm"/>
+</PosPart>
+</PosPartSection>
+</DDDefinition>