detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-15 06:17:12 +02:00
Code Issues Actions Packages Releases Activity

bug fix: loading trimbit file should not care about settings

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-02-27 16:05:27 +01:00
parent 111f8beab3
commit 62de278f24
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.3.0.16.0 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.3.0.16.1
View File

Binary file not shown.

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -6964,7 +6964,7 @@ int slsDetector::loadSettingsFile(string fname, int imod) {
myMod->module=im; myMod->module=im;
//settings is saved in myMod.reg for all except mythen //settings is saved in myMod.reg for all except mythen
if(thisDetector->myDetectorType!=MYTHEN) if(thisDetector->myDetectorType!=MYTHEN)
myMod->reg=thisDetector->currentSettings; myMod->reg=-1;
setModule(*myMod,iodelay,tau,-1,0,0); setModule(*myMod,iodelay,tau,-1,0,0);
deleteModule(myMod); deleteModule(myMod);
} else } else

1
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1949,6 +1949,7 @@ int set_module(int file_des) {
#endif #endif
#ifdef EIGERD #ifdef EIGERD
switch(myModule.reg){ switch(myModule.reg){
case GET_SETTINGS:
case STANDARD: case STANDARD:
case HIGHGAIN: case HIGHGAIN:
case LOWGAIN: case LOWGAIN: