From 46533b041195591b1a09b2662895e084821ba886 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 12 Jun 2019 15:37:17 +0200 Subject: [PATCH] updated server binaries --- RELEASE.txt | 31 ++++++++++-------- serverBin/gotthardDetectorServerv4.0.1.4 | 1 - serverBin/gotthardDetectorServerv4.0.2.0 | 1 + serverBin/jungfrauDetectorServerv4.0.1.0 | 1 - serverBin/jungfrauDetectorServerv4.0.2.0 | 1 + .../gotthardDetectorServer/gitInfo.txt | 10 +++--- .../gotthardDetectorServer/gitInfoGotthard.h | 8 ++--- ...4.0.1.4 => gotthardDetectorServerv4.0.2.0} | Bin 117808 -> 117808 bytes .../multiSlsDetector/multiSlsDetector.cpp | 2 +- .../slsDetector/slsDetectorUsers.h | 9 ++--- 10 files changed, 35 insertions(+), 29 deletions(-) delete mode 120000 serverBin/gotthardDetectorServerv4.0.1.4 create mode 120000 serverBin/gotthardDetectorServerv4.0.2.0 delete mode 120000 serverBin/jungfrauDetectorServerv4.0.1.0 create mode 120000 serverBin/jungfrauDetectorServerv4.0.2.0 rename slsDetectorSoftware/gotthardDetectorServer/{gotthardDetectorServerv4.0.1.4 => gotthardDetectorServerv4.0.2.0} (65%) 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 8c97ee254bfc894e45fee0868bfed836a0116571..eabb51ea5910d53eeffb60eb6a32ebc2d56235a7 100755 GIT binary patch delta 22167 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 K;}>OIz5fTPMO;Y$ 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: