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 some probelems wuth scans for receiver and also scans for allframes/frameindex

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@654 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-08-16 12:59:42 +00:00
parent 97aa35a388
commit 3098664c8f
10 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -1179,6 +1179,9 @@ int slsReceiverFuncs::gotthard_read_frame(){
#endif
}else{
index=(uint32_t)(*(uint32_t*)raw);
#ifdef VERBOSE
cout<<"index:"<<index<<endl;
#endif
if(shortFrame==-1)
index2= (uint32_t)(*((uint32_t*)((char*)(raw+onebuffersize))));
memcpy(origVal,raw,bufferSize);
@ -1213,9 +1216,10 @@ int slsReceiverFuncs::gotthard_read_frame(){
}
#ifdef VERBOSE
cout << "\nstartIndex:" << startIndex << endl;
if(arg!=-1){
cout << "fName:" << fName << endl;
cout << "index:" << arg << endl;
cout << "findex:" << arg << endl;
}
#endif
@ -1268,11 +1272,11 @@ int slsReceiverFuncs::set_read_frequency(){
if (lockStatus==1 && socket->differentClients==1){//necessary???
sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP);
ret=FAIL;
}
}/*
else if((slsReceiverList->getStatus()==RUNNING) && (index >= 0)){
ret = FAIL;
strcpy(mess,"cannot set up receiver mode when receiver is running\n");
}
}*/
else
retval=slsReceiverList->setNFrameToGui(index);
}