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

settings initially at UNINITIALIZED in eiger server

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-09-22 17:16:49 +02:00
parent 6adc373e18
commit a7c180eb1c
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.5.14.3 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.1.0.14.0
View File

Binary file not shown.

6
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -130,7 +130,7 @@ int initDetector(){
detectorGain[i] = default_gain_values[(int)STANDARD]; detectorGain[i] = default_gain_values[(int)STANDARD];
for(i=0;i<NOFFSET;i++) for(i=0;i<NOFFSET;i++)
detectorOffset[i] = default_offset_values[(int)STANDARD]; detectorOffset[i] = default_offset_values[(int)STANDARD];
thisSettings = STANDARD;/**UNITIALIZED*/ thisSettings = UNINITIALIZED;
/*sChan=noneSelected; /*sChan=noneSelected;
sChip=noneSelected; sChip=noneSelected;
sMod=noneSelected; sMod=noneSelected;
@ -731,7 +731,9 @@ int setThresholdEnergy(int ev, int imod){
} }
enum detectorSettings setSettings(enum detectorSettings sett, int imod){ enum detectorSettings setSettings(enum detectorSettings sett, int imod){
if(sett != GET_SETTINGS) if(sett == UNINITIALIZED){
return thisSettings;
}if(sett != GET_SETTINGS)
thisSettings = sett; thisSettings = sett;
return thisSettings; return thisSettings;
} }

1
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1932,6 +1932,7 @@ int set_module(int file_des) {
case LOWGAIN: case LOWGAIN:
case VERYHIGHGAIN: case VERYHIGHGAIN:
case VERYLOWGAIN: case VERYLOWGAIN:
case UNINITIALIZED:
break; break;
default: default:
sprintf(mess,"This setting %d does not exist for this detector\n",myModule.reg); sprintf(mess,"This setting %d does not exist for this detector\n",myModule.reg);