This commit is contained in:
Dhanya Maliakal 2016-10-31 16:12:11 +01:00
parent e7bddd54fa
commit a2b8d9beb9

View File

@ -1991,7 +1991,10 @@ void UDPStandardImplementation::startListening(){
} }
//write packet count to buffer //write packet count to buffer
(*((uint32_t*)(buffer[ithread]))) = (rc/onePacketSize); if(myDetectorType == JUNGFRAU)
(*((uint32_t*)(buffer[ithread]))) = (rc/oneDataSize);
else
(*((uint32_t*)(buffer[ithread]))) = (rc/onePacketSize);
if(dataCompressionEnable) if(dataCompressionEnable)
(*((uint32_t*)(buffer[ithread]))) = processListeningBuffer(ithread, carryonBufferSize, tempBuffer, rc); (*((uint32_t*)(buffer[ithread]))) = processListeningBuffer(ithread, carryonBufferSize, tempBuffer, rc);
@ -2515,16 +2518,16 @@ void UDPStandardImplementation::startWriting(){
cprintf(GREEN,"Writing_Thread %d: Popped %p from FIFO %d\n", ithread, (void*)(wbuf),listenfifoIndex); cprintf(GREEN,"Writing_Thread %d: Popped %p from FIFO %d\n", ithread, (void*)(wbuf),listenfifoIndex);
#endif #endif
uint32_t numPackets = (uint32_t)(*((uint32_t*)wbuf)); uint32_t numPackets = (uint32_t)(*((uint32_t*)wbuf));
#ifdef DEBUG4 //#ifdef DEBUG4
cprintf(GREEN,"Writing_Thread %d: Number of Packets: %d for FIFO %d\n", ithread, numPackets, listenfifoIndex); cprintf(GREEN,"Writing_Thread %d: Number of Packets: %d for FIFO %d\n", ithread, numPackets, listenfifoIndex);
#endif //#endif
//end of acquisition //end of acquisition
if(numPackets == dummyPacketValue){ if(numPackets == dummyPacketValue){
#ifdef DEBUG4 //#ifdef DEBUG4
cprintf(GREEN,"Writing_Thread %d: Dummy frame popped out of FIFO %d",ithread, listenfifoIndex); cprintf(GREEN,"Writing_Thread %d: Dummy frame popped out of FIFO %d",ithread, listenfifoIndex);
#endif //#endif
stopWriting(ithread,wbuf); stopWriting(ithread,wbuf);
continue; continue;
} }