detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-29 09:30:02 +02:00
Code Issues Actions Packages Releases Activity

forgot to commit earlier

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-08-21 10:54:14 +02:00
parent 4813d7b598
commit 8f6b8a8474
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -2067,9 +2067,9 @@ int UDPStandardImplementation::startWriting(){
//dont pop again if dummy packet //dont pop again if dummy packet
else if(numpackets[i] == 0){ else if(numpackets[i] == 0){
popready[i] = false; popready[i] = false;
//#ifdef EIGER_DEBUG3 #ifdef EIGER_DEBUG3
cprintf(GREEN,"%d Dummy frame popped out of fifo %d",ithread, i); cprintf(GREEN,"%d Dummy frame popped out of fifo %d",ithread, i);
//#endif #endif
}else{ }else{
endofacquisition = false; endofacquisition = false;
if(numpackets[i] == 1040){ if(numpackets[i] == 1040){
@ -2093,9 +2093,9 @@ int UDPStandardImplementation::startWriting(){
//END OF ACQUISITION //END OF ACQUISITION
if(endofacquisition){ if(endofacquisition){
//#ifdef VERYDEBUG #ifdef VERYDEBUG
cprintf(GREEN,"%d Both dummy frames\n", ithread); cprintf(GREEN,"%d Both dummy frames\n", ithread);
//#endif #endif
//remaining packets to be written //remaining packets to be written
if((myDetectorType == EIGER) && if((myDetectorType == EIGER) &&
((tempoffset[0]!=0) || (tempoffset[1]!=(packetsPerFrame/numListeningThreads)))); ((tempoffset[0]!=0) || (tempoffset[1]!=(packetsPerFrame/numListeningThreads))));
@ -2122,15 +2122,15 @@ int UDPStandardImplementation::startWriting(){
if(numpackets[i] == EIGER_HEADER_LENGTH) {cprintf(BG_RED,"weird, frame packet recieved\n"); exit(-1);} if(numpackets[i] == EIGER_HEADER_LENGTH) {cprintf(BG_RED,"weird, frame packet recieved\n"); exit(-1);}
//dummy packet //dummy packet
else if(!numpackets[i]){ else if(!numpackets[i]){
//#ifdef VERYDEBUG #ifdef VERYDEBUG
cprintf(RED, "Dummy packet: %d from fifo %d\n", numpackets[i],i); cprintf(RED, "Dummy packet: %d from fifo %d\n", numpackets[i],i);
//#endif #endif
cout<<"tempoffset["<<i<<"]:"<<tempoffset[i]<<" cheking against:"<<(((i+1)*packetsPerFrame/numListeningThreads))<<endl; cout<<"tempoffset["<<i<<"]:"<<tempoffset[i]<<" cheking against:"<<(((i+1)*packetsPerFrame/numListeningThreads))<<endl;
//cannot check for full frame as it will be false if its done with all packets OR waiting for packets //cannot check for full frame as it will be false if its done with all packets OR waiting for packets
if(tempoffset[i]!= (((i+1)*packetsPerFrame/numListeningThreads))){ if(tempoffset[i]!= (((i+1)*packetsPerFrame/numListeningThreads))){
//#ifdef VERYDEBUG #ifdef VERYDEBUG
cprintf(RED, "Dummy packet: Adding missing packets\n"); cprintf(RED, "Dummy packet: Adding missing packets\n");
//#endif #endif
//add missing packets //add missing packets
numberofmissingpackets[i] = (LAST_PACKET_VALUE - lastpacketheader[i]); numberofmissingpackets[i] = (LAST_PACKET_VALUE - lastpacketheader[i]);
//to decrement from packetsInFile to calculate packet loss //to decrement from packetsInFile to calculate packet loss
@ -2150,20 +2150,20 @@ int UDPStandardImplementation::startWriting(){
}else }else
/*cprintf(GREEN, "blank packet i:%d pnum:%d fnum:%d num3:0x%x\n",i,tempoffset[i],tempframenum[i],(*(uint8_t*)(((eiger_packet_header *)((char*)(tempbuffer[tempoffset[i]])))->num3))); /*cprintf(GREEN, "blank packet i:%d pnum:%d fnum:%d num3:0x%x\n",i,tempoffset[i],tempframenum[i],(*(uint8_t*)(((eiger_packet_header *)((char*)(tempbuffer[tempoffset[i]])))->num3)));
*/ */
tempoffset[i] ++; tempoffset[i]++;
blankoffset ++; blankoffset++;
} }
//set fullframe and dont let fifo pop over it until written //set fullframe and dont let fifo pop over it until written
fullframe[i] = true; fullframe[i] = true;
popready[i] = false; popready[i] = false;
} }
} }
//#ifdef EIGER_DEBUG3 #ifdef EIGER_DEBUG3
else{ else{
cprintf(RED, "WARNING: Got a weird packet size: %d from fifo %d\n", numpackets[i],i); cprintf(RED, "WARNING: Got a weird packet size: %d from fifo %d\n", numpackets[i],i);
continue; continue;
} }
//#endif #endif
} }
@ -2317,15 +2317,12 @@ int UDPStandardImplementation::startWriting(){
if(tempframenum[0] != tempframenum[1]) if(tempframenum[0] != tempframenum[1])
cprintf(RED,"Frame numbers mismatch!!! %d %d\n",tempframenum[0],tempframenum[1]); cprintf(RED,"Frame numbers mismatch!!! %d %d\n",tempframenum[0],tempframenum[1]);
currframenum = tempframenum[0]; currframenum = tempframenum[0];
/*//to resolve for missing frame packets
tempframenum[0]++;
tempframenum[1]++;*/
numMissingPackets += (numberofmissingpackets[0]+numberofmissingpackets[1]); numMissingPackets += (numberofmissingpackets[0]+numberofmissingpackets[1]);
numTotMissingPacketsInFile += numMissingPackets; numTotMissingPacketsInFile += numMissingPackets;
numTotMissingPackets += numMissingPackets; numTotMissingPackets += numMissingPackets;
//#ifdef EIGER_DEBUG2 #ifdef EIGER_DEBUG2
cprintf(GREEN,"**fnum:%d**\n",currframenum); cprintf(GREEN,"**fnum:%d**\n",currframenum);
//#endif #endif
#ifdef EIGER_DEBUG3 #ifdef EIGER_DEBUG3
if(numberofmissingpackets[0]) if(numberofmissingpackets[0])
cprintf(RED, "fifo 0 missing packets:%d fnum:%d\n",numberofmissingpackets[0],currframenum); cprintf(RED, "fifo 0 missing packets:%d fnum:%d\n",numberofmissingpackets[0],currframenum);