diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.2.0.14.0 similarity index 99% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.2.0.14.0 index 038ac981d..6a1c6c66b 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.2.0.14.0 differ diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h index 5e821bd73..296e51728 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h @@ -16,7 +16,7 @@ #define FEB_PORT 43210 #define BEB_PORT 43212 -#define REQUIRED_FIRMWARE_VERSION 14 +#define REQUIRED_FIRMWARE_VERSION 16 #define FIRMWAREREV 0xcaba //temporary should be in firmware diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 0928984ab..b21cc5e5f 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -1739,7 +1739,7 @@ int slsDetector::setNumberOfModules(int n, dimension d){ int dr=thisDetector->dynamicRange; - if (dr==24) + if ((thisDetector->myDetectorType==MYTHEN) && (dr==24)) dr=32; thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*dr/8; @@ -4539,7 +4539,7 @@ int slsDetector::setDynamicRange(int n){ #ifdef VERBOSE std::cout<< "Setting dynamic range to "<< n << std::endl; #endif - if (n==24) + if ((thisDetector->myDetectorType == MYTHEN) &&(n==24)) n=32;