diff --git a/RELEASE.txt b/RELEASE.txt index 0e63b6413..fd176c10e 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,8 +1,8 @@ -SLS Detector Package 4.0.2 released on 13.06.2019 (Bug Fix Release) +SLS Detector Package 4.0.3 released on xx.07.2019 (Bug Fix Release) =================================================================== -This document describes the differences between 4.0.2 and 4.0.1 releases. +This document describes the differences between 4.0.3 and 4.0.2 releases. CONTENTS -------- @@ -17,67 +17,27 @@ This document describes the differences between 4.0.2 and 4.0.1 releases. 1. Topics Concerning ==================== - - Jungfrau receiver as root user - - Receiver HDF5 printErrorStack - - Jungfrau server detector position error when switching between different detector sizes - - Gotthard server get settings does not set default dacs anymore - - Jungfrau powerchip multi detector command delay - - Client API data call back / Gui (Eiger in 4 bit mode) - - Users class added burst_trigger in getTimingMode from string - - Gui switching to tabplot during acquisition error messages + - command line framesl, cyclesl was printing in float + 2. Resolved Issues ================== - Receiver - -------- + Client + ------ - 1. Jungfrau Receiver as root user fails to set UDP socket size to default value - of (2000 * 1024 * 1024). It does not receive any packets afterwards. - Temporary solution was to set it to a lower number using - sls_detector_put rx_udpsocksize 1048576000 - This has been fixed now to allow a greater size (including the default size). + 1. Command line commands framesl, cyclesl, fatesl, problesl and nframes was + printing the result in decimals. It is now fixed to print as whole numbers. - 2. Fixed bug where printError was still being called once instead of printErrorStack. - Detector Server --------------- - 1. (Jungfrau) - Switching between different detector size configurations with same detector modules, - the detector gave an error "Could not set detector position". This is fixed now. - - 2. (Gotthard) - Get settings was setting the default dacs previously. It has been fixed now. - - - Client - ------ - 1. (Jungfrau) - Using multi detector command for powerchip will have a delay of 1 second between - modules when there are more than 3 modules for extra protection. - - 2. Client Callback / Gui (Eiger) - Client data call back provided the complete image data, but the number of pixels - in x and y was provided incorrectly at a modular level. This has been fixed to give - the proper value. This also fixes the Gui crashing for Eiger 4 bit mode when - acquiring for multiple images. - - 3. (API) - Added "burst_trigger" in getTimingMode (from string to int) in Users class. - - - Gui - --- - 1. Switching to Tab Plot during acquisition produced error messages. This has been - fixed. - + 3. Known Issues =============== - :) 4. Firmware Requirements @@ -106,12 +66,13 @@ This document describes the differences between 4.0.2 and 4.0.1 releases. Jungfrau Can be upgraded remotely using sls_detector_put programfpga Instructions available at - https://www.psi.ch/detectors/installation-instructions - under Detector Upgrade -> [Detector Type] -> Firmware. - + https://slsdetectorgroup.github.io/slsDetectorPackage/docs/html/slsDetectorInstall/GOTTHARD_Firmware.html + https://slsdetectorgroup.github.io/slsDetectorPackage/docs/html/slsDetectorInstall/EIGER_Firmware.html + https://slsdetectorgroup.github.io/slsDetectorPackage/docs/html/slsDetectorInstall/JUNGFRAU_Firmware.html + Please refer to the link below for more details on the firmware versions. - https://www.psi.ch/detectors/firmware. + https://www.psi.ch/en/detectors/firmware @@ -138,26 +99,37 @@ This document describes the differences between 4.0.2 and 4.0.1 releases. ------------- Manual (HTML & PDF): - https://www.psi.ch/detectors/documentation + https://www.psi.ch/en/detectors/documentation slsDetectorPackage/manual/docs/ Command Line Documentation: + https://slsdetectorgroup.github.io/slsDetectorPackage/docs/html/slsDetectorClientDocs/index.html + https://slsdetectorgroup.github.io/slsDetectorPackage/docs/pdf/slsDetectorClientDocs.pdf + manual/docs/html/slsDetectorClientDocs/index.html manual/docs/pdf/slsDetectorClientDocs.pdf C++ API Documentation: + https://slsdetectorgroup.github.io/slsDetectorPackage/docs/html/slsDetectorUsersDocs/index.html + https://slsdetectorgroup.github.io/slsDetectorPackage/docs/pdf/slsDetectorUsersDocs.pdf + manual/docs/html/slsDetectorUsersDocs/index.html manual/docs/pdf/slsDetectorUsersDocs.pdf C++ API Example: + https://slsdetectorgroup.github.io/slsDetectorPackage/exampleCode/slsDetectorUsersExample/index.html + manual/manual-api/mainClient.cpp manual/manual-api/mainReceiver.cpp Python API Documentation: https://slsdetectorgroup.github.io/sls_detector/ + + TroubleShotting: + https://www.psi.ch/en/detectors/troubleshooting Further Documentation: - https://www.psi.ch/detectors/users-support + https://www.psi.ch/en/detectors/users-support Support diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index a0850d14d..f7b0f0b1a 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -5820,18 +5820,14 @@ string slsDetectorCommand::cmdTimeLeft(int narg, char *args[], int action) { if ((ret!=-1) && (index==ACQUISITION_TIME || index==FRAME_PERIOD || index==DELAY_AFTER_TRIGGER || index==ACTUAL_TIME || index==MEASUREMENT_TIME || - MEASURED_PERIOD || MEASURED_SUBPERIOD)) + MEASURED_PERIOD || MEASURED_SUBPERIOD)) { rval=(double)ret*1E-9; - else rval=ret; + sprintf(answer,"%0.9f",rval); + } else { + sprintf(answer,"%lld",(long long int)ret); + } - - sprintf(answer,"%0.9f",rval); return string(answer); - - - - - }