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

solved bug on the number of chans of multiSlsDetector

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@697 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2013-11-21 15:57:57 +00:00
parent 3b3e4eb8c3
commit 1ed2ba63b5
13 changed files with 125 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/mythenDetectorServer/mythenDetectorServer
View File

Binary file not shown.

66
slsDetectorSoftware/mythenDetectorServer/server_funcs.c
View File

@ -2242,14 +2242,74 @@ int set_dynamic_range(int file_des) {
int set_roi(int file_des) {
return FAIL;
int arg=-1;
int n;
ROI roiLimits[MAX_ROIS];
int ret=OK;
ROI retval;
int nm=setNMod(-1), nmax=getNModBoard(), nroi;
sprintf(mess,"can't set ROI\n");
n = receiveDataOnly(file_des,&arg,sizeof(arg));
if(arg>0){
n+=receiveDataOnly(file_des,roiLimits,arg*sizeof(ROI));
}
if (arg>1) {
ret=FAIL;
sprintf(mess,"can't set more than 1 ROI per detector\n");
} else
ret=OK;
if (arg>0) {
nm=(roiLimits[0].xmax-1)/1280+1;
if (roiLimits[0].xmin>0) {
roiLimits[0].xmin=0;
ret=FAIL;
sprintf(mess,"ROI starts at 0\n");
}
if (nm>nmax) {
retval.xmax=setNMod(-1)*1280;
ret=FAIL;
sprintf(mess,"ROI max larger than detector size\n");
}
} else if (arg==0) {
setNMod(nmax);
}
n = sendDataOnly(file_des,&ret,sizeof(ret));
if (ret==FAIL) {
n = sendDataOnly(file_des,mess,sizeof(mess));
} else {
retval.xmin=0;
retval.xmax=setNMod(-1)*1280;
retval.ymin=0;
retval.ymax=0;
if (setNMod(-1)<nmax)
nroi=1;
else
nroi=0;
n = sendDataOnly(file_des,&nroi,sizeof(nroi));
if (nroi)
n = sendDataOnly(file_des,&retval,nroi*sizeof(retval));
}
return ret;
}
int get_roi(int file_des) {
return set_roi(file_des);
return FAIL;
}
int set_speed(int file_des) {