Activate IBL special charge calibration (ATLASSIM-5035)

InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py

@@ -47,7 +47,7 @@ def PixelConfigCondAlgCfg(flags, name="PixelConfigCondAlg", **kwargs):
             BunchSpace=25.0,
             FEI4BarrelHitDiscConfig=[2],
             ChargeScaleFEI4=1.0,
-            UseFEI4SpecialScalingFunction=False
+            UseFEI4SpecialScalingFunction=True
         )
         #====================================================================================
         # Run-dependent SIMULATION(digitization) parameters:

InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h

@@ -655,7 +655,7 @@ class PixelConfigCondAlg : public AthReentrantAlgorithm {
     {this, "ChargeScaleFEI4", 1.0, "Scaling of the FEI4 charge"};
 
     Gaudi::Property<bool> m_UseFEI4SpecialScalingFunction
-    {this, "UseFEI4SpecialScalingFunction", false, "Use FEI4 special scaling function"};
+    {this, "UseFEI4SpecialScalingFunction", true, "Use FEI4 special scaling function"};
 
     // Charge calibration parameters
     Gaudi::Property<float> m_CalibrationParameterA

InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py

@@ -184,7 +184,7 @@ def PixelConfigCondAlg_MC():
     alg.FEI4BarrelHitDiscConfig=[2]
 
     alg.ChargeScaleFEI4=1.0
-    alg.UseFEI4SpecialScalingFunction=False
+    alg.UseFEI4SpecialScalingFunction=True
 
     #====================================================================================
     # Run-dependent SIMULATION(digitization) parameters:

Tools/PROCTools/data/master_q221_AOD_digest.ref

@@ -2,19 +2,19 @@
       284500    87473001         122         129           4           1           8           2           6           7           4           3
       284500    87473014          83          79           6           0          10           1           9           7           5           2
       284500    87473022          38          30           4           0           4           2           2           4           3           1
-      284500    87473032          30          33           4           1          10           4           6           5           2           3
-      284500    87473037          62          39           7           0          13           2          11           5           3           2
+      284500    87473032          30          33           4           1          10           4           6           6           3           3
+      284500    87473037          62          40           7           0          13           2          11           5           3           2
       284500    87473040         107          93          10           1          17           1          16          11           6           5
       284500    87473051         140         111          11           1          16           1          15          23          16           7
       284500    87473063          62          76           5           2           7           1           6           6           4           2
       284500    87473068          25          33           1           1           0           0           0           0           0           0
       284500    87473075          60          87           6           0           5           0           5           6           5           1
-      284500    87473084          78          87           7           2          14           1          13           9           3           6
+      284500    87473084          78          86           7           2          14           1          13           9           3           6
       284500    87473091          41          49           3           0           4           2           2           4           2           2
       284500    87473096          66          75           3           2           3           0           3           4           3           1
       284500    87473104          64          63           6           0           6           2           4           4           3           1
-      284500    87473114          89          80           7           2          12           1          11           9           6           3
-      284500    87473121          93         100           6           3          15           4          11           8           6           2
+      284500    87473114          89          79           7           2          12           1          11           9           6           3
+      284500    87473121          93         100           6           3          15           3          12           8           6           2
       284500    87473132          84          56           9           1          12           0          12           3           3           0
       284500    87473137          94          71           8           3          15           0          15           9           9           0
       284500    87473144          78          66           7           1           8           2           6           8           6           2

Tools/PROCTools/python/RunTier0TestsTools.py

@@ -31,10 +31,10 @@ ciRefFileMap = {
                 # OverlayTier0Test_required-test
                 'overlay-d1498-21.0'   : 'v2',
                 'overlay-d1498-22.0'   : 'v38',
-                'overlay-d1592-22.0'   : 'v6',
+                'overlay-d1592-22.0'   : 'v7',
                 'overlay-bkg-21.0'     : 'v1',
                 'overlay-bkg-22.0'     : 'v4',
-                'dataoverlay-d1590-22.0' : 'v8',
+                'dataoverlay-d1590-22.0' : 'v9',
                 'dataoverlay-hits-22.0'  : 'v1',
                }