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

changing the mess return from acq finished eiger server:trial for 9m lag bug

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-27 09:20:21 +02:00
parent d38989b340
commit 391ad67e8c
4 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.2.0.16.1 Executable file
View File

Binary file not shown.

31
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -858,25 +858,22 @@ enum runStatus getRunStatus(){
char *readFrame(int *ret, char *mess){
//if(master){
if(!Feb_Control_WaitForFinishedFlag(5000))
cprintf(RED,"Error: Waiting for finished flag\n");
cprintf(GREEN,"Acquisition finished***\n");
void readFrame(int *ret, char *mess){
if(!Feb_Control_WaitForFinishedFlag(5000))
cprintf(RED,"Error: Waiting for finished flag\n");
cprintf(GREEN,"Acquisition finished***\n");
if(eiger_storeinmem){
printf("requesting images after storing in memory\n");
if(startReadOut() == FAIL){
cprintf(RED, "Could not read out images\n");
*ret = (int)FAIL;
return NULL;
}
if(eiger_storeinmem){
printf("requesting images after storing in memory\n");
if(startReadOut() == FAIL){
strcpy(mess,"Could not execute read image requests\n");
*ret = (int)FAIL;
return;
}
//usleep(1000000);
printf("*****Done Waiting...\n");
//}
*ret = (int)FINISHED;
return NULL;
}
printf("*****Done Waiting...\n");
*ret = (int)FINISHED;
strcpy(mess,"acquisition successfully finished\n");
}