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

bottom allowed

Browse Source
This commit is contained in:
Maliakal Dhanya 2014-12-04 10:49:15 +01:00
parent 8dd7772bfe
commit d76200e68d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

11
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -478,7 +478,7 @@ enum detectorSettings setSettings(enum detectorSettings sett, int imod){
int startReceiver(int d){ int startReceiver(int d){
//if(trialMasterMode == IS_MASTER) //if(trialMasterMode == IS_MASTER)
//if(!bottom) if(!bottom)
Feb_Control_PrepareForAcquisition(); Feb_Control_PrepareForAcquisition();
return OK; return OK;
} }
@ -487,10 +487,10 @@ int startReceiver(int d){
int startStateMachine(){ int startStateMachine(){
int ret;int i=0; int ret;int i=0;
//if(trialMasterMode == IS_MASTER){ //if(trialMasterMode == IS_MASTER){
//if(!bottom){ if(!bottom){
printf("Going to start acquisition\n"); printf("Going to start acquisition\n");
Feb_Control_StartAcquisition(); Feb_Control_StartAcquisition();
//} }
//do not read status here, cannot get images then //do not read status here, cannot get images then
@ -499,8 +499,9 @@ int ret;int i=0;
ret = startReadOut(); ret = startReadOut();
////} ////}
//if(trialMasterMode == IS_MASTER){ //if(trialMasterMode == IS_MASTER){
//if(!bottom){
if(!bottom){
/* /*
if(getRunStatus() == IDLE){ if(getRunStatus() == IDLE){
for(i=0;i<100000;i++){ for(i=0;i<100000;i++){
@ -521,7 +522,7 @@ int ret;int i=0;
printf("*****Acquiring...\n"); printf("*****Acquiring...\n");
//} }
/*else usleep(1000000); /*else usleep(1000000);
printf("****Returning\n");*/ printf("****Returning\n");*/