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

updated docs and versions

Browse Source
This commit is contained in:
maliakal_d 2023-07-12 16:50:13 +02:00
parent 1a859b83db
commit f761046bfc
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -2,7 +2,7 @@
# Copyright (C) 2021 Contributors to the SLS Detector Package # Copyright (C) 2021 Contributors to the SLS Detector Package
cmake_minimum_required(VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project(slsDetectorPackage) project(slsDetectorPackage)
set(PROJECT_VERSION 7.0.1) set(PROJECT_VERSION 7.0.2)
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")

16
docs/src/slsreceiver.rst
View File

@ -140,14 +140,21 @@ ZMQ: Json Header Format
"quad": unsigned int, "quad": unsigned int,
"addJsonHeader": { "addJsonHeader": {
string : string string : string
} },
"rx_roi": [
unsigned int,
unsigned int,
unsigned int,
unsigned int
]
} }
+--------------+----------------------------------------------+ +--------------+----------------------------------------------+
| Field | Description | | Field | Description |
+--------------+----------------------------------------------+ +--------------+----------------------------------------------+
| jsonversion | Version of the json header. | | jsonversion | Version of the json header. |
| | Value at 4 for v6.x.x and v7.x.x | | | Value at 4 for v6.x.x - v7.0.1 |
| | Value at 5 for v7.0.2 |
+--------------+----------------------------------------------+ +--------------+----------------------------------------------+
| bitmode | Bits per pixel [4|8|16|32] | | bitmode | Bits per pixel [4|8|16|32] |
+--------------+----------------------------------------------+ +--------------+----------------------------------------------+
@ -222,7 +229,10 @@ ZMQ: Json Header Format
| addJsonHeader| Optional custom parameters that is required | | addJsonHeader| Optional custom parameters that is required |
| | for processing code. | | | for processing code. |
+--------------+----------------------------------------------+ +--------------+----------------------------------------------+
| rx_roi | ROI in the receiver per port (xmin, xmax, |
| | ymin, ymax). For external guis to know |
| | what is saved |
+--------------+----------------------------------------------+
SLS Receiver Header Format SLS Receiver Header Format
-------------------------- --------------------------

4
slsReceiverSoftware/src/receiver_defs.h
View File

@ -19,8 +19,8 @@ namespace sls {
// files // files
// versions // versions
#define HDF5_WRITER_VERSION (6.5) // 1 decimal places #define HDF5_WRITER_VERSION (6.6) // 1 decimal places
#define BINARY_WRITER_VERSION (7.1) // 1 decimal places #define BINARY_WRITER_VERSION (7.2) // 1 decimal places
#define MAX_FRAMES_PER_FILE 20000 #define MAX_FRAMES_PER_FILE 20000
#define SHORT_MAX_FRAMES_PER_FILE 100000 #define SHORT_MAX_FRAMES_PER_FILE 100000

2
slsSupportLib/include/sls/sls_detector_defs.h
View File

@ -46,7 +46,7 @@
#define MAX_UDP_DESTINATION 32 #define MAX_UDP_DESTINATION 32
#define SLS_DETECTOR_HEADER_VERSION 0x2 #define SLS_DETECTOR_HEADER_VERSION 0x2
#define SLS_DETECTOR_JSON_HEADER_VERSION 0x4 #define SLS_DETECTOR_JSON_HEADER_VERSION 0x5
// ctb/ moench 1g udp (read from fifo) // ctb/ moench 1g udp (read from fifo)
#define UDP_PACKET_DATA_BYTES (1344) #define UDP_PACKET_DATA_BYTES (1344)

6
slsSupportLib/include/sls/versionAPI.h
View File

@ -1,13 +1,13 @@
// SPDX-License-Identifier: LGPL-3.0-or-other // SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package // Copyright (C) 2021 Contributors to the SLS Detector Package
/** API versions */ /** API versions */
#define RELEASE "7.0.1" #define RELEASE "7.0.2"
#define APICTB "7.0.0 0x230222" #define APICTB "7.0.0 0x230222"
#define APIGOTTHARD "7.0.0 0x230222" #define APIGOTTHARD "7.0.0 0x230222"
#define APIGOTTHARD2 "7.0.0 0x230222" #define APIGOTTHARD2 "7.0.0 0x230222"
#define APIMYTHEN3 "7.0.0 0x230222" #define APIMYTHEN3 "7.0.0 0x230222"
#define APIMOENCH "7.0.0 0x230222" #define APIMOENCH "7.0.0 0x230222"
#define APIEIGER "7.0.0 0x230222" #define APIEIGER "7.0.0 0x230222"
#define APIRECEIVER "7.0.0 0x230222"
#define APILIB "7.0.2 0x230421"
#define APIJUNGFRAU "7.0.2 0x230710" #define APIJUNGFRAU "7.0.2 0x230710"
#define APILIB "7.0.2 0x230712"
#define APIRECEIVER "7.0.2 0x230712"