diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.3.0.16.0 b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.3.0.16.1 similarity index 61% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.3.0.16.0 rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.3.0.16.1 index 487f5d79b..71cb01ec6 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.3.0.16.0 and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.3.0.16.1 differ diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 45d1c5a3c..980c317f4 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -6964,7 +6964,7 @@ int slsDetector::loadSettingsFile(string fname, int imod) { myMod->module=im; //settings is saved in myMod.reg for all except mythen if(thisDetector->myDetectorType!=MYTHEN) - myMod->reg=thisDetector->currentSettings; + myMod->reg=-1; setModule(*myMod,iodelay,tau,-1,0,0); deleteModule(myMod); } else @@ -7088,7 +7088,7 @@ int slsDetector::loadCalibrationFile(string fname, int imod) { if((myMod=getModule(im))){ //extra gain and offset if(thisDetector->nGain){ - if(readCalibrationFile(fn,gainval, offsetval)==FAIL) + if(readCalibrationFile(fn, gainval, offsetval)==FAIL) return FAIL; } //normal gain and offset inside sls_detector_module else{ diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 0802fb737..d032c4ab4 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -1949,6 +1949,7 @@ int set_module(int file_des) { #endif #ifdef EIGERD switch(myModule.reg){ + case GET_SETTINGS: case STANDARD: case HIGHGAIN: case LOWGAIN: