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

now u can use receiver hostname instead of only ip, got rid of acqtest, separated udpip and port from setudpconnection

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@372 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-12-07 15:51:03 +00:00
parent ac2c4211e2
commit 9341a2875a
6 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -398,8 +398,7 @@ int slsReceiverFuncs::setup_udp(){
strcpy(mess,"Error reading from socket\n");
ret = FAIL;
}
cout<<"args[0]:"<<args[0]<<endl;
cout<<"args[1]:"<<args[1]<<endl;
// execute action if the arguments correctly arrived
#ifdef SLS_RECEIVER_FUNCTION_LIST
if (ret==OK) {
@ -692,14 +691,14 @@ int slsReceiverFuncs::read_frame(){
//1 odd, 1 even
if((index%2)!=index2%2){
/*if((index%2)!=index2%2){
//ideal situation (should be odd, even(index+1))
if(index%2){
if(index%2){*/
memcpy(retval,((char*) origVal)+2, onedatasize);
memcpy((((char*)retval)+onedatasize), ((char*) origVal)+8+onedatasize, onedatasize);
ret=OK;
break;
}
/*}
//swap to even,odd
if(index2%2){
@ -710,7 +709,7 @@ int slsReceiverFuncs::read_frame(){
break;
}
}
}*/
strcpy(mess,"could not read frame due to more than 20 mismatched indices\n");
usleep(100000);
count++;