Merge branch 'torrence-noisystrips' into 'master'

CKF update

See merge request !274

Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py

@@ -179,6 +179,10 @@ acc.merge(GhostBustersCfg(ConfigFlags))
 from FaserActsKalmanFilter.CKF2Config import CKF2Cfg
 acc.merge(CKF2Cfg(ConfigFlags, noDiagnostics=True))
 
+# Add tracking collection with no IFT 
+acc.merge(CKF2Cfg(ConfigFlags, maskedLayers=[0, 1, 2], name="CKF_woIFT", 
+                  OutputCollection="CKFTrackCollectionWithoutIFT", noDiagnostics=True))
+
 #
 # Configure output
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py

@@ -213,6 +213,10 @@ if useCKF:
     from FaserActsKalmanFilter.CKF2Config import CKF2Cfg
     acc.merge(CKF2Cfg(ConfigFlags, noDiagnostics=True))
 
+    # Add tracking collection with no IFT 
+    acc.merge(CKF2Cfg(ConfigFlags, maskedLayers=[0, 1, 2], name="CKF_woIFT", 
+                      OutputCollection="CKFTrackCollectionWithoutIFT", noDiagnostics=True))
+
 #
 # Configure output
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg

Tracking/Acts/FaserActsKalmanFilter/python/CKF2Config.py

@@ -101,7 +101,11 @@ def CKF2Cfg(flags, **kwargs):
     ckf.PerformanceWriter = False
 
     ckf.nMax = 10
-    ckf.chi2Max = 25
+    # Use larger chi2 cut until alignment improves
+    # ckf.chi2Max = 25
+    ckf.chi2Max = 100000
+    # Protect against running out of memory on busy events
+    ckf.maxSteps = 5000
     acc.addEventAlgo(ckf)
     # acc.merge(CKF2_OutputCfg(flags))
     return acc