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

fixed frames from receiver to flip accordingly, also display frame index as not visible from filename

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@345 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-11-15 11:19:50 +00:00
parent 89ddfa9b51
commit e4e46920cd
15 changed files with 131 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3733,7 +3733,7 @@ int multiSlsDetector::resetFramesCaught(int index) {
int* multiSlsDetector::readFrameFromReceiver(){
int* multiSlsDetector::readFrameFromReceiver(char* fName, int &fIndex){
int nel=(thisMultiDetector->dataBytes)/sizeof(int);
int n;
int* retval=new int[nel];
@ -3741,7 +3741,7 @@ int* multiSlsDetector::readFrameFromReceiver(){
for (int id=0; id<thisMultiDetector->numberOfDetectors; id++) {
if (detectors[id]) {
retdet=detectors[id]->readFrameFromReceiver();
retdet=detectors[id]->readFrameFromReceiver(fName,fIndex);
if (retdet) {
n=detectors[id]->getDataBytes();
memcpy(p,retdet,n);

5
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1094,9 +1094,12 @@ class multiSlsDetector : public slsDetectorUtils {
int resetFramesCaught(int index=-1);
/**
* Reads a frame from receiver
* @param fName file name of current frame()
* @param fIndex current frame index
/returns a frame read from recever
*/
int* readFrameFromReceiver();
int* readFrameFromReceiver(char* fName, int &fIndex);
/** Locks/Unlocks the connection to the receiver
/param lock sets (1), usets (0), gets (-1) the lock

12
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5678,12 +5678,13 @@ int slsDetector::resetFramesCaught(int index){
int* slsDetector::readFrameFromReceiver(){
int* slsDetector::readFrameFromReceiver(char* fName, int &fIndex){
//cout<<"databytes:"<<thisDetector->dataBytes<<" headerlength:"<<HEADERLENGTH<<endl;
int fnum=F_READ_FRAME;
int nel=(thisDetector->dataBytes+HEADERLENGTH)/sizeof(int);//2572/
int* retval=new int[nel];
int* origVal=new int[nel];
int arg[2];
int ret=FAIL;
int n;
char mess[100]="Nothing";
@ -5705,6 +5706,8 @@ int* slsDetector::readFrameFromReceiver(){
delete [] retval;
return NULL;
} else {
n=dataSocket->ReceiveDataOnly(fName,MAX_STR_LENGTH);
n=dataSocket->ReceiveDataOnly(arg,sizeof(arg));
n=dataSocket->ReceiveDataOnly(origVal,thisDetector->dataBytes+HEADERLENGTH);
#ifdef VERBOSE
std::cout<< "Received "<< n << " data bytes" << std::endl;
@ -5717,9 +5720,16 @@ int* slsDetector::readFrameFromReceiver(){
return NULL;
}//worked
else{
fIndex=arg[0];
if(arg[1]){
memcpy(retval,((char*) origVal)+2, getDataBytes()/2);
memcpy((((char*)retval)+getDataBytes()/2), ((char*) origVal)+8+getDataBytes()/2, getDataBytes()/2);
}
else{
memcpy((((char*)retval)+getDataBytes()/2),((char*) origVal)+2, getDataBytes()/2);
memcpy(retval, ((char*) origVal)+8+getDataBytes()/2, getDataBytes()/2);
}
}
}
dataSocket->Disconnect();
}

5
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1467,9 +1467,12 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int resetFramesCaught(int index=-1);
/**
* Reads a frame from receiver
* @param fName file name of current frame()
* @param fIndex current frame index
/returns a frame read from recever
*/
int* readFrameFromReceiver();
int* readFrameFromReceiver(char* fName, int &fIndex);
/** Locks/Unlocks the connection to the receiver
/param lock sets (1), usets (0), gets (-1) the lock

5
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -465,9 +465,12 @@ class slsDetectorBase : public virtual slsDetectorDefs {
/**
* Reads a frame from receiver
* @param fName file name of current frame()
* @param fIndex current frame index
/returns a frame read from recever
*/
virtual int* readFrameFromReceiver()=0;
virtual int* readFrameFromReceiver(char* fName, int &fIndex)=0;
/** returns detector type string from detector type index
\param t string can be Mythen, Pilatus, Eiger, Gotthard, Agipd, Unknown

2
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -222,7 +222,7 @@ void slsDetectorUsers::finalizeDataset(double *a, double *v, double *e, int &np)
void slsDetectorUsers::registerDataCallback(int( *userCallback)(detectorData*, void*), void *pArg){
void slsDetectorUsers::registerDataCallback(int( *userCallback)(detectorData*, int, void*), void *pArg){
myDetector->registerDataCallback(userCallback,pArg);
}

2
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -382,7 +382,7 @@ class slsDetectorUsers
\param userCallback function for plotting/analyzing the data
*/
void registerDataCallback(int( *userCallback)(detectorData*, void*), void *pArg);
void registerDataCallback(int( *userCallback)(detectorData*, int, void*), void *pArg);
/**
@short register callback for accessing raw data - if the rawDataCallback is registered, no filewriting/postprocessing will be carried on automatically by the software - the raw data are deleted by the software

5
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -629,9 +629,12 @@ virtual int getCurrentFrameIndex()=0;
virtual int resetFramesCaught(int index=-1)=0;
/**
* Reads a frame from receiver
* @param fName file name of current frame()
* @param fIndex current frame index
/returns a frame read from recever
*/
virtual int* readFrameFromReceiver()=0;
virtual int* readFrameFromReceiver(char* fName, int &fIndex)=0;
protected:

19
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -131,7 +131,7 @@ void postProcessing::processFrame(int *myData, int delflag) {
} else
if (dataReady){
thisData=new detectorData(fdata,NULL,NULL,getCurrentProgress(),(fname+string(".raw")).c_str(),getTotalNumberOfChannels());
dataReady(thisData, pCallbackArg);
dataReady(thisData, -1, pCallbackArg);
delete thisData;
fdata=NULL;
}
@ -243,7 +243,7 @@ void postProcessing::doProcessing(double *lfdata, int delflag, string fname) {
if (dataReady) {
thisData=new detectorData(val,err,ang,getCurrentProgress(),(fname+ext).c_str(),np);
dataReady(thisData, pCallbackArg);
dataReady(thisData, -1, pCallbackArg);
delete thisData;
ang=NULL;
val=NULL;
@ -390,6 +390,10 @@ void* postProcessing::processData(int delflag) {
pthread_mutex_unlock(&mg);
int caught=0;
bool newData=false;
char currentfName[MAX_STR_LENGTH];
int currentfIndex=0;
while(1){
if (checkJoinThread()) break;
usleep(200000);
@ -399,12 +403,15 @@ void* postProcessing::processData(int delflag) {
pthread_mutex_unlock(&mg);
incrementProgress(caught-prevCaught);
if(caught-prevCaught) newData=true;
else newData=false;
prevCaught=caught;
if (checkJoinThread()) break;
//if(progress_call)
// progress_call(getCurrentProgress(),pProgressCallArg);
if(newData){
pthread_mutex_lock(&mg);
int* receiverData = readFrameFromReceiver();
int* receiverData = readFrameFromReceiver(currentfName,currentfIndex);
pthread_mutex_unlock(&mg);
if(!receiverData)
@ -413,13 +420,13 @@ void* postProcessing::processData(int delflag) {
delete [] receiverData;
if(fdata){
if (dataReady) {
thisData=new detectorData(fdata,NULL,NULL,getCurrentProgress(),(getCurrentFileName()+string(".raw")).c_str(),getTotalNumberOfChannels());
dataReady(thisData, pCallbackArg);
thisData=new detectorData(fdata,NULL,NULL,getCurrentProgress(),currentfName,getTotalNumberOfChannels());
dataReady(thisData, currentfIndex, pCallbackArg);
delete thisData;
fdata=NULL;
}
}
}
}
}

4
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
View File

@ -235,7 +235,7 @@ s
void ResetPositionIndex(){pthread_mutex_lock(&mp); resetPositionIndex(); pthread_mutex_unlock(&mp);};
void registerDataCallback(int( *userCallback)(detectorData*, void*), void *pArg) {dataReady = userCallback; pCallbackArg = pArg;};
void registerDataCallback(int( *userCallback)(detectorData*, int, void*), void *pArg) {dataReady = userCallback; pCallbackArg = pArg;};
void registerRawDataCallback(int( *userCallback)(double*, int, void*), void *pArg) {rawDataReady = userCallback; pRawDataArg = pArg;};
@ -328,7 +328,7 @@ s
private:
double *fdata;
int (*dataReady)(detectorData*,void*);
int (*dataReady)(detectorData*,int, void*);
void *pCallbackArg;
int (*rawDataReady)(double*,int,void*);

27
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.c
View File

@ -50,7 +50,7 @@ int sockfd;
FILE *sfilefd;
char savefilename[128];
char filePath[MAX_STR_LENGTH]="";
char fileName[MAX_STR_LENGTH]="run";
int fileIndex=0;
@ -140,7 +140,9 @@ int setFileIndex(int index){
int getStartFrameIndex(){
return startFrameIndex;
}
@ -192,8 +194,6 @@ void* startListening(void *arg){
sd = -1;
int rc1, rc2, rc;
int currframenum, prevframenum;
// char buffer2[BUFFER_LENGTH];
char savefilename[128];
struct sockaddr_in serveraddr;
struct sockaddr_in clientaddr;
@ -212,9 +212,9 @@ void* startListening(void *arg){
//create file name
if(!frameIndexNeeded)
sprintf(savefilename, "%s/%s_%d.dat", filePath,fileName,fileIndex);
sprintf(savefilename, "%s/%s_%d.raw", filePath,fileName,fileIndex);
else
sprintf(savefilename, "%s/%s_f%012d_%d.dat", filePath,fileName,framesCaught,fileIndex);
sprintf(savefilename, "%s/%s_f%012d_%d.raw", filePath,fileName,framesCaught,fileIndex);
/***********************************************************************/
/* A do/while(FALSE) loop is used to make error cleanup easier. The */
@ -270,9 +270,9 @@ void* startListening(void *arg){
getFrameIndex();
//create file name
if(!frameIndexNeeded)
sprintf(savefilename, "%s/%s_%d.dat", filePath,fileName,fileIndex);
sprintf(savefilename, "%s/%s_%d.raw", filePath,fileName,fileIndex);
else
sprintf(savefilename, "%s/%s_f%012d_%d.dat", filePath,fileName,framesCaught,fileIndex);
sprintf(savefilename, "%s/%s_f%012d_%d.raw", filePath,fileName,framesCaught,fileIndex);
printf("saving to %s\t\tpacket loss %f %%\t\tframenum %d\n", savefilename,((currframenum-prevframenum-(2*framesInFile))/(double)(2*framesInFile))*100.000,currframenum);
sfilefd = fopen((const char *) (savefilename), "w");
@ -390,15 +390,8 @@ int stopReceiver(){
}
char* readFrame(){
int i;
for(i=0;i<20;i++){
if ((((int)*((int*)buffer))%2)!=0)
break;
else
usleep(20000);
}
//printf("freamenum%d\n",*((int*) sendbuffer));
char* readFrame(char* fName){
strcpy(fName,savefilename);
return buffer;
}

4
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.h
View File

@ -24,7 +24,9 @@ void* startListening(void *arg);
int startReceiver();
int stopReceiver();
char* readFrame();
char* readFrame(char *fName);
int getStartFrameIndex();
//int setUDPPortNumber(int p=-1); //sets/gets port number to listen to for data from the detector
//int setTCPPortNumber(int p=-1); //sets/get port number for communication to client

60
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.c
View File

@ -527,32 +527,82 @@ int reset_frames_caught(int file_des) {
int read_frame(int file_des) {
int ret=OK;
int n=0;
int n=0,i,startIndex=-1;
char* retval=NULL;
char buffer[1286*2];
char fName[MAX_STR_LENGTH];
int arg[2];
arg[1]=1;//do not flip
int index=-1,index2=-1,fIndex=-1;;
strcpy(mess,"Could not read frame\n");
/* execute action if the arguments correctly arrived*/
#ifdef SLS_RECEIVER_FUNCTION_LIST
retval=readFrame();
#endif
//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(i=0;i<10;i++){
startIndex=getStartFrameIndex();
if(startIndex==-1)
usleep(1000000);
else {
ret=OK;
break;
}
}
}
//got atleast first frame, read buffer
if(ret==OK){
int count=0;
do{
if(count>0){ printf("\nunmatching: index:%d index2:%d\n",index,index2);fflush(stdout);}
retval=readFrame(fName);
index=(int)(*((int*)retval));
char* retval2= retval+1286;
index2= (int)(*((int*)retval2));
count++;
}while((index%2)==(index2%2));
fIndex=((int)(*((int*)retval)) - startIndex)/2;
arg[0]=fIndex;
arg[1]=(index%2);
#ifdef VERBOSE
printf("\nstartIndex:%d\n",startIndex);
printf("fName:%s\n",fName);
if((index%2)==0){
printf("\nEven Index, must flip:%d\n",index);
fflush(stdout);
}
#endif
}
#endif
if(ret==OK && differentClients){
printf("Force update\n");
ret=FORCE_UPDATE;
}
if(getReceiverStatus==IDLE){
/*if(getReceiverStatus()==IDLE){
ret=FAIL;
printf("*************STOPPPED***\n");
}
}*/
/* send answer */
n = sendDataOnly(file_des,&ret,sizeof(ret));
if(ret==FAIL)
n = sendDataOnly(file_des,mess,sizeof(mess));
else{
n = sendDataOnly(file_des,fName,MAX_STR_LENGTH);
n = sendDataOnly(file_des,arg,sizeof(arg));
n = sendDataOnly(file_des,retval,sizeof(buffer));
}
/*return ok/fail*/
return ret;
}

2
slsDetectorSoftware/usersFunctions/usersFunctions.cpp
View File

@ -304,7 +304,7 @@ int defaultDisconnectChannels(void *d) {
int defaultDataReadyFunc(detectorData* d, void* p) {
int defaultDataReadyFunc(detectorData* d, int i, void* p) {
#ifdef VERBOSE
printf("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU Data received \n");
printf("Filename %s\n",d->fileName);

2
slsDetectorSoftware/usersFunctions/usersFunctions.h
View File

@ -37,7 +37,7 @@ extern "C" {
int defaultDisconnectChannels(void *d);
double defaultGetI0(int t,void *d);
int defaultDataReadyFunc(detectorData* d, void* p);
int defaultDataReadyFunc(detectorData* d, int i, void* p);
int defaultRawDataReadyFunc(double* d, int np, void* p);