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

print outs

Browse Source
This commit is contained in:
maliakal_d 2022-06-08 10:24:45 +02:00
parent 4fe520fdaf
commit 7536c16a48
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE.txt
View File

@ -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 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 - g2 system frequency is the same irrespective of timing source
- (apparently) rxr doesnt get stuck anymore from 6.1.1 - (apparently) rxr doesnt get stuck anymore from 6.1.1
-rx_bunchsize, (default fifodepth for g2 changed to 50)
2. Resolved Issues 2. Resolved Issues
================== ==================

12
slsReceiverSoftware/src/DataProcessor.cpp
View File

@ -268,7 +268,6 @@ void DataProcessor::ThreadExecution() {
char* tempBuffer = buffer; char* tempBuffer = buffer;
for (size_t iFrame = 0; iFrame != fifoBunchSize; iFrame ++) { for (size_t iFrame = 0; iFrame != fifoBunchSize; iFrame ++) {
LOG(logDEBUG1) << "iFrame:" << iFrame;
// end of acquisition (check dummy) // end of acquisition (check dummy)
auto numBytes = *reinterpret_cast<uint32_t *>(tempBuffer); auto numBytes = *reinterpret_cast<uint32_t *>(tempBuffer);
@ -296,11 +295,8 @@ void DataProcessor::ThreadExecution() {
memcpy(buffer + generalData_->fifoBufferHeaderSize, &completeImageToStreamBeforeCropping[0], generalData_->imageSize); memcpy(buffer + generalData_->fifoBufferHeaderSize, &completeImageToStreamBeforeCropping[0], generalData_->imageSize);
} }
fifo_->PushAddressToStream(buffer); fifo_->PushAddressToStream(buffer);
LOG(logINFORED) << "push to stream!??";
} else { } else {
fifo_->FreeAddress(buffer); fifo_->FreeAddress(buffer);
LOG(logDEBUG1) << "Pushed (free) dataprocessing bunch (EOA) " << std::hex << static_cast<void *>(buffer) << std::dec;
} }
} }
@ -308,14 +304,10 @@ void DataProcessor::StopProcessing(char *buf) {
LOG(logDEBUG1) << "DataProcessing " << index << ": Dummy"; LOG(logDEBUG1) << "DataProcessing " << index << ": Dummy";
// stream dummy or free // stream dummy or free
if (*dataStreamEnable_) { if (*dataStreamEnable_)
LOG(logINFORED) << "push to stream!??";
fifo_->PushAddressToStream(buf); fifo_->PushAddressToStream(buf);
} else
else {
fifo_->FreeAddress(buf); fifo_->FreeAddress(buf);
LOG(logDEBUG1) << "Pushed (free) stop proc dataprocessing bunch (EOA) " << std::hex << static_cast<void *>(buf) << std::dec;
}
CloseFiles(); CloseFiles();
StopRunning(); StopRunning();

18
slsReceiverSoftware/src/Listener.cpp
View File

@ -244,39 +244,25 @@ void Listener::ThreadExecution() {
// end of acquisition or not activated // end of acquisition or not activated
if ((*status == TRANSMITTING || !udpSocketAlive) && !carryOverFlag) { if ((*status == TRANSMITTING || !udpSocketAlive) && !carryOverFlag) {
(*((uint32_t *)tempBuffer)) = DUMMY_PACKET_VALUE; (*((uint32_t *)tempBuffer)) = DUMMY_PACKET_VALUE;
LOG(logDEBUG1) << iFrame << ": dummy=" << DUMMY_PACKET_VALUE;
StopListening(buffer); StopListening(buffer);
return; return;
} }
LOG(logDEBUG1) << "iframe:" << iFrame << " currentframeindex:" << currentFrameIndex;
int rc = ListenToAnImage(tempBuffer); int rc = ListenToAnImage(tempBuffer);
// socket closed or discarding image (free retake) // socket closed or discarding image (free retake)
// weird frame numbers (print and rc = 0), then retake // weird frame numbers (print and rc = 0), then retake
if (rc <= 0) { if (rc <= 0) {
if (udpSocketAlive) { if (udpSocketAlive) {
LOG(logDEBUG1) << iFrame << ": rc<=0" << std::hex << static_cast<void *>(tempBuffer) << std::dec;
--iFrame; --iFrame;
} }
} else { } else {
(*((uint32_t *)tempBuffer)) = rc; (*((uint32_t *)tempBuffer)) = rc;
LOG(logDEBUG1) << iFrame << ": rc=" << rc << " addr:" << std::hex << static_cast<void *>(tempBuffer) << std::dec;
tempBuffer += fifoBunchSizeBytes; tempBuffer += fifoBunchSizeBytes;
} }
} }
// last check
/* if ((*status != TRANSMITTING || !udpSocketAlive) && !carryOverFlag) {
LOG(logINFOBLUE) << "Last check " << std::hex << static_cast<void *>(tempBuffer) << std::dec;
(*((uint32_t *)tempBuffer)) = DUMMY_PACKET_VALUE;
LOG(logINFOBLUE) << ": dummy=" << DUMMY_PACKET_VALUE;
StopListening(buffer);
return;
}*/
// push into fifo // push into fifo
fifo->PushAddress(buffer); fifo->PushAddress(buffer);
LOG(logDEBUG1) << "Pushed Listening bunch " << std::hex << static_cast<void *>(tempBuffer) << std::dec;
// Statistics // Statistics
if (!(*silentMode)) { if (!(*silentMode)) {
@ -291,11 +277,9 @@ void Listener::ThreadExecution() {
void Listener::StopListening(char *buf) { void Listener::StopListening(char *buf) {
fifo->PushAddress(buf); fifo->PushAddress(buf);
LOG(logDEBUG1) << "Pushed Listening bunch (EOA) " << std::hex << static_cast<void *>(buf) << std::dec;
StopRunning(); StopRunning();
LOG(logDEBUG1) << index << ": Listening Packets (" << *udpPortNumber LOG(logDEBUG1) << index << ": Listening Completed (" << *udpPortNumber
<< ") : " << numPacketsCaught; << ") : " << numPacketsCaught;
LOG(logDEBUG1) << index << ": Listening Completed";
} }
/* buf includes the fifo header and packet header */ /* buf includes the fifo header and packet header */