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

merge conflict resolved from 4.0.0

Browse Source
This commit is contained in:
maliakal_d
2018-09-28 16:28:21 +02:00
parent c52025dd7c eb89d12f41
commit def79807f6
86 changed files with 1112 additions and 2326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -146,19 +146,6 @@ typedef struct {
} sls_detector_module;
/**
@short structure for a region of interest
xmin,xmax,ymin,ymax define the limits of the region
*/
typedef struct {
int xmin; /**< is the roi xmin (in channel number) */
int xmax; /**< is the roi xmax (in channel number)*/
int ymin; /**< is the roi ymin (in channel number)*/
int ymax; /**< is the roi ymax (in channel number)*/
} ROI ;
/* /\* */
/* @short structure for a generic integer array */
/* *\/ */

7
slsDetectorSoftware/commonFiles/versionAPI.h
View File

@ -1,5 +1,6 @@
/** API versions */
#define APIRECEIVER 0x180718
#define APIRECEIVER 0x180927
#define APIEIGER 0x180820
#define APIJUNGFRAU 0x180820
#define APIGOTTHARD 0x180820
#define APIJUNGFRAU 0x180925
#define APIGOTTHARD 0x180928