From 8df3541e4728b208f833c24789ab8238c5e2fea8 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Mon, 3 Dec 2012 09:45:50 +0000 Subject: [PATCH] some insignificant tuning in slsReceiver git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@364 951219d9-93cf-4727-9268-0efd64621fa3 --- .../slsReceiver/slsReceiver_funcs.cpp | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp b/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp index e092f2141..79974482f 100644 --- a/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp +++ b/slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp @@ -576,6 +576,7 @@ int slsReceiverFuncs::read_frame(){ int index=-1,index2=-1; int startIndex=-1; + int count=0; strcpy(mess,"Could not read frame\n"); @@ -584,31 +585,28 @@ int slsReceiverFuncs::read_frame(){ #ifdef SLS_RECEIVER_FUNCTION_LIST //wait till you get first frame 1. to get index(from startindex 2. filename corresponds to buffer value - if(startIndex==-1){ - ret=FAIL; - strcpy(mess,"did not start index\n"); - for(int i=0;i<10;i++){ - startIndex=slsReceiverList->getStartFrameIndex(); - if(startIndex==-1) - usleep(1000000); - else { - ret=OK; - break; - } - } + ret=FAIL; + strcpy(mess,"did not start index\n"); + for(int i=0;i<10;i++){ + startIndex=slsReceiverList->getStartFrameIndex(); + if(startIndex!=-1){ + ret=OK; + break; + }else + usleep(1000000); } + //got atleast first frame, read buffer if(ret==OK){ - int count=0; ret=FAIL; while(count<20){ //get frame raw=slsReceiverList->readFrame(fName); - //(int)(*(int*)buffer) index=(int)(*(int*)raw); index2= (int)(*((int*)((char*)(raw+onebuffersize)))); memcpy(origVal,raw,BUFFER_SIZE); + raw=NULL; //cout<<"index:"<