diff --git a/RELEASE.txt b/RELEASE.txt index 542a214aa..27cd5cec7 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -22,52 +22,47 @@ This document describes the differences between v6.0.0 and v5.1.0. Client ------ + 1. Shared libraries + They are versioned from this release on. - 1. [Jungfrau] Chip version + 2. [Jungfrau] Chip version Features for chipv1.1 incorporated Command line: chipversion, API: getchipVersion gets chip version (1.0 or 1.1) chipv1.1 requires config_jungfrau.txt on detector server. - 2. [Jungfrau] Chip configuration (only chipv1.1) + 3. [Jungfrau] Chip configuration (only chipv1.1) powering on the chip and changing settings will configure the chip. Hence, required before acquisition. - 3. [Jungfrau] Settings and Gain mode + 4. [Jungfrau] Settings and Gain mode Settings can be gain0 and highgain0. Gain mode can be dynamicgain, forceswitchg1, forceswitchg2, fixg1, fixg2, fixg0. fixg0 must be used with EXTRA caution as you can damage the detector. Changing settings also changes dac values of 3 dacs () and reconfigures chip (only v1.1) - 4. [Jungfrau] Storage cells (only chipv1.1) + 5. [Jungfrau] Storage cells (only chipv1.1) Additional number of storage cells not applicable for chipv1.1. Storage cell start is only allowed from 0 - 3 for chipv1.1 (0 - 15 for chipv1.0). - 5. [Gotthard2][Jungfrau] Filter Resistor + 6. [Gotthard2][Jungfrau] Filter Resistor Command line: filterresistor, API: getFilterResistor/ setFilterResistor Previous Command: filter, setFilter/ getFilter Set Filter resistor. Increasing values for increasing resistance. [Jungfrau] only for chipv1.1. Options: [0|1]. Default is 1. [Gotthard2] Options: [0|1|2|3]. Default is 0. - 6. [Jungfrau] Filter cell (only chipv1.1) + 7. [Jungfrau] Filter cell (only chipv1.1) Command line: filtercell, API: getFilterCell/ setFilterCell Set filter cell. Options: [0-12]. Advanced user command. - 7. [Jungfrau] Comparator disable time (only chipv1.1) + 8. [Jungfrau] Comparator disable time (only chipv1.1) Command line: comp_disable_time, API: getComparatorDisableTime/ setComparatorDisableTime One can customize the period to disable comparator. - 8. [Eiger][Jungfrau] Flip rows - Command line: fliprows, API: getFlipRows/ setFlipRows - Previous command: flippeddatax, setBottom/ getBottom - [Jungfrau] Flips rows in detector only for HW v2.0. - slsReceiver and slsDetectorGui will not flip them again. - [Eiger] same as before. - 9. [Eiger][Jungfrau] Read n rows Command line: readnrows, API: getReadNRows/ setReadNRows Previous Command: readnlines, getPartialReadout/ setPartialReadout @@ -172,6 +167,12 @@ This document describes the differences between v6.0.0 and v5.1.0. [Eiger][Jungfrau] same as before. [Gotthard2] New command to set readout speed. Options: 108, 144 (in MHz) + 27. [Eiger][Jungfrau] Flip rows + Command line: fliprows, API: getFlipRows/ setFlipRows + Previous command: flippeddatax, setBottom/ getBottom + [Jungfrau] Flips rows in detector only for HW v2.0. + slsReceiver and slsDetectorGui will not flip them again. + [Eiger] same as before. Detector servers ---------------- @@ -243,6 +244,8 @@ This document describes the differences between v6.0.0 and v5.1.0. 7. [Eiger] fast quad fix for loading trimbits 8. [Eiger] Can also use copydetectorserver command. + [All] copydetectorserver command also creates a link to the binary compied + with a shorter name ([detector]DetectorServer only) Receiver -------- diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 16c0cbc4c..3c60843bb 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -9048,12 +9048,12 @@ int get_dest_udp_list(int file_des) { #if !defined(EIGERD) && !defined(JUNGFRAUD) functionNotImplemented(); #else - if (arg > MAX_UDP_DESTINATION) { + if (arg >= MAX_UDP_DESTINATION) { ret = FAIL; sprintf( mess, "Could not set udp destination. Invalid entry. Options: 0 - %d\n", - MAX_UDP_DESTINATION); + MAX_UDP_DESTINATION - 1); LOG(logERROR, (mess)); } else { retvals[0] = arg; @@ -9123,12 +9123,12 @@ int set_dest_udp_list(int file_des) { "mac %s, mac2 %s]\n", entry, args[1], args[2], ip, ip2, mac, mac2)); - if (entry < 1 || entry > MAX_UDP_DESTINATION) { + if (entry < 1 || entry >= MAX_UDP_DESTINATION) { ret = FAIL; sprintf(mess, "Could not set udp destination. Invalid entry. Options: 1 " "- %d\n", - MAX_UDP_DESTINATION); + MAX_UDP_DESTINATION - 1); LOG(logERROR, (mess)); } #ifdef EIGERD @@ -9200,7 +9200,7 @@ int set_dest_udp_list(int file_des) { } // find number of destinations int numdest = 0; - for (int i = MAX_UDP_DESTINATION; i >= 0; --i) { + for (int i = MAX_UDP_DESTINATION - 1; i >= 0; --i) { if (udpDetails[i].dstip != 0) { numdest = i + 1; break;