diff --git a/RELEASE.txt b/RELEASE.txt index 76875c1d6..fade41e62 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,4 +1,4 @@ -SLS Detector Package 4.0.2 released on xx.xx.2019 (Bug Fix Release) +SLS Detector Package 4.0.2 released on 12.06.2019 (Bug Fix Release) =================================================================== @@ -18,10 +18,11 @@ This document describes the differences between 4.0.2 and 4.0.1 releases. ==================== - Jungfrau receiver as root user - - Jungfrau server detector position error when switching between different detector sizes - - Client API data call back / Gui (Eiger in 4 bit mode) - Receiver HDF5 printErrorStack - + - Jungfrau server detector position error when switching between different detector sizes + - Gotthard server get settings does not set default dacs anymore + - Client API data call back / Gui (Eiger in 4 bit mode) + - Users class added burst_trigger in getTimingMode from string 2. Resolved Issues @@ -39,27 +40,31 @@ This document describes the differences between 4.0.2 and 4.0.1 releases. 2. Fixed bug where printError was still being called once instead of printErrorStack. - Detector Server (Jungfrau) + Detector Server -------------------------- - 1. Switching between different detector size configurations, the detector gave an - error "Could not set detector position". This is fixed now. + 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 API / Gui (Eiger) - ------------------------ - 1. Client data call back provided the complete image data, but the number of pixels + Client API + ---------- + 1. 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. + 2. Added "burst_trigger" in getTimingMode (from string to int) in Users class. - - 3. Known Issues =============== - + :) 4. Firmware Requirements diff --git a/serverBin/gotthardDetectorServerv4.0.1.4 b/serverBin/gotthardDetectorServerv4.0.1.4 deleted file mode 120000 index bfc7b6c24..000000000 --- a/serverBin/gotthardDetectorServerv4.0.1.4 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.4 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServerv4.0.2.0 b/serverBin/gotthardDetectorServerv4.0.2.0 new file mode 120000 index 000000000..323396c86 --- /dev/null +++ b/serverBin/gotthardDetectorServerv4.0.2.0 @@ -0,0 +1 @@ +../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.2.0 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv4.0.1.0 b/serverBin/jungfrauDetectorServerv4.0.1.0 deleted file mode 120000 index 807c9b778..000000000 --- a/serverBin/jungfrauDetectorServerv4.0.1.0 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv4.0.1.0 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv4.0.2.0 b/serverBin/jungfrauDetectorServerv4.0.2.0 new file mode 120000 index 000000000..9b1ca1579 --- /dev/null +++ b/serverBin/jungfrauDetectorServerv4.0.2.0 @@ -0,0 +1 @@ +../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv4.0.2.0 \ No newline at end of file diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt index d92aae8a7..0aee1d153 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: fc766055d4dacac815d561b04ebd5e9f82532117 -Revision: 249 +Repsitory UUID: 4f4de15d3a55dc043775050cf5f0521934e2c9ce +Revision: 250 Branch: 4.0.2-rc -Last Changed Author: Dhanya_Thattil -Last Changed Rev: 4095 -Last Changed Date: 2019-03-11 14:53:56.000000002 +0100 ./server_funcs.c +Last Changed Author: Erik_Frojdh +Last Changed Rev: 4106 +Last Changed Date: 2019-06-12 14:40:26.000000002 +0200 ./.target-makefrag diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h index 08a47e853..100b819b7 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "fc766055d4dacac815d561b04ebd5e9f82532117" -#define GITAUTH "Dhanya_Thattil" -#define GITREV 0x4095 -#define GITDATE 0x20190311 +#define GITREPUUID "4f4de15d3a55dc043775050cf5f0521934e2c9ce" +#define GITAUTH "Erik_Frojdh" +#define GITREV 0x4106 +#define GITDATE 0x20190612 #define GITBRANCH "4.0.2-rc" diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.4 b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.2.0 similarity index 65% rename from slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.4 rename to slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.2.0 index 8c97ee254..eabb51ea5 100755 Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.4 and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.2.0 differ diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index b79082437..e17df3533 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3911,7 +3911,7 @@ int multiSlsDetector::powerChip(int ival) { ret = detectors[i]->powerChip(ival); // 1s sleep per module for large systems if(ival >=0 && detectors.size() > 3) - usleep(1000000); + usleep(1000 * 1000); if (detectors[i]->getErrorMask()) setErrorMask(getErrorMask() | (1 << i)); if (ret == FAIL) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h index cabc9de66..8cc8ae7b9 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h @@ -913,9 +913,9 @@ class slsDetectorUsers } }; /** - @short returns external communication mode std::string from index - \param s index for communication mode - \returns auto, trigger, ro_trigger, gating, triggered_gating, unknown when wrong mode + @short returns external communication mode index from std::string + \param s auto, trigger, ro_trigger, gating, triggered_gating, burst_trigger, unknown when wrong mode + \returns index for communication mode */ static int getTimingMode(std::string s){ \ @@ -924,7 +924,8 @@ class slsDetectorUsers if (s== "ro_trigger") return 2; \ if (s== "gating") return 3; \ if (s== "triggered_gating") return 4; \ - return -1; }; + if (s== "burst_trigger") return 5; \ + return -1; }; \ private: