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

Merge pull request #273 from slsdetectorgroup/g2fix

Browse Source 
g2moduleid
This commit is contained in:
Dhanya Thattil 2021-07-27 17:05:15 +02:00 committed by GitHub
commit b634548a13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

18
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -1833,15 +1833,23 @@ int checkDetectorType() {
int type = atoi(buffer); int type = atoi(buffer);
if (type > TYPE_NO_MODULE_STARTING_VAL) { if (type > TYPE_NO_MODULE_STARTING_VAL) {
LOG(logERROR, LOG(logERROR,
("No Module attached! Expected %d for Gotthard2, got %d\n", ("No Module attached! Expected %d, %d or %d for Gotthard2, got %d\n",
TYPE_GOTTHARD2_MODULE_VAL, type)); TYPE_GOTTHARD2_MODULE_VAL,
TYPE_GOTTHARD2_25UM_MASTER_MODULE_VAL,
TYPE_GOTTHARD2_25UM_SLAVE_MODULE_VAL,
type));
return -2; return -2;
} }
if (abs(type - TYPE_GOTTHARD2_MODULE_VAL) > TYPE_TOLERANCE) { if ((abs(type - TYPE_GOTTHARD2_MODULE_VAL) > TYPE_TOLERANCE) &&
(abs(type - TYPE_GOTTHARD2_25UM_MASTER_MODULE_VAL) > TYPE_TOLERANCE) &&
(abs(type - TYPE_GOTTHARD2_25UM_SLAVE_MODULE_VAL) > TYPE_TOLERANCE)) {
LOG(logERROR, LOG(logERROR,
("Wrong Module attached! Expected %d for Gotthard2, got %d\n", ("Wrong Module attached! Expected %d, %d or %d for Gotthard2, got %d\n",
TYPE_GOTTHARD2_MODULE_VAL, type)); TYPE_GOTTHARD2_MODULE_VAL,
TYPE_GOTTHARD2_25UM_MASTER_MODULE_VAL,
TYPE_GOTTHARD2_25UM_SLAVE_MODULE_VAL,
type));
return FAIL; return FAIL;
} }
return OK; return OK;

5
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -26,7 +26,10 @@
#define ADU_MAX_BITS (12) #define ADU_MAX_BITS (12)
#define MAX_FRAMES_IN_BURST_MODE (2720) #define MAX_FRAMES_IN_BURST_MODE (2720)
#define TYPE_GOTTHARD2_MODULE_VAL (536) #define TYPE_GOTTHARD2_MODULE_VAL (536)
#define TYPE_TOLERANCE (10) #define TYPE_GOTTHARD2_25UM_MASTER_MODULE_VAL (683)
#define TYPE_GOTTHARD2_25UM_SLAVE_MODULE_VAL (704)
#define TYPE_GOTTHARD2_MODULE_VAL (536)
#define TYPE_TOLERANCE (5)
#define TYPE_NO_MODULE_STARTING_VAL (800) #define TYPE_NO_MODULE_STARTING_VAL (800)
#define INITIAL_STARTUP_WAIT (1 * 1000 * 1000) #define INITIAL_STARTUP_WAIT (1 * 1000 * 1000)

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer Executable file
View File

Binary file not shown.

2
slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
View File

@ -21,7 +21,7 @@
#define TYPE_FILE_NAME ("/etc/devlinks/type") #define TYPE_FILE_NAME ("/etc/devlinks/type")
#define DAC_MAX_MV (2048) #define DAC_MAX_MV (2048)
#define TYPE_MYTHEN3_MODULE_VAL (93) #define TYPE_MYTHEN3_MODULE_VAL (93)
#define TYPE_TOLERANCE (10) #define TYPE_TOLERANCE (5)
#define TYPE_NO_MODULE_STARTING_VAL (800) #define TYPE_NO_MODULE_STARTING_VAL (800)
#define MAX_EXT_SIGNALS (8) #define MAX_EXT_SIGNALS (8)

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

@ -4,9 +4,9 @@
#define APIGOTTHARD 0x210225 #define APIGOTTHARD 0x210225
#define APIMOENCH 0x210225 #define APIMOENCH 0x210225
#define APIEIGER 0x210225 #define APIEIGER 0x210225
#define APIMYTHEN3 0x210225
#define APILIB 0x210225 #define APILIB 0x210225
#define APIRECEIVER 0x210225 #define APIRECEIVER 0x210225
#define APIGUI 0x210225 #define APIGUI 0x210225
#define APIGOTTHARD2 0x210722
#define APIJUNGFRAU 0x210722 #define APIJUNGFRAU 0x210722
#define APIGOTTHARD2 0x210727
#define APIMYTHEN3 0x210727