detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-29 09:30:02 +02:00
Code Issues Actions Packages Releases Activity

beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-06-12 17:45:43 +02:00
parent b193237df3
commit b11b7c1c09
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/eigerDetectorServer/Beb.c
View File

@ -568,6 +568,7 @@ int Beb_StopAcquisition()
*(ptrl+7) = 0; *(ptrl+7) = 0;
*(ptrr+7) = 0; *(ptrr+7) = 0;
close(fd); close(fd);
return 1;
} }
int Beb_RequestNImages(unsigned int beb_number, int ten_gig, unsigned int dst_number, unsigned int nimages, int test_just_send_out_packets_no_wait){ int Beb_RequestNImages(unsigned int beb_number, int ten_gig, unsigned int dst_number, unsigned int nimages, int test_just_send_out_packets_no_wait){
@ -637,9 +638,8 @@ int Beb_RequestNImages(unsigned int beb_number, int ten_gig, unsigned int dst_nu
ptrl = (u_int32_t*)(CSP0BASE); ptrl = (u_int32_t*)(CSP0BASE);
ptrr = (u_int32_t*)(CSP0BASE+0x100); ptrr = (u_int32_t*)(CSP0BASE+0x100);
int i;
#ifdef MARTIN #ifdef MARTIN
int i;
for (i=0; i < 10; i++) for (i=0; i < 10; i++)
printf("%X\n",*(ptrl+i)); printf("%X\n",*(ptrl+i));
#endif #endif

2
slsDetectorSoftware/eigerDetectorServer/Makefile
View File

@ -1,6 +1,6 @@
CC = powerpc-4xx-softfloat-gcc CC = powerpc-4xx-softfloat-gcc
CCX = powerpc-4xx-softfloat-g++ CCX = powerpc-4xx-softfloat-g++
CFLAGS += -Wall -DDACS_INT -DMARTIN -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DSTOP_SERVER #-DVERBOSE #-DVIRTUAL -DPCCOMPILE -DMARTIN CFLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DSTOP_SERVER #-DVERBOSE #-DVIRTUAL -DPCCOMPILE -DMARTIN
LDLIBS += -lm -lstdc++ LDLIBS += -lm -lstdc++
PROGS = eigerDetectorServer PROGS = eigerDetectorServer

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

3
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -530,6 +530,7 @@ int stopStateMachine(){
printf("Going to stop acquisition\n"); printf("Going to stop acquisition\n");
if(Feb_Control_StopAcquisition() & Beb_StopAcquisition()) if(Feb_Control_StopAcquisition() & Beb_StopAcquisition())
return OK; return OK;
printf("failed to stop acquisition\n");
return FAIL; return FAIL;
} }
@ -537,7 +538,7 @@ int stopStateMachine(){
int startReadOut(){ int startReadOut(){
//RequestImages(); //RequestImages();
int ret_val = 0, i; int ret_val = 0;
dst_requested[0] = 1; dst_requested[0] = 1;
while(dst_requested[on_dst]){ while(dst_requested[on_dst]){
//waits on data //waits on data

2
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -555,7 +555,7 @@ void* postProcessing::processData(int delflag) {
#endif #endif
pthread_mutex_unlock(&mg); pthread_mutex_unlock(&mg);
//go through once more to get last nth frame data //go through once more to get last nth frame data
if (acquiringDone >= 2){ if (acquiringDone >= 4){
if((!nthframe) ||(!newData)){ if((!nthframe) ||(!newData)){
#ifdef VERY_VERY_DEBUG #ifdef VERY_VERY_DEBUG
cout << "gonna post for it to end" << endl; cout << "gonna post for it to end" << endl;

4
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -2197,9 +2197,9 @@ int stop_acquisition(int file_des) {
sprintf(mess,"can't stop acquisition\n"); sprintf(mess,"can't stop acquisition\n");
#ifdef VERBOSE //#ifdef VERBOSE
printf("Stopping acquisition\n"); printf("Stopping acquisition\n");
#endif //#endif
#ifdef SLS_DETECTOR_FUNCTION_LIST #ifdef SLS_DETECTOR_FUNCTION_LIST
if (differentClients==1 && lockStatus==1) { if (differentClients==1 && lockStatus==1) {
ret=FAIL; ret=FAIL;