Two TOF acqiris sources for >= 4 channels, TOF-related fixes to CXI saving