From b24f3741556045472036c6c4354b396a9e149d16 Mon Sep 17 00:00:00 2001 From: Maliakal Dhanya Date: Mon, 20 Oct 2014 17:33:22 +0200 Subject: [PATCH] setting number of frames had a bug in eiger server, refactored code a bit --- .../eigerDetectorServer/FebControl.c | 30 ++++++------------ .../eigerDetectorServer/Makefile | 2 +- .../bin/eigerDetectorServer | Bin 237506 -> 237506 bytes .../slsDetectorFunctionList.c | 30 ++++++------------ .../slsDetectorServer_funcs.c | 4 +-- 5 files changed, 22 insertions(+), 44 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/FebControl.c b/slsDetectorSoftware/eigerDetectorServer/FebControl.c index 68f90df72..475e1598d 100644 --- a/slsDetectorSoftware/eigerDetectorServer/FebControl.c +++ b/slsDetectorSoftware/eigerDetectorServer/FebControl.c @@ -1048,31 +1048,20 @@ int Feb_Control_WaitForFinishedFlag(int sleep_time_us){ int Feb_Control_AcquisitionInProgress(){ unsigned int status_reg_r=0,status_reg_l=0; - - /*printf("master right:%d\n",Feb_Control_GetDAQStatusRegister(Module_GetTopRightAddress(&modules[0]),&status_reg_r)); - printf("master left:%d\n",Feb_Control_GetDAQStatusRegister(Module_GetTopLeftAddress(&modules[0]),&status_reg_l)); - - - printf("top right:%d\n",Feb_Control_GetDAQStatusRegister(Module_GetTopRightAddress(&modules[1]),&status_reg_r)); - printf("top left:%d\n",Feb_Control_GetDAQStatusRegister(Module_GetTopLeftAddress(&modules[1]),&status_reg_l)); - if(Module_BottomAddressIsValid(&modules[1])){ - printf("bot right:%d\n",Feb_Control_GetDAQStatusRegister(Module_GetBottomRightAddress(&modules[1]),&status_reg_r)); - printf("bot left:%d\n",Feb_Control_GetDAQStatusRegister(Module_GetBottomLeftAddress(&modules[1]),&status_reg_l)); - } -*/ - if(Module_BottomAddressIsValid(&modules[1])){ - //printf("************* bottom1\n"); if(!(Feb_Control_GetDAQStatusRegister(Module_GetBottomRightAddress(&modules[1]),&status_reg_r))) - {printf("**bottom address wrong\n");return 0;} + {printf("ERROR: Trouble reading Status register. bottom right address\n");return 0;} + if(!(Feb_Control_GetDAQStatusRegister(Module_GetBottomLeftAddress(&modules[1]),&status_reg_l))) + {printf("ERROR: Trouble reading Status register. bottom left address\n");return 0;} + }else{ - //printf("************* top1\n"); if(!(Feb_Control_GetDAQStatusRegister(Module_GetTopRightAddress(&modules[1]),&status_reg_r))) - {printf("**top address wrong\n");return 0;} + {printf("ERROR: Trouble reading Status register. top right address\n");return 0;} + if(!(Feb_Control_GetDAQStatusRegister(Module_GetTopLeftAddress(&modules[1]),&status_reg_l))) + {printf("ERROR: Trouble reading Status register. top left address\n");return 0;} } - printf("runningggg 0x%x\n",status_reg_r); - if(status_reg_r&DAQ_STATUS_DAQ_RUNNING) {printf("**runningggg\n");return 1;} + if((status_reg_r|status_reg_l)&DAQ_STATUS_DAQ_RUNNING) {/*printf("**runningggg\n");*/return 1;} /* if(!(GetDAQStatusRegister(modules[i]->Module_GetTopLeftAddress(),status_reg_r)&&GetDAQStatusRegister(modules[i]->Module_GetTopRightAddress(),status_reg_l))){ @@ -1083,7 +1072,8 @@ int Feb_Control_AcquisitionInProgress(){ } */ - printf("**idle\n");return 0; //i.e. not running (status_reg_r|status_reg_l)&DAQ_STATUS_DAQ_RUNNING; + /*printf("**idle\n");*/ + return 0; //i.e. not running (status_reg_r|status_reg_l)&DAQ_STATUS_DAQ_RUNNING; } int Feb_Control_Reset(){ diff --git a/slsDetectorSoftware/eigerDetectorServer/Makefile b/slsDetectorSoftware/eigerDetectorServer/Makefile index 046fd22eb..26b190032 100755 --- a/slsDetectorSoftware/eigerDetectorServer/Makefile +++ b/slsDetectorSoftware/eigerDetectorServer/Makefile @@ -1,6 +1,6 @@ CC = powerpc-4xx-softfloat-gcc CCX = powerpc-4xx-softfloat-g++ -CFLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DSTOP_SERVER #-DVERBOSE #-DVIRTUAL -DPCCOMPILE +CFLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT #-DSTOP_SERVER #-DVERBOSE #-DVIRTUAL -DPCCOMPILE LDLIBS += -lm -lstdc++ PROGS = eigerDetectorServer diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index b39fdb2c55bd19f3d7532f39709a4c42ce177592..bd9ae619f3e5a7c6be9a4172f71c5c0007efb3c7 100755 GIT binary patch delta 26393 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 delta 26461 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 0){ - printf(" Setting number of frames: %d\n",(unsigned int)val); - if(Feb_Control_SetNExposures((unsigned int)val)*eiger_ncycles){ + printf(" Setting number of frames: %d * %d\n",(unsigned int)val,eiger_ncycles); + if(Feb_Control_SetNExposures((unsigned int)val*eiger_ncycles)){ eiger_nexposures = val; //SetDestinationParameters(EigerGetNumberOfExposures()*EigerGetNumberOfCycles()); on_dst = 0; @@ -587,7 +575,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val){ return EigerGetNumberOfExposures();*/ case CYCLES_NUMBER: if(val >= 0){ - printf(" Setting number of triggers: %d\n",(unsigned int)val); + printf(" Setting number of triggers: %d * %d\n",(unsigned int)val,eiger_nexposures); if(Feb_Control_SetNExposures((unsigned int)val*eiger_nexposures)){ eiger_ncycles = val; //SetDestinationParameters(EigerGetNumberOfExposures()*EigerGetNumberOfCycles()); diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 2dc6e1b98..1e8e31ed8 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -2275,9 +2275,9 @@ int get_run_status(int file_des) { enum runStatus s; sprintf(mess,"getting run status\n"); -//#ifdef VERBOSE +#ifdef VERBOSE printf("Getting status\n"); -//#endif +#endif #ifdef SLS_DETECTOR_FUNCTION_LIST s= getRunStatus();printf("status:%d\n"); #endif