Apply Tracker Alignment to phase2 geometries

Configuration/AlCa/python/autoCondPhase2.py

@@ -1,13 +1,16 @@
 from Configuration.StandardSequences.CondDBESSource_cff import GlobalTag as essource
 connectionString = essource.connect.value()
 
-SiPixelLARecord           =   "SiPixelLorentzAngleRcd"                  
-SiPixelSimLARecord        =   "SiPixelLorentzAngleSimRcd"   
-SiPixelGenErrorRecord     =   "SiPixelGenErrorDBObjectRcd"       
-SiPixelTemplatesRecord    =   "SiPixelTemplateDBObjectRcd"       
-SiPixel2DTemplatesRecord  =   "SiPixel2DTemplateDBObjectRcd"     
+SiPixelLARecord           =   "SiPixelLorentzAngleRcd"            
+SiPixelSimLARecord        =   "SiPixelLorentzAngleSimRcd"
+SiPixelGenErrorRecord     =   "SiPixelGenErrorDBObjectRcd"
+SiPixelTemplatesRecord    =   "SiPixelTemplateDBObjectRcd"
+SiPixel2DTemplatesRecord  =   "SiPixel2DTemplateDBObjectRcd"
 TrackerLARecord           =   "SiPhase2OuterTrackerLorentzAngleRcd"
 TrackerSimLARecord        =   "SiPhase2OuterTrackerLorentzAngleSimRcd"
+TkAlRecord                =   "TrackerAlignmentRcd"
+TkAPERecord               =   "TrackerAlignmentErrorExtendedRcd"
+TkSurfRecord              =   "TrackerSurfaceDeformationRcd"
 
 ##
 ## Active geometries: https://github.com/cms-sw/cmssw/blob/master/Configuration/Geometry/README.md
@@ -56,6 +59,24 @@
     'T30' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v6.4.0_25x100_v1_mc',SiPixelTemplatesRecord,connectionString, "", "2021-11-22 21:00:00"] ), ),  # cell is 25um (local-x) x 100um (local-y) , VBias=350V
 }
 
+allTags["TkAlignment"] = {
+    'T21' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T21_design_v0' ,TkAlRecord, connectionString, "", "2023-03-16 15:30:00"] ), ),
+    'T25' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T25_design_v0' ,TkAlRecord, connectionString, "", "2023-03-16 15:30:00"] ), ),
+    'T30' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T30_design_v0' ,TkAlRecord, connectionString, "", "2023-03-16 15:30:00"] ), ),
+}
+
+allTags["TkAPE"] = {
+    'T21' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T21_design_v0' ,TkAPERecord, connectionString, "", "2023-03-16 15:30:00"] ), ),
+    'T25' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T25_design_v0' ,TkAPERecord, connectionString, "", "2023-03-16 15:30:00"] ), ),
+    'T30' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T30_design_v0' ,TkAPERecord, connectionString, "", "2023-03-16 15:30:00"] ), ),
+}
+
+allTags["TkSurf"] = {
+    'T21' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-03-16 15:30:00"] ), ),
+    'T25' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-03-16 15:30:00"] ), ),
+    'T30' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-03-16 15:30:00"] ), ),
+}
+
 ##
 ## Outer Tracker records (to be filled if necessary)
 ##
@@ -87,7 +108,7 @@
 '''
 
 # list of active tags to be replaced
-activeKeys = ["LA","LAWidth","SimLA","LAfromAlignment","GenError","Template"]#,"SimOTLA","OTLA"]
+activeKeys = ["LA", "LAWidth", "SimLA", "LAfromAlignment", "GenError", "Template", "TkAlignment", "TkAPE", "TkSurf"] #,"SimOTLA","OTLA"]
 
 # list of geometries supported
 activeDets = ["T21","T25","T30"]

Configuration/Geometry/python/GeometryDD4hepExtended2026D86Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2026D88Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2026D91Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2026D92Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2026D93Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2026D94Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2026D95Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2026D96Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2026D97Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2026D98Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2026D99Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D86Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D88Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D91Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D92Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D93Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D94Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D95Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D96Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D97Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D98Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2026D99Reco_cff.py

@@ -11,7 +11,7 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = False
+trackerGeometry.applyAlignment = True
 
 # calo
 from Geometry.CaloEventSetup.HGCalTopology_cfi import *

Configuration/Geometry/python/dict2026Geometry.py

@@ -132,7 +132,7 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = False',
+            'trackerGeometry.applyAlignment = True',
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
     },
@@ -168,7 +168,7 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = False',
+            'trackerGeometry.applyAlignment = True',
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
     },
@@ -203,7 +203,7 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = False',
+            'trackerGeometry.applyAlignment = True',
         ],
         "era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140",
     },
@@ -273,7 +273,7 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = False',
+            'trackerGeometry.applyAlignment = True',
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
     }, 
@@ -309,7 +309,7 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = False',
+            'trackerGeometry.applyAlignment = True',
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
     },
@@ -345,7 +345,7 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = False',
+            'trackerGeometry.applyAlignment = True',
         ],
         "era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140",
     }