Fix crosstalk in FT - reapply MR 595
Fix crosstalk in FT
See merge request !595 (merged) by @lohenry
(cherry picked from commit 40a923cf)
6755995b Fix the crosstalk loop ff2df815 Fix the other crosstalk loop
Co-authored-by: Zehua Xu zehua.xu@cern.ch