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

removed bug, setting dr24 sets dr 32 also for eiger, also added server executable

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-10-25 12:01:31 +02:00
parent 899adbce5b
commit 18c6e8208a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.2.0.14.0
View File

Binary file not shown.

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -16,7 +16,7 @@
#define FEB_PORT 43210 #define FEB_PORT 43210
#define BEB_PORT 43212 #define BEB_PORT 43212
#define REQUIRED_FIRMWARE_VERSION 14 #define REQUIRED_FIRMWARE_VERSION 16
#define FIRMWAREREV 0xcaba //temporary should be in firmware #define FIRMWAREREV 0xcaba //temporary should be in firmware

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1739,7 +1739,7 @@ int slsDetector::setNumberOfModules(int n, dimension d){
int dr=thisDetector->dynamicRange; int dr=thisDetector->dynamicRange;
if (dr==24) if ((thisDetector->myDetectorType==MYTHEN) && (dr==24))
dr=32; dr=32;
thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*dr/8; 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 #ifdef VERBOSE
std::cout<< "Setting dynamic range to "<< n << std::endl; std::cout<< "Setting dynamic range to "<< n << std::endl;
#endif #endif
if (n==24) if ((thisDetector->myDetectorType == MYTHEN) &&(n==24))
n=32; n=32;