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

eiger server edited to include set timer, settingsand stop server for the time being

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@631 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-07-11 09:06:37 +00:00
parent 8720f960e7
commit 036d72fec8
6 changed files with 66 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -362,37 +362,36 @@ int send_update(int file_des) {
int ret=OK;
enum detectorSettings t;
int thr, n = 0;
// int it;
int64_t retval;/*, tns=-1;*/
int nm;
int n = 0, nm = 0;
int64_t retval = 0;
n += sendData(file_des,lastClientIP,sizeof(lastClientIP),OTHER);
/*nm=setNMod(-1,X);*/
nm=setNMod(GET_FLAG,X);
n += sendData(file_des,&nm,sizeof(nm),INT32);
/*nm=setNMod(-1,Y);*/
nm=setNMod(GET_FLAG,Y);
n += sendData(file_des,&nm,sizeof(nm),INT32);
/*nm=setDynamicRange(-1);*/
nm=setDynamicRange(GET_FLAG);
n += sendData(file_des,&nm,sizeof(nm),INT32);
n += sendData(file_des,&dataBytes,sizeof(dataBytes),INT32);
/*t=setSettings(GET_SETTINGS, -1);*/
t=setSettings(GET_SETTINGS, GET_FLAG);
n += sendData(file_des,&t,sizeof(t),INT32);
/*thr=getThresholdEnergy(-1);*/
n += sendData(file_des,&thr,sizeof(thr),INT32);
/*retval=setFrames(tns);*/
nm=getThresholdEnergy(GET_FLAG);
n += sendData(file_des,&nm,sizeof(nm),INT32);
retval=setTimer(FRAME_NUMBER,GET_FLAG);
n += sendData(file_des,&retval,sizeof(int64_t),INT64);
/*retval=setExposureTime(tns);*/
retval=setTimer(ACQUISITION_TIME,GET_FLAG);
n += sendData(file_des,&retval,sizeof(int64_t),INT64);
/*retval=setPeriod(tns);*/
retval=setTimer(FRAME_PERIOD,GET_FLAG);
n += sendData(file_des,&retval,sizeof(int64_t),INT64);
/*retval=setDelay(tns);*/
retval=setTimer(DELAY_AFTER_TRIGGER,GET_FLAG);
n += sendData(file_des,&retval,sizeof(int64_t),INT64);
/*retval=setGates(tns);*/
retval=setTimer(GATES_NUMBER,GET_FLAG);
n += sendData(file_des,&retval,sizeof(int64_t),INT64);
/*retval=setProbes(tns);*/
n += sendData(file_des,&retval,sizeof(int64_t),INT64);
/*retval=setTrains(tns);*/
/* retval=setTimer(PROBES_NUMBER,GET_FLAG);
n += sendData(file_des,&retval,sizeof(int64_t),INT64);*/
retval=setTimer(CYCLES_NUMBER,GET_FLAG);
n += sendData(file_des,&retval,sizeof(int64_t),INT64);
if (lockStatus==0) {
@ -401,7 +400,6 @@ int send_update(int file_des) {
return ret;
}