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

fixed gui expecting more databytes from receiver, cuz of probes changing databytes

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@359 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-11-23 16:15:26 +00:00
parent 5236aa7cce
commit d0d7eac553
7 changed files with 83 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -6,7 +6,6 @@
#include "slsReceiver_funcs.h"
#include "slsReceiverFunctionList.h"
//#include <signal.h> //SIGINT
#include <iostream>
#include <string>
@ -17,7 +16,8 @@ using namespace std;
int slsReceiverFuncs::file_des(-1);
int slsReceiverFuncs::socketDescriptor(-1);
slsReceiverFuncs::slsReceiverFuncs(MySocketTCP *&mySocket,string const fname,int &success, bool shortfname):
socket(mySocket),
@ -97,8 +97,9 @@ slsReceiverFuncs::slsReceiverFuncs(MySocketTCP *&mySocket,string const fname,int
function_table();
slsReceiverList = new slsReceiverFunctionList(shortfname);
//Catch signal SIGINT to close files properly
//signal(SIGINT,closeFile);
file_des=socket->getFileDes();
socketDescriptor=socket->getsocketDescriptor();
success = OK;
}
@ -174,7 +175,6 @@ int slsReceiverFuncs::decode_function(){
if (ret==FAIL)
cout << "Error executing the function = " << fnum << endl;
return ret;
}
@ -198,12 +198,22 @@ int slsReceiverFuncs::M_nofunc(){
/*
void slsReceiverFuncs::closeFile(int p){
//if(socket)
slsReceiverFunctionList::closeFile();
char *buf;
char buffer[1];
if(slsReceiverFunctionList::listening_thread_running)
fclose(slsReceiverFunctionList::sfilefd);
close(file_des);
shutdown(socketDescriptor,SHUT_RDWR);
close(socketDescriptor);
}
*/
int slsReceiverFuncs::set_file_name() {
@ -588,9 +598,9 @@ int slsReceiverFuncs::read_frame(){
int count=0;
do{
if(count>0){
cout << endl << "unmatching: index:" << index <<" index2:" << index2 << endl;
cout << endl << "unmatching/wrong order: index:" << index <<" index2:" << index2 << endl;
if(count>10){
strcpy(mess,"unmatching index. could not read frame.\n");
strcpy(mess,"unmatching index/wrong order. could not read frame.\n");
ret=FAIL;
break;
}
@ -601,7 +611,7 @@ int slsReceiverFuncs::read_frame(){
index2= (int)(*((int*)retval2));
count++;
}while((index%2)==(index2%2));
}while(((index%2)==(index2%2))||(index+1!=index2));
fIndex=((int)(*((int*)retval)) - startIndex)/2;
arg[0]=fIndex-1;
@ -750,6 +760,7 @@ int slsReceiverFuncs::set_port() {
socket->Disconnect();
delete socket;
socket = mySocket;
file_des=socket->getFileDes();
}
}