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

settings fixed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@107 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-01-17 10:47:21 +00:00
parent 3e8f916561
commit 918bcd3836
6 changed files with 81 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -73,7 +73,7 @@ int init_detector( int b) {
setDummyRegister();
setPhaseShiftOnce();
setDAQRegister();
setSettings(GET_SETTINGS);
setSettings(GET_SETTINGS,-1);
//testRAM();
@ -1435,10 +1435,6 @@ int set_module(int file_des) {
} else {
#ifdef MCB_FUNCS
retval=initModulebyNumber(myModule);
if(retval==-1){
ret=FAIL;
strcpy(mess,"Cannot set this settings as confGain register read back weird value\n");
}
#endif
}
}
@ -1712,10 +1708,10 @@ int set_settings(int file_des) {
sprintf(mess,"Detector locked by %s\n",lastClientIP);
} else {
#ifdef MCB_FUNCS
retval=setSettings(arg[0]);
retval=setSettings(arg[0],imod);
#endif
#ifdef VERBOSE
printf("Settings changed to %d\n", isett);
printf("Settings changed to %d\n",retval);
#endif
if (retval==isett || isett<0) {