diff --git a/RELEASE.txt b/RELEASE.txt index c23ae55f6..47010267f 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -79,6 +79,7 @@ This document describes the differences between v7.0.0 and v6.x.x - g2 and m3 clkdiv 2 (system clock) change should affect time settings (g2: exptime, period, delayaftertrigger, burstperiod, m3: exptime, gatedelay, gateperiod, period, delayaftertrigger) - g2 system frequency is the same irrespective of timing source - (apparently) rxr doesnt get stuck anymore from 6.1.1 +-rx_bunchsize, (default fifodepth for g2 changed to 50) 2. Resolved Issues ================== diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index 92430000e..9bd93ffab 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -268,7 +268,6 @@ void DataProcessor::ThreadExecution() { char* tempBuffer = buffer; for (size_t iFrame = 0; iFrame != fifoBunchSize; iFrame ++) { - LOG(logDEBUG1) << "iFrame:" << iFrame; // end of acquisition (check dummy) auto numBytes = *reinterpret_cast(tempBuffer); @@ -296,11 +295,8 @@ void DataProcessor::ThreadExecution() { memcpy(buffer + generalData_->fifoBufferHeaderSize, &completeImageToStreamBeforeCropping[0], generalData_->imageSize); } fifo_->PushAddressToStream(buffer); - LOG(logINFORED) << "push to stream!??"; - } else { fifo_->FreeAddress(buffer); - LOG(logDEBUG1) << "Pushed (free) dataprocessing bunch (EOA) " << std::hex << static_cast(buffer) << std::dec; } } @@ -308,14 +304,10 @@ void DataProcessor::StopProcessing(char *buf) { LOG(logDEBUG1) << "DataProcessing " << index << ": Dummy"; // stream dummy or free - if (*dataStreamEnable_) { - LOG(logINFORED) << "push to stream!??"; + if (*dataStreamEnable_) fifo_->PushAddressToStream(buf); - } - else { + else fifo_->FreeAddress(buf); - LOG(logDEBUG1) << "Pushed (free) stop proc dataprocessing bunch (EOA) " << std::hex << static_cast(buf) << std::dec; - } CloseFiles(); StopRunning(); diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp index 2e474b54b..ee6a71f13 100644 --- a/slsReceiverSoftware/src/Listener.cpp +++ b/slsReceiverSoftware/src/Listener.cpp @@ -244,39 +244,25 @@ void Listener::ThreadExecution() { // end of acquisition or not activated if ((*status == TRANSMITTING || !udpSocketAlive) && !carryOverFlag) { (*((uint32_t *)tempBuffer)) = DUMMY_PACKET_VALUE; - LOG(logDEBUG1) << iFrame << ": dummy=" << DUMMY_PACKET_VALUE; StopListening(buffer); return; } - LOG(logDEBUG1) << "iframe:" << iFrame << " currentframeindex:" << currentFrameIndex; int rc = ListenToAnImage(tempBuffer); // socket closed or discarding image (free retake) // weird frame numbers (print and rc = 0), then retake if (rc <= 0) { if (udpSocketAlive) { - LOG(logDEBUG1) << iFrame << ": rc<=0" << std::hex << static_cast(tempBuffer) << std::dec; --iFrame; } } else { (*((uint32_t *)tempBuffer)) = rc; - LOG(logDEBUG1) << iFrame << ": rc=" << rc << " addr:" << std::hex << static_cast(tempBuffer) << std::dec; tempBuffer += fifoBunchSizeBytes; } } - // last check - /* if ((*status != TRANSMITTING || !udpSocketAlive) && !carryOverFlag) { - LOG(logINFOBLUE) << "Last check " << std::hex << static_cast(tempBuffer) << std::dec; - (*((uint32_t *)tempBuffer)) = DUMMY_PACKET_VALUE; - LOG(logINFOBLUE) << ": dummy=" << DUMMY_PACKET_VALUE; - StopListening(buffer); - return; - }*/ - // push into fifo fifo->PushAddress(buffer); - LOG(logDEBUG1) << "Pushed Listening bunch " << std::hex << static_cast(tempBuffer) << std::dec; // Statistics if (!(*silentMode)) { @@ -291,11 +277,9 @@ void Listener::ThreadExecution() { void Listener::StopListening(char *buf) { fifo->PushAddress(buf); - LOG(logDEBUG1) << "Pushed Listening bunch (EOA) " << std::hex << static_cast(buf) << std::dec; StopRunning(); - LOG(logDEBUG1) << index << ": Listening Packets (" << *udpPortNumber + LOG(logDEBUG1) << index << ": Listening Completed (" << *udpPortNumber << ") : " << numPacketsCaught; - LOG(logDEBUG1) << index << ": Listening Completed"; } /* buf includes the fifo header and packet header */