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

moench send to gui unnecessary ones fixed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@681 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-10-04 09:37:51 +00:00
parent 74cc08a766
commit 560d61c343
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -735,7 +735,7 @@ int slsReceiverFunctionList::startWriting(){
<< "%\tframenum " << "%\tframenum "
<< dec << currframenum //<< "\t\t p " << prevframenum << dec << currframenum //<< "\t\t p " << prevframenum
<< "\tindex " << dec << getFrameIndex() << "\tindex " << dec << getFrameIndex()
<< endl; << "\tpackets lost " << dec << ((currframenum-prevframenum)*packetsPerFrame)-(packetsInFile) << endl;
} }
} }

17
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -924,8 +924,7 @@ int slsReceiverFuncs::moench_read_frame(){
char* raw = new char[bufferSize]; char* raw = new char[bufferSize];
uint32_t startIndex=0; uint32_t startIndex=0;
int index = 0; int index = 0,bindex = 0, offset=0;
int offset=0;
strcpy(mess,"Could not read frame\n"); strcpy(mess,"Could not read frame\n");
@ -954,12 +953,12 @@ int slsReceiverFuncs::moench_read_frame(){
} }
else{ else{
index = ((uint32_t)(*((uint32_t*)raw))); bindex = ((uint32_t)(*((uint32_t*)raw)));
memcpy(origVal,raw,bufferSize); memcpy(origVal,raw,bufferSize);
raw=NULL; raw=NULL;
//************** packet number order********************** //************** packet number order**********************
index = ((index & (MOENCH_FRAME_INDEX_MASK)) >> MOENCH_FRAME_INDEX_OFFSET); index = ((bindex & (MOENCH_FRAME_INDEX_MASK)) >> MOENCH_FRAME_INDEX_OFFSET);
uint32_t numPackets = MOENCH_PACKETS_PER_FRAME; //40 uint32_t numPackets = MOENCH_PACKETS_PER_FRAME; //40
uint32_t onePacketSize = MOENCH_DATA_BYTES / MOENCH_PACKETS_PER_FRAME; //1280*40 / 40 = 1280 uint32_t onePacketSize = MOENCH_DATA_BYTES / MOENCH_PACKETS_PER_FRAME; //1280*40 / 40 = 1280
@ -974,7 +973,15 @@ int slsReceiverFuncs::moench_read_frame(){
#ifdef VERBOSE #ifdef VERBOSE
printf("iPacket:%d\n",iPacket);cout << endl; printf("iPacket:%d\n",iPacket);cout << endl;
#endif #endif
packetIndex = (*((uint32_t*)(((char*)origVal)+packetOffset))) & MOENCH_PACKET_INDEX_MASK; //if missing packets, dont send to gui
bindex = (*((uint32_t*)(((char*)origVal)+packetOffset)));
if (bindex == 0xFFFFFFFF){
cout << "Missing Packet,Not sending to gui" << endl;
index = startIndex - 1;
break;//use continue and change index above if you want to display missing packets with 0 value anyway in gui
}
packetIndex = bindex & MOENCH_PACKET_INDEX_MASK;
//the first packet is placed in the end //the first packet is placed in the end
packetIndex--; packetIndex--;
if(packetIndex ==-1) if(packetIndex ==-1)