detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 17:58:05 +01:00
Code Issues Actions Packages Releases Activity

threshold for gottahrd shouldnt exist

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@459 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-02-11 13:54:14 +00:00
parent 11eea73138
commit e324d5ec83
1 changed files with 14 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@@ -1562,121 +1562,55 @@ int get_module(int file_des) {
free(myAdc); free(myAdc);
/*return ok/fail*/ /*return ok/fail*/
return ret; return ret;
} }
int get_threshold_energy(int file_des) { int get_threshold_energy(int file_des) {
int retval; int ret=FAIL;
int ret=OK;
int n; int n;
int imod; int imod;
strcpy(mess,"cannot set threshold for gotthard");
n = receiveDataOnly(file_des,&imod,sizeof(imod)); n = receiveDataOnly(file_des,&imod,sizeof(imod));
if (n < 0) { if (n < 0)
sprintf(mess,"Error reading from socket\n"); sprintf(mess,"Error reading from socket\n");
ret=FAIL;
}
#ifdef VERBOSE
printf("Getting threshold energy of module %d\n", imod);
#endif
#ifdef MCB_FUNCS
retval=getThresholdEnergy();
#endif
#ifdef VERBOSE
printf("Threshold is %d eV\n", retval);
#endif
if (differentClients==1 && ret==OK)
ret=FORCE_UPDATE;
/* send answer */ /* send answer */
n = sendDataOnly(file_des,&ret,sizeof(ret)); n = sendDataOnly(file_des,&ret,sizeof(ret));
if (ret==FAIL) { n += sendDataOnly(file_des,mess,sizeof(mess));
n += sendDataOnly(file_des,mess,sizeof(mess));
} else
n += sendDataOnly(file_des,&retval,sizeof(retval));
/* Maybe this is done inside the initialization funcs */
//detectorDacs[imod][ind]=val;
/*return ok/fail*/ /*return ok/fail*/
return ret; return ret;
} }
int set_threshold_energy(int file_des) { int set_threshold_energy(int file_des) {
int retval; int ret=FAIL;
int ret=OK;
int arg[3]; int arg[3];
int n; int n;
int ethr, imod;
enum detectorSettings isett;
strcpy(mess,"cannot set threshold for gotthard");
n = receiveDataOnly(file_des,&arg,sizeof(arg)); n = receiveDataOnly(file_des,&arg,sizeof(arg));
if (n < 0) { if (n < 0)
sprintf(mess,"Error reading from socket\n"); sprintf(mess,"Error reading from socket\n");
ret=FAIL;
}
ethr=arg[0];
imod=arg[1];
isett=arg[2];
#ifdef VERBOSE
printf("Setting threshold energy of module %d to %d eV with settings %d\n", imod, ethr, isett);
#endif
if (differentClients==1 && lockStatus==1) {
ret=FAIL;
sprintf(mess,"Detector locked by %s\n",lastClientIP);
} else {
#ifdef MCB_FUNCS
retval=setThresholdEnergy(ethr);
#endif
}
#ifdef VERBOSE
printf("Threshold set to %d eV\n", retval);
#endif
if (retval==ethr)
ret=OK;
else {
ret=FAIL;
printf("Setting threshold of module %d: wrote %d but read %d\n", imod, ethr, retval);
sprintf(mess,"Setting threshold of module %d: wrote %d but read %d\n", imod, ethr, retval);
}
if (ret==OK && differentClients==1)
ret=FORCE_UPDATE;
/* send answer */ /* send answer */
n = sendDataOnly(file_des,&ret,sizeof(ret)); n = sendDataOnly(file_des,&ret,sizeof(ret));
if (ret==FAIL) { n += sendDataOnly(file_des,mess,sizeof(mess));
n += sendDataOnly(file_des,mess,sizeof(mess));
} else
n += sendDataOnly(file_des,&retval,sizeof(retval));
/* Maybe this is done inside the initialization funcs */
//detectorDacs[imod][ind]=val;
/*return ok/fail*/ /*return ok/fail*/
return ret; return ret;
} }
int set_settings(int file_des) { int set_settings(int file_des) {