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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-16 17:38:41 +02:00
parent d3e60eba80
commit a0bdfcdae3
24 changed files with 62 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsSupportLib/include/sls_detector_defs.h
View File

@ -337,9 +337,8 @@ format
/**
communication mode using external signals
*/
enum externalCommunicationMode {
GET_EXTERNAL_COMMUNICATION_MODE =
-1, /**<return flag for communication mode */
enum timingMode {
GET_TIMING_MODE = -1, /**<return flag for communication mode */
AUTO_TIMING, /**< internal timing */
TRIGGER_EXPOSURE, /**< trigger mode i.e. exposure is triggered */
GATED, /**< gated */
@ -792,11 +791,11 @@ format
/**
returns external communication mode std::string from index
\param f can be AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER,
GET_EXTERNAL_COMMUNICATION_MODE \returns auto, trigger, gating,
GET_TIMING_MODE \returns auto, trigger, gating,
burst_trigger, unknown
*/
static std::string externalCommunicationType(externalCommunicationMode f) {
static std::string timingModeType(timingMode f) {
switch (f) {
case AUTO_TIMING:
return std::string("auto");
@ -815,11 +814,10 @@ format
returns external communication mode index from std::string
\param sval can be auto, trigger, gating, burst_trigger
\returns AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER,
GET_EXTERNAL_COMMUNICATION_MODE
GET_TIMING_MODE
*/
static externalCommunicationMode
externalCommunicationType(std::string sval) {
static timingMode timingModeType(std::string sval) {
if (sval == "auto")
return AUTO_TIMING;
if (sval == "trigger")
@ -828,7 +826,7 @@ format
return GATED;
if (sval == "burst_trigger")
return BURST_TRIGGER;
return GET_EXTERNAL_COMMUNICATION_MODE;
return GET_TIMING_MODE;
};
/** returns std::string from file format index

4
slsSupportLib/include/sls_detector_funcs.h
View File

@ -13,7 +13,7 @@ enum detFuncs{
F_EXEC_COMMAND=0, /**< command is executed */
F_GET_DETECTOR_TYPE, /**< return detector type */
F_SET_EXTERNAL_SIGNAL_FLAG, /**< set/get flag for external signal */
F_SET_EXTERNAL_COMMUNICATION_MODE, /**< set/get external communication mode (obsolete) */
F_SET_TIMING_MODE, /**< set/get external communication mode (obsolete) */
F_GET_ID, /**< get detector id of version */
F_DIGITAL_TEST, /**< digital test of the detector */
F_SET_DAC, /**< set DAC value */
@ -164,7 +164,7 @@ static const char* getFunctionNameFromEnum(enum detFuncs func) {
case F_EXEC_COMMAND: return "F_EXEC_COMMAND";
case F_GET_DETECTOR_TYPE: return "F_GET_DETECTOR_TYPE";
case F_SET_EXTERNAL_SIGNAL_FLAG: return "F_SET_EXTERNAL_SIGNAL_FLAG";
case F_SET_EXTERNAL_COMMUNICATION_MODE: return "F_SET_EXTERNAL_COMMUNICATION_MODE";
case F_SET_TIMING_MODE: return "F_SET_TIMING_MODE";
case F_GET_ID: return "F_GET_ID";
case F_DIGITAL_TEST: return "F_DIGITAL_TEST";
case F_SET_DAC: return "F_SET_DAC";

6
slsSupportLib/include/versionAPI.h
View File

@ -1,10 +1,10 @@
/** API versions */
#define GITBRANCH "developer"
#define APIMOENCH 0x181108
#define APICTB 0x190604
#define APILIB 0x190723
#define APIRECEIVER 0x190722
#define APIGUI 0x190723
#define APIJUNGFRAU 0x190730
#define APIGOTTHARD 0x190813
#define APIEIGER 0x190816
#define APIGOTTHARD 0x190816
#define APIJUNGFRAU 0x190816
#define APIMOENCH 0x190816