Pixel track conf for UPC

Making Pixel tracks configuration consistent with RUN2, for UPC at TrackingPassFlags.py:

• Changing EnableHI flags by PrimaryPassConfig.HeavyIon
• allowing maxPrimaryImpact to by 10 mm if doMinBias

tagging HI conveners @angerami @mrybar @qhu for UPC @mdyndal, expert @tstreble

Tracking/TrkConfig/python/TrackingPassFlags.py

@@ -5,6 +5,7 @@ from __future__ import print_function
 import AthenaCommon.SystemOfUnits as Units
 from AthenaConfiguration.Enums import BeamType
 from AthenaConfiguration.Enums import LHCPeriod
+from TrkConfig.TrkConfigFlags import PrimaryPassConfig
 
 
 def select( selInd, valuesmap ):
@@ -961,12 +962,17 @@ def createPixelTrackingPassFlags():
         if pcf.Beam.Type is BeamType.Cosmics:
             return 0.5 * Units.GeV
         if pcf.Reco.EnableHI:
-            return 0.1 * Units.GeV
-        if pcf.Tracking.doMinBias:
-            if pcf.Tracking.doHIP300:
-                return 0.3 * Units.GeV
-            else:
+            if pcf.Tracking.doUPC:
                 return 0.05 * Units.GeV
+            elif pcf.Tracking.doMinBias: #for HIP (doHIP soon)
+                if pcf.Tracking.doHIP300:
+                    return 0.3 * Units.GeV
+                else:
+                    return 0.05 * Units.GeV
+            else: #standard Heavy Ion
+                return 0.1 * Units.GeV
+        if pcf.Tracking.doMinBias:
+            return 0.05 * Units.GeV
         return 0.1 * Units.GeV
     
     icf.minPT            = _minPt
@@ -974,7 +980,7 @@ def createPixelTrackingPassFlags():
 
     def _pick( default, hion, cosmics):
         def _internal( pcf ):
-            if pcf.Reco.EnableHI:
+            if pcf.Tracking.PrimaryPassConfig is (PrimaryPassConfig.HeavyIon):
                 return hion
             if pcf.Beam.Type is BeamType.Cosmics:
                 return cosmics
@@ -992,7 +998,8 @@ def createPixelTrackingPassFlags():
     icf.useSCT           = False
     icf.useTRT           = False
     icf.minSecondaryPt   = 3 * Units.GeV
-    icf.maxPrimaryImpact = lambda pcf: 1000. * Units.mm if pcf.Beam.Type is BeamType.Cosmics \
+    icf.maxPrimaryImpact = lambda pcf: 1000. * Units.mm if pcf.Beam.Type is (BeamType.Cosmics) \
+                           else 10. * Units.mm if pcf.Tracking.doUPC \
                            else 5. * Units.mm
     icf.roadWidth        = lambda pcf: 60.0 if pcf.Beam.Type is BeamType.Cosmics \
                            else 12.0