diff --git a/CMakeLists.txt b/CMakeLists.txt index 062ee70b17..6b023ea366 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright (C) 2021 Contributors to the SLS Detector Package cmake_minimum_required(VERSION 3.12) project(slsDetectorPackage) -set(PROJECT_VERSION 7.0.1) +set(PROJECT_VERSION 7.0.2) set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") diff --git a/docs/src/slsreceiver.rst b/docs/src/slsreceiver.rst index 6e794a30c2..fb4620c82a 100644 --- a/docs/src/slsreceiver.rst +++ b/docs/src/slsreceiver.rst @@ -140,14 +140,21 @@ ZMQ: Json Header Format "quad": unsigned int, "addJsonHeader": { string : string - } + }, + "rx_roi": [ + unsigned int, + unsigned int, + unsigned int, + unsigned int + ] } +--------------+----------------------------------------------+ | Field | Description | +--------------+----------------------------------------------+ | 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] | +--------------+----------------------------------------------+ @@ -222,7 +229,10 @@ ZMQ: Json Header Format | addJsonHeader| Optional custom parameters that is required | | | 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 -------------------------- diff --git a/slsReceiverSoftware/src/receiver_defs.h b/slsReceiverSoftware/src/receiver_defs.h index d06b8ae731..2d8e1e54a5 100644 --- a/slsReceiverSoftware/src/receiver_defs.h +++ b/slsReceiverSoftware/src/receiver_defs.h @@ -19,8 +19,8 @@ namespace sls { // files // versions -#define HDF5_WRITER_VERSION (6.5) // 1 decimal places -#define BINARY_WRITER_VERSION (7.1) // 1 decimal places +#define HDF5_WRITER_VERSION (6.6) // 1 decimal places +#define BINARY_WRITER_VERSION (7.2) // 1 decimal places #define MAX_FRAMES_PER_FILE 20000 #define SHORT_MAX_FRAMES_PER_FILE 100000 diff --git a/slsSupportLib/include/sls/sls_detector_defs.h b/slsSupportLib/include/sls/sls_detector_defs.h index 9a145700b9..1718de84b7 100644 --- a/slsSupportLib/include/sls/sls_detector_defs.h +++ b/slsSupportLib/include/sls/sls_detector_defs.h @@ -46,7 +46,7 @@ #define MAX_UDP_DESTINATION 32 #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) #define UDP_PACKET_DATA_BYTES (1344) diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 8ff827fa47..f439b2c937 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -1,13 +1,13 @@ // SPDX-License-Identifier: LGPL-3.0-or-other // Copyright (C) 2021 Contributors to the SLS Detector Package /** API versions */ -#define RELEASE "7.0.1" +#define RELEASE "7.0.2" #define APICTB "7.0.0 0x230222" #define APIGOTTHARD "7.0.0 0x230222" #define APIGOTTHARD2 "7.0.0 0x230222" #define APIMYTHEN3 "7.0.0 0x230222" #define APIMOENCH "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 APILIB "7.0.2 0x230712" +#define APIRECEIVER "7.0.2 0x230712"