detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

partialread changed to readnrows

Browse Source
This commit is contained in:
maliakal_d
2021-08-31 16:46:49 +02:00
parent 11b1d9f6db
commit 25d03f949e
35 changed files with 171 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -545,7 +545,7 @@ typedef struct {
int dataStreamLeft{0};
int dataStreamRight{0};
int quad{0};
int partialReadout{0};
int readNRows{0};
int thresholdEnergyeV[3]{0, 0, 0};
int dynamicRange{16};
timingMode timMode{AUTO_TIMING};

12
slsSupportLib/include/sls/sls_detector_funcs.h
View File

@ -124,8 +124,8 @@ enum detFuncs {
F_GET_QUAD,
F_SET_INTERRUPT_SUBFRAME,
F_GET_INTERRUPT_SUBFRAME,
F_SET_PARTIAL_READOUT,
F_GET_PARTIAL_READOUT,
F_SET_READ_N_ROWS,
F_GET_READ_N_ROWS,
F_SET_POSITION,
F_SET_SOURCE_UDP_MAC,
F_GET_SOURCE_UDP_MAC,
@ -332,7 +332,7 @@ enum detFuncs {
F_SET_RECEIVER_DBIT_OFFSET,
F_GET_RECEIVER_DBIT_OFFSET,
F_SET_RECEIVER_QUAD,
F_SET_RECEIVER_PARTIAL_READOUT,
F_SET_RECEIVER_READ_N_ROWS,
F_SET_RECEIVER_UDP_IP,
F_SET_RECEIVER_UDP_IP2,
F_SET_RECEIVER_UDP_PORT,
@ -483,8 +483,8 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
case F_GET_QUAD: return "F_GET_QUAD";
case F_SET_INTERRUPT_SUBFRAME: return "F_SET_INTERRUPT_SUBFRAME";
case F_GET_INTERRUPT_SUBFRAME: return "F_GET_INTERRUPT_SUBFRAME";
case F_SET_PARTIAL_READOUT: return "F_SET_PARTIAL_READOUT";
case F_GET_PARTIAL_READOUT: return "F_GET_PARTIAL_READOUT";
case F_SET_READ_N_ROWS: return "F_SET_READ_N_ROWS";
case F_GET_READ_N_ROWS: return "F_GET_READ_N_ROWS";
case F_SET_POSITION: return "F_SET_POSITION";
case F_SET_SOURCE_UDP_MAC: return "F_SET_SOURCE_UDP_MAC";
case F_GET_SOURCE_UDP_MAC: return "F_GET_SOURCE_UDP_MAC";
@ -689,7 +689,7 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
case F_SET_RECEIVER_DBIT_OFFSET: return "F_SET_RECEIVER_DBIT_OFFSET";
case F_GET_RECEIVER_DBIT_OFFSET: return "F_GET_RECEIVER_DBIT_OFFSET";
case F_SET_RECEIVER_QUAD: return "F_SET_RECEIVER_QUAD";
case F_SET_RECEIVER_PARTIAL_READOUT: return "F_SET_RECEIVER_PARTIAL_READOUT";
case F_SET_RECEIVER_READ_N_ROWS: return "F_SET_RECEIVER_READ_N_ROWS";
case F_SET_RECEIVER_UDP_IP: return "F_SET_RECEIVER_UDP_IP";
case F_SET_RECEIVER_UDP_IP2: return "F_SET_RECEIVER_UDP_IP2";
case F_SET_RECEIVER_UDP_PORT: return "F_SET_RECEIVER_UDP_PORT";

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

@ -6,10 +6,10 @@
#define APILIB 0x210831
#define APIRECEIVER 0x210831
#define APIGUI 0x210819
#define APIEIGER 0x210831
#define APICTB 0x210831
#define APIGOTTHARD 0x210831
#define APIGOTTHARD2 0x210831
#define APIMYTHEN3 0x210831
#define APIMOENCH 0x210831
#define APIEIGER 0x210831
#define APIJUNGFRAU 0x210831

2
slsSupportLib/src/ToString.cpp
View File

@ -55,7 +55,7 @@ std::string ToString(const slsDetectorDefs::rxParameters &r) {
<< "leftDataStream:" << r.dataStreamLeft << std::endl
<< "rightDataStream:" << r.dataStreamRight << std::endl
<< "quad:" << r.quad << std::endl
<< "partialReadout:" << r.partialReadout << std::endl
<< "readNRows:" << r.readNRows << std::endl
<< "thresholdEnergyeV:" << ToString(r.thresholdEnergyeV) << std::endl
<< "dynamicRange:" << r.dynamicRange << std::endl
<< "timMode:" << r.timMode << std::endl