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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
Erik Frojdh 2020-01-20 14:27:30 +01:00
commit 5c35a33e02
4 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -1067,7 +1067,7 @@ int checkDetectorType() {
return -1; return -1;
} }
int type = atoi(buffer); int type = atoi(buffer);
if (type > TYPE_TOLERANCE) { if (type > TYPE_NO_MODULE_STARTING_VAL) {
FILE_LOG(logERROR, ("No Module attached! Expected %d for Mythen, got %d\n", TYPE_MYTHEN3_MODULE_VAL, type)); FILE_LOG(logERROR, ("No Module attached! Expected %d for Mythen, got %d\n", TYPE_MYTHEN3_MODULE_VAL, type));
return -2; return -2;
} }

1
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -1793,6 +1793,7 @@ std::string slsDetector::setReceiverHostname(const std::string &receiverIP) {
case MYTHEN3: case MYTHEN3:
sendNumberofCounterstoReceiver(getCounterMask()); sendNumberofCounterstoReceiver(getCounterMask());
setDynamicRange(shm()->dynamicRange);
break; break;
default: default:

2
slsSupportLib/include/versionAPI.h
View File

@ -9,4 +9,4 @@
#define APIJUNGFRAU 0x191127 #define APIJUNGFRAU 0x191127
#define APICTB 0x191210 #define APICTB 0x191210
#define APIEIGER 0x200110 #define APIEIGER 0x200110
#define APIMYTHEN3 0x200114 #define APIMYTHEN3 0x200120