From 18c6e8208afb2f015c4160f809e894fbfcdc4a4b Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 25 Oct 2016 12:01:31 +0200 Subject: [PATCH] removed bug, setting dr24 sets dr 32 also for eiger, also added server executable --- ...rServer => eigerDetectorServerv2.2.0.14.0} | Bin 277523 -> 277523 bytes .../slsDetectorServer_defs.h | 2 +- .../slsDetector/slsDetector.cpp | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename slsDetectorSoftware/eigerDetectorServer/bin/{eigerDetectorServer => eigerDetectorServerv2.2.0.14.0} (99%) 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 038ac981dc7902aa57045b263e73705b9bd70795..6a1c6c66bedce52ec1275fed8985efff1449b57b 100755 GIT binary patch delta 64 zcmbRILtyd`ferlzi~^G<7)%C|Du&*o{El-O3~U$#m<$-aRce@-D=Zoq1e#k6+gl77 QftU%1nYXtXvh;HS0EiP3y#N3J delta 64 zcmbRILtyd`ferlzjC_+P7)%C|Du&*oypD4j3~U$#m<$-aRce@-D=Zoq_?lY`+gl77 QftU%1nYXtXvh;HS0EWjBwEzGB 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;