From 1a31431eb3b0016cdfb01ca39d3ad0d812b356c7 Mon Sep 17 00:00:00 2001
From: Eric Torrence <eric.torrence@cern.ch>
Date: Wed, 21 Sep 2022 18:56:28 +0200
Subject: [PATCH] Tweaks to CKF parameters, add second non-IFT track collection

---
 .../CalypsoExample/Reconstruction/scripts/faserMDC_reco.py  | 4 ++++
 Control/CalypsoExample/Reconstruction/scripts/faser_reco.py | 4 ++++
 Tracking/Acts/FaserActsKalmanFilter/python/CKF2Config.py    | 6 +++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
index 3d1b2a48..6f5b224e 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
+++ b/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
diff --git a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
index a4b74526..8df24459 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
+++ b/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
diff --git a/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Config.py b/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Config.py
index 07861f8b..1035484b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Config.py
+++ b/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
-- 
GitLab