detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 23:30:03 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0-rc' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-18 16:13:51 +02:00
commit de3c62fea4
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RELEASE.txt
View File

@ -43,11 +43,11 @@ Reiterating, both 2.3 and 3.0 supports the following features:
Receiver Receiver
-------- --------
1. The files will be written in this format in the binary mode: 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 * binary files: series of images, each preceded by a
Standard Image Header (header described below) 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 arguments defined. It is in the following format defined as
sls_detector_header defined in sls_detector_header defined in
slsReceiverSoftware/include/sls_receiver_defs.h slsReceiverSoftware/include/sls_receiver_defs.h
@ -107,7 +107,10 @@ New Features
General General
------- -------
3. UDP Packets from all the detectors will contain the standard sls detector header. 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 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 &, of the acquire. 1 is running 0 is idle. This way one can start acqusition with &,

1
serverBin/eigerDetectorServer Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.8

1
serverBin/eigerDetectorServerv3.0.0.16.6
View File

@ -1 +0,0 @@
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv3.0.0.16.6

2
serverBin/jungfrauDetectorServer
View File

@ -1 +1 @@
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.5 ../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6