From c1ea73d21ce98462a7e75193b0755bd91d3e0d02 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 18 Aug 2017 14:03:11 +0200 Subject: [PATCH 1/3] some changes for release txt --- RELEASE.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 32ce5b1f6..2ed670b59 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -43,11 +43,11 @@ Reiterating, both 2.3 and 3.0 supports the following features: Receiver -------- 1. The files will be written in this format in the binary mode: - * ASCII file: header of 1024 bytes (only for EIGER detectors) + * 1 ASCII file per measurement: header with measurement parameters * binary files: series of images, each preceded by a Standard Image Header (header described below) - 2. Stanard Image Header in file and call back + 2. Standard Image Header in file and call back arguments defined. It is in the following format defined as sls_detector_header defined in slsReceiverSoftware/include/sls_receiver_defs.h @@ -107,7 +107,10 @@ New Features General ------- 3. UDP Packets from all the detectors will contain the standard sls detector header. - X, Y and Z Coordinates define the position of the detector in 3d. + Jungfrau will have an extra 6 bytes preceding the standard header in the udp packets + only. X, Y and Z Coordinates define the position of the detector in 3d. These values + are not filled in the udp header at the moment, but will be in the files and receiver + call backs with only x in 1d at the moment. 4. When acquire has started, one can use sls_detector_get busy to check the status of the acquire. 1 is running 0 is idle. This way one can start acqusition with &, From 4838d6c03770b6afbf946a4110874b28553b16d5 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 18 Aug 2017 16:13:09 +0200 Subject: [PATCH 2/3] updated server binaries --- serverBin/eigerDetectorServerv3.0.0.16.6 | 1 - serverBin/jungfrauDetectorServer | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 serverBin/eigerDetectorServerv3.0.0.16.6 diff --git a/serverBin/eigerDetectorServerv3.0.0.16.6 b/serverBin/eigerDetectorServerv3.0.0.16.6 deleted file mode 120000 index 39e582b4a..000000000 --- a/serverBin/eigerDetectorServerv3.0.0.16.6 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.6 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServer b/serverBin/jungfrauDetectorServer index 13061e8d2..002832aec 120000 --- a/serverBin/jungfrauDetectorServer +++ b/serverBin/jungfrauDetectorServer @@ -1 +1 @@ -../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.5 \ No newline at end of file +../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6 \ No newline at end of file From 4b6144c489c0b8bb536337f66446409e56daf68a Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 18 Aug 2017 16:13:33 +0200 Subject: [PATCH 3/3] updated server binaries --- serverBin/eigerDetectorServer | 1 + 1 file changed, 1 insertion(+) create mode 120000 serverBin/eigerDetectorServer diff --git a/serverBin/eigerDetectorServer b/serverBin/eigerDetectorServer new file mode 120000 index 000000000..d66dad8c1 --- /dev/null +++ b/serverBin/eigerDetectorServer @@ -0,0 +1 @@ +../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.8 \ No newline at end of file