implemented getting ids for eiger. also id ret should be int64_t

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@630 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-07-10 15:58:43 +00:00
parent cf30612701
commit 8720f960e7
7 changed files with 74 additions and 11 deletions

View File

@ -1871,6 +1871,7 @@ int set_settings(int file_des) {
}
imod=arg[1];
isett=arg[0];
printf("isett:%d, imod =%d\n",isett,imod);
#ifdef SLS_DETECTOR_FUNCTION_LIST
if (imod>=getTotalNumberOfModules()) {
@ -1882,11 +1883,11 @@ int set_settings(int file_des) {
printf("Changing settings of module %d to %d\n", imod, isett);
#endif
if (differentClients==1 && lockStatus==1 && arg[0]!=GET_SETTINGS) {
if (differentClients==1 && lockStatus==1 && isett!=GET_SETTINGS) {
ret=FAIL;
sprintf(mess,"Detector locked by %s\n",lastClientIP);
} else {
retval=setSettings(arg[0], imod);
retval=setSettings(isett, imod);
#ifdef VERBOSE
printf("Settings changed to %d\n", isett);
#endif