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

basic common working version

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@592 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-06-11 11:44:46 +00:00
parent 7b9e12f8ff
commit 5e4feb9705
1 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -13,7 +13,6 @@
#include <string.h> #include <string.h>
//#if defined(EIGERD) || defined(GOTTHARDD) //#if defined(EIGERD) || defined(GOTTHARDD)
//#endif //#endif
@ -57,22 +56,8 @@ int init_detector(int b) {
//only for control server //only for control server
if(b){ if(b){
#ifdef SLS_DETECTOR_FUNCTION_LIST #ifdef SLS_DETECTOR_FUNCTION_LIST
initializeDetectorStructure(); initializeDetectorStructure();
setupDetector(); setupDetector();
/* all these should also be included in setupDetector */
//testFpga();
//testRAM();
//setSettings(GET_SETTINGS,-1);
//setFrames(1);
//setTrains(1);
//setExposureTime(1e6);
//setPeriod(1e9);
//setDelay(0);
//setGates(0);
//setTiming(GET_EXTERNAL_COMMUNICATION_MODE);
//setMaster(GET_MASTER);
//setSynchronization(GET_SYNCHRONIZATION_MODE);
#endif #endif
} }
strcpy(mess,"dummy message"); strcpy(mess,"dummy message");
@ -89,7 +74,7 @@ int decode_function(int file_des) {
#ifdef VERBOSE #ifdef VERBOSE
printf( "receive data\n"); printf( "receive data\n");
#endif #endif
n = receiveDataOnly(file_des,&fnum,sizeof(fnum)); n = receiveData(file_des,&fnum,sizeof(fnum),INT32);
if (n <= 0) { if (n <= 0) {
#ifdef VERBOSE #ifdef VERBOSE
printf("ERROR reading from socket %d, %d %d\n", n, fnum, file_des); printf("ERROR reading from socket %d, %d %d\n", n, fnum, file_des);
@ -102,10 +87,8 @@ int decode_function(int file_des) {
#endif #endif
#ifdef VERBOSE #ifdef VERBOSE
printf( "calling function fnum = %d %x\n",fnum,flist[fnum]); printf( "calling function fnum = %d %x\n",fnum,(unsigned int)flist[fnum]);
#endif #endif
printf( "calling function fnum = %x %x\n",fnum,(unsigned int)flist[fnum]);
if (fnum<0 || fnum>255) if (fnum<0 || fnum>255)
fnum=255; fnum=255;
ret=(*flist[fnum])(file_des); ret=(*flist[fnum])(file_des);
@ -1454,10 +1437,11 @@ int get_channel(int file_des) {
if (differentClients && ret==OK) if (differentClients && ret==OK)
ret=FORCE_UPDATE; ret=FORCE_UPDATE;
#ifdef MYTHEND
#ifdef VERBOSE #ifdef VERBOSE
printf("Returning channel %d %d %d, 0x%llx\n", retval.chan, retval.chip, retval.mod, (retval.reg)); printf("Returning channel %d %d %d, 0x%llx\n", retval.chan, retval.chip, retval.mod, (retval.reg));
#endif #endif
#endif
/* send answer */ /* send answer */
/* send OK/failed */ /* send OK/failed */
@ -1599,13 +1583,15 @@ int get_chip(int file_des) {
if (ret==OK) if (ret==OK)
ret=getChip(&retval); ret=getChip(&retval);
#endif #endif
#endif #endif
if (differentClients && ret==OK) if (differentClients && ret==OK)
ret=FORCE_UPDATE; ret=FORCE_UPDATE;
#ifdef MYTHEND
#ifdef VERBOSE #ifdef VERBOSE
printf("Returning chip %d %d\n", ichip, imod); printf("Returning chip %d %d\n", ichip, imod);
#endif #endif
#endif
/* send answer */ /* send answer */
/* send OK/failed */ /* send OK/failed */
@ -1944,7 +1930,7 @@ int set_threshold_energy(int file_des) {
int n; int n;
#if defined(MYTHEND) || defined(EIGERD) #if defined(MYTHEND) || defined(EIGERD)
int ethr, imod; int ethr, imod;
//enum detectorSettings isett; enum detectorSettings isett;
#endif #endif
n = receiveDataOnly(file_des,&arg,sizeof(arg)); n = receiveDataOnly(file_des,&arg,sizeof(arg));
@ -1956,16 +1942,14 @@ int set_threshold_energy(int file_des) {
#if defined(MYTHEND) || defined(EIGERD) #if defined(MYTHEND) || defined(EIGERD)
ethr=arg[0]; ethr=arg[0];
imod=arg[1]; imod=arg[1];
//isett=arg[2]; isett=arg[2];
#ifdef SLS_DETECTOR_FUNCTION_LIST #ifdef SLS_DETECTOR_FUNCTION_LIST
if (imod>=getTotalNumberOfModules()) { if (imod>=getTotalNumberOfModules()) {
ret=FAIL; ret=FAIL;
sprintf(mess,"Module number %d out of range\n",imod); sprintf(mess,"Module number %d out of range\n",imod);
} }
#ifdef VERBOSE
printf("Setting threshold energy of module %d to %d eV with settings %d\n", imod, ethr, isett); printf("Setting threshold energy of module %d to %d eV with settings %d\n", imod, ethr, isett);
#endif if (differentClients==1 && lockStatus==1) {
if (differentClients==1 && lockStatus==1) {
ret=FAIL; ret=FAIL;
sprintf(mess,"Detector locked by %s\n",lastClientIP); sprintf(mess,"Detector locked by %s\n",lastClientIP);
} else { } else {
@ -2175,9 +2159,6 @@ int start_and_read_all(int file_des) {
int read_frame(int file_des) { int read_frame(int file_des) {
#ifdef VERBOSE
int n;
#endif
dataret=OK; dataret=OK;
if (differentClients==1 && lockStatus==1) { if (differentClients==1 && lockStatus==1) {
dataret=FAIL; dataret=FAIL;
@ -2514,9 +2495,6 @@ int set_roi(int file_des) {
ROI arg[MAX_ROIS]; ROI arg[MAX_ROIS];
ROI* retval=0; ROI* retval=0;
int nroi=-1, n=0, retvalsize=0; int nroi=-1, n=0, retvalsize=0;
#ifdef VERBOSE
int i;
#endif
strcpy(mess,"Could not set/get roi\n"); strcpy(mess,"Could not set/get roi\n");
n = receiveDataOnly(file_des,&nroi,sizeof(nroi)); n = receiveDataOnly(file_des,&nroi,sizeof(nroi));