From 510d8717b57eb60bc145bff09dfdc2ef434ce520 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 3 Feb 2022 15:21:18 +0100 Subject: [PATCH] interpolate vtrim for eiger --- RELEASE.txt | 1 + slsDetectorSoftware/src/Module.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 3428e7e9e..2b04fe263 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -29,6 +29,7 @@ This document describes the differences between v6.1.0 and v6.0.0. - moench and ctb - can set the starting frame number of next acquisition - mythen server kernel check incompatible (cet timezone) - m3 server crash (vthrehsold) +- allow vtrim to be interpolated for Eiger settings diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 79515b29a..0be33cf3f 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -3320,11 +3320,11 @@ sls_detector_module Module::interpolateTrim(sls_detector_module *a, if (shm()->detType == EIGER) { dacs_to_copy.insert( dacs_to_copy.end(), - {E_SVP, E_VTR, E_SVN, E_VTGSTV, E_RXB_RB, E_RXB_LB, E_VCN, E_VIS}); + {E_SVP, E_SVN, E_VTGSTV, E_RXB_RB, E_RXB_LB, E_VCN, E_VIS}); // interpolate vrf, vcmp, vcp dacs_to_interpolate.insert( dacs_to_interpolate.end(), - {E_VRF, E_VCMP_LL, E_VCMP_LR, E_VCMP_RL, E_VCMP_RR, E_VCP, E_VRS}); + {E_VTR, E_VRF, E_VCMP_LL, E_VCMP_LR, E_VCMP_RL, E_VCMP_RR, E_VCP, E_VRS}); } else { dacs_to_copy.insert(dacs_to_copy.end(), {M_VCASSH, M_VRSHAPER, M_VRSHAPER_N, M_VIPRE_OUT,