[Backport] Fix Run3 Tracker Geometry Reco config, python3 for geometry package, unit test tracker geo

Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus05PercentReco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2021FlatMinus10PercentReco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus05PercentReco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2021FlatPlus10PercentReco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2021Reco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterialReco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2021FlatMinus05PercentReco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2021FlatMinus10PercentReco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2021FlatPlus05PercentReco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2021FlatPlus10PercentReco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2021Reco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/GeometryExtended2021ZeroMaterialReco_cff.py

@@ -12,7 +12,6 @@
 from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *
 from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
 
 # calo
 from Geometry.CaloEventSetup.CaloTopology_cfi import *

Configuration/Geometry/python/dict2021Geometry.py

@@ -350,7 +350,6 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
     },
     "T2" : {
@@ -553,7 +552,6 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
     },
     "T3" : {
@@ -757,7 +755,6 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
     },
     "T4" : {
@@ -961,7 +958,6 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
     },
     "T5" : {
@@ -1166,7 +1162,6 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
     },
     "T6" : {
@@ -1371,7 +1366,6 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
     },
     "T7" : {
@@ -1576,7 +1570,6 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
     },
     "T8" : {
@@ -1781,7 +1774,6 @@
             'from Geometry.TrackerGeometryBuilder.trackerParameters_cff import *',
             'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
             'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
     },
 }

Configuration/Geometry/python/generateGeometry.py

@@ -25,14 +25,15 @@ def __init__(self, scriptName, detectorVersionDefault, detectorPrefix, detectorY
         self.deprecatedDets = deprecatedDets
         self.deprecatedSubdets = deprecatedSubdets
         self.detectorVersionType = detectorVersionType
+        self.detectorVersionNull = self.detectorVersionType(0)
 
     def generateGeom(self, detectorTuple, args):
         detectorVersion = self.detectorPrefix+str(args.detectorVersionManual)
         # reverse dict search if overall D# specified
-        if args.v_detector>0:
+        if args.v_detector!=self.detectorVersionNull:
             detectorVersion = self.detectorPrefix+str(args.v_detector)
             if detectorVersion in self.detectorVersionDict.values():
-                detectorTuple = self.detectorVersionDict.keys()[self.detectorVersionDict.values().index(detectorVersion)]
+                detectorTuple = list(self.detectorVersionDict.keys())[list(self.detectorVersionDict.values()).index(detectorVersion)]
             else:
                 print("Unknown detector "+detectorVersion)
                 sys.exit(1)
@@ -249,7 +250,7 @@ def run(self):
         for aDict in self.allDicts:
             parser.add_argument("-"+aDict["abbrev"], "--"+aDict["name"], dest="v_"+aDict["name"], default=aDict["default"], type=int, help="version for "+aDict["name"])
         parser.add_argument("-V", "--version", dest="detectorVersionManual", default=self.detectorVersionDefault, type=int, help="manual detector version number")
-        parser.add_argument("-D", "--detector", dest="v_detector", default=0, type=self.detectorVersionType, help="version for whole detector, ignored if 0, overrides subdet versions otherwise")
+        parser.add_argument("-D", "--detector", dest="v_detector", default=self.detectorVersionNull, type=self.detectorVersionType, help="version for whole detector, ignored if 0, overrides subdet versions otherwise")
         parser.add_argument("-l", "--list", dest="doList", default=False, action="store_true", help="list known detector versions and exit")
         parser.add_argument("-t", "--test", dest="doTest", default=False, action="store_true", help="enable unit test mode")
         args = parser.parse_args()

Geometry/TrackerGeometryBuilder/test/python/testTrackerHierarchy_cfg.py

@@ -15,6 +15,9 @@
     fromDDD = cms.bool(True)
 )
 
+process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi")
+process.preferFakeAlign = cms.ESPrefer("FakeAlignmentSource")
+
 process.p1 = cms.Path(process.prod)
 
 

Geometry/TrackerGeometryBuilder/test/python/testTracker_cfg.py

@@ -5,6 +5,9 @@
 
 process.source = cms.Source("EmptySource")
 
+process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi")
+process.preferFakeAlign = cms.ESPrefer("FakeAlignmentSource") 
+
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(1)
 )