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

changed receiver to work with many writer threads for only receiver without compression

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@707 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-12-16 10:07:08 +00:00
parent d2958eb0a4
commit a485e33e82
7 changed files with 1237 additions and 1303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -733,7 +733,7 @@ int slsReceiverFuncs::start_receiver(){
ret = FAIL;
}
*/
else if(slsReceiverList->getStatus()!=RUNNING)
else if(slsReceiverList->getStatus()==IDLE)
ret=slsReceiverList->startReceiver(mess);
#endif
@ -1183,10 +1183,10 @@ int slsReceiverFuncs::gotthard_read_frame(){
cout << "index:" << hex << index << endl;
#endif
}else{
bindex = (uint32_t)(*((uint32_t*)raw));
bindex = ((uint32_t)(*((uint32_t*)raw)))+1;
pindex = (bindex & GOTTHARD_PACKET_INDEX_MASK);
index = ((bindex & GOTTHARD_FRAME_INDEX_MASK) >> GOTTHARD_FRAME_INDEX_OFFSET);
bindex2 = (uint32_t)(*((uint32_t*)((char*)(raw+onebuffersize))));
bindex2 = ((uint32_t)(*((uint32_t*)((char*)(raw+onebuffersize)))))+1;
pindex2 =(bindex2 & GOTTHARD_PACKET_INDEX_MASK);
index2 =((bindex2 & GOTTHARD_FRAME_INDEX_MASK) >> GOTTHARD_FRAME_INDEX_OFFSET);
#ifdef VERBOSE