detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'arping' into eiger_datastream

Browse Source
This commit is contained in:
maliakal_d
2022-02-03 15:26:15 +01:00
parent bc4cf95d0e 26faaa307b
commit bb5782eb92
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE.txt
View File

@ -32,6 +32,7 @@ This document describes the differences between v6.1.0 and v6.0.0.
- rx_threadsids max is now 9 (breaking api) - rx_threadsids max is now 9 (breaking api)
- fixed datastream disabling for eiger. Its only available in 10g mode. - fixed datastream disabling for eiger. Its only available in 10g mode.
- m3 server crash (vthrehsold) - m3 server crash (vthrehsold)
- allow vtrim to be interpolated for Eiger settings
2. Resolved Issues 2. Resolved Issues

4
slsDetectorSoftware/src/Module.cpp
View File

@ -3328,11 +3328,11 @@ sls_detector_module Module::interpolateTrim(sls_detector_module *a,
if (shm()->detType == EIGER) { if (shm()->detType == EIGER) {
dacs_to_copy.insert( dacs_to_copy.insert(
dacs_to_copy.end(), 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 // interpolate vrf, vcmp, vcp
dacs_to_interpolate.insert( dacs_to_interpolate.insert(
dacs_to_interpolate.end(), 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 { } else {
dacs_to_copy.insert(dacs_to_copy.end(), dacs_to_copy.insert(dacs_to_copy.end(),
{M_VCASSH, M_VRSHAPER, M_VRSHAPER_N, M_VIPRE_OUT, {M_VCASSH, M_VRSHAPER, M_VRSHAPER_N, M_VIPRE_OUT,