changed the packets per frames expected in listener, and using complete frames to test if it truly gives 0 again for discard partial when readnrows is not max (partial readout) (#1668)

This commit is contained in:
maliakal_d authored and GitHub committed 2026-11-12 17:38:44 +01:00
1 parent 438a265d7e
commit efb6cc368c
4 files changed
+63 -18

No files matched your search

@@ -135,7 +135,8 @@ TEST_CASE("rx_missingpackets",
det.setFileWrite(false); // avoid writing or error on file creation
auto prev_frames =
det.getNumberOfFrames().tsquash("inconsistent #frames in test");
det.setNumberOfFrames(100);
int64_t num_frames = 100;
det.setNumberOfFrames(num_frames);
{
// some missing packets
det.startReceiver();
@@ -166,6 +167,33 @@ TEST_CASE("rx_missingpackets",
} else {
REQUIRE(oss.str() == "rx_missingpackets [0, 0]\n");
}
// readnrows
if (det_type == defs::EIGER || det_type == defs::JUNGFRAU ||
det_type == defs::MOENCH) {
auto prev_readnrows = det.getReadNRows().squash();
det.setReadNRows(16);
// without discard partial policy
det.startReceiver();
det.startDetector();
acq::wait_until_idle(det);
det.stopReceiver();
auto res =
det.getFramesCaught().tsquash("inconsistent frames caught");
CHECK(res == std::vector<int64_t>(res.size(), num_frames));
// with discard partial policy
det.setRxFrameDiscardPolicy(defs::DISCARD_PARTIAL_FRAMES);
det.startReceiver();
det.startDetector();
acq::wait_until_idle(det);
det.stopReceiver();
res = det.getFramesCaught().tsquash("inconsistent frames caught");
CHECK(res == std::vector<int64_t>(res.size(), num_frames));
det.setReadNRows(prev_readnrows);
}
}
for (int i = 0; i != det.size(); ++i) {
det.setFileWrite(prev_val[i], {i});
+5 -8
View File
@@ -190,6 +190,7 @@ void Implementation::SetupListener(int i) {
listener[i]->SetIsOutsideRoi(portRois[i].noRoi());
listener[i]->SetDetectorDatastream(detectorDataStream[i]);
listener[i]->SetSilentMode(silentMode);
listener[i]->SetReadNRows(readNRows);
}
void Implementation::SetupDataProcessor(int i) {
@@ -618,14 +619,8 @@ double Implementation::getProgress() const {
std::vector<int64_t> Implementation::getNumMissingPackets() const {
std::vector<int64_t> mp(generalData->numUDPInterfaces);
for (int i = 0; i < generalData->numUDPInterfaces; ++i) {
int np = generalData->packetsPerFrame;
uint64_t totnp = np;
// ReadNRows
if (readNRows != (int)generalData->maxRowsPerReadout) {
totnp = ((readNRows * np) / generalData->maxRowsPerReadout);
}
totnp *= numberOfTotalFrames;
mp[i] = listener[i]->GetNumMissingPacket(stoppedFlag, totnp);
mp[i] =
listener[i]->GetNumMissingPacket(stoppedFlag, numberOfTotalFrames);
}
return mp;
}
@@ -1725,6 +1720,8 @@ int Implementation::getReadNRows() const { return readNRows; }
void Implementation::setReadNRows(const int value) {
readNRows = value;
for (const auto &it : listener)
it->SetReadNRows(readNRows);
LOG(logINFO) << "Number of rows: " << readNRows;
}
+22 -8
View File
@@ -44,21 +44,31 @@ uint64_t Listener::GetLastFrameIndexCaught() const {
}
int64_t Listener::GetNumMissingPacket(bool stoppedFlag,
uint64_t numPackets) const {
uint64_t numFrames) const {
if (disabledPort) {
return 0;
}
uint64_t pperFrame = GetNumPacketsPerFrameExpected();
if (!stoppedFlag) {
return (numPackets - numPacketsCaught);
return (numFrames * pperFrame - numPacketsCaught);
}
if (numPacketsCaught == 0) {
return numPacketsCaught;
}
return (lastCaughtFrameIndex - firstIndex + 1) *
generalData->packetsPerFrame -
return (lastCaughtFrameIndex - firstIndex + 1) * pperFrame -
numPacketsCaught;
}
uint32_t Listener::GetNumPacketsPerFrameExpected() const {
uint32_t pperFrame = generalData->packetsPerFrame;
uint32_t maxRows = generalData->maxRowsPerReadout;
// partial readout (readnrows)
if (maxRows != 0 && readNRows > 0 && readNRows < (int)maxRows) {
pperFrame = (readNRows * pperFrame) / maxRows;
}
return pperFrame;
}
bool Listener::GetStartedFlag() const { return startedFlag; }
uint64_t Listener::GetCurrentFrameIndex() const { return lastCaughtFrameIndex; }
@@ -100,6 +110,8 @@ void Listener::SetIsOutsideRoi(bool enable) {
void Listener::SetSilentMode(bool enable) { silentMode = enable; }
void Listener::SetReadNRows(int value) { readNRows = value; }
void Listener::ResetParametersforNewAcquisition() {
StopRunning();
startedFlag = false;
@@ -321,6 +333,8 @@ uint32_t Listener::ListenToAnImage(sls_receiver_header &dstHeader,
standardHeader = false;
}
uint32_t pperFrame = generalData->packetsPerFrame;
// fewer packets in partial readout (only center rows sent)
uint32_t pperFrameExpected = GetNumPacketsPerFrameExpected();
bool isHeaderEmpty = true;
uint32_t corrected_dsize = dsize - ((pperFrame * dsize) - imageSize);
sls_detector_header *srcDetHeader = nullptr;
@@ -350,7 +364,7 @@ uint32_t Listener::ListenToAnImage(sls_receiver_header &dstHeader,
carryOverFlag = false;
}
while (numpackets < pperFrame) {
while (numpackets < pperFrameExpected) {
// listen to new packet
if (!udpSocketAlive || !udpSocket->ReceivePacket(&listeningPacket[0])) {
// end of acquisition
@@ -404,7 +418,7 @@ uint32_t Listener::ListenToAnImage(sls_receiver_header &dstHeader,
// complete image
dstHeader.detHeader.packetNumber = numpackets;
if (numpackets == pperFrame) {
if (numpackets == pperFrameExpected) {
++numCompleteFramesCaught;
}
++currentFrameIndex;
@@ -513,10 +527,10 @@ void Listener::GetPacketIndices(uint64_t &fnum, uint32_t &pnum, uint64_t &bnum,
void Listener::PrintFifoStatistics() {
LOG(logDEBUG1) << "numFramesStatistic:" << numFramesStatistic
<< " numPacketsStatistic:" << numPacketsStatistic
<< " packetsperframe:" << generalData->packetsPerFrame;
<< " packetsperframe:" << GetNumPacketsPerFrameExpected();
// calculate packet loss
int64_t totalP = numFramesStatistic * (generalData->packetsPerFrame);
int64_t totalP = numFramesStatistic * GetNumPacketsPerFrameExpected();
int64_t loss = totalP - numPacketsStatistic;
int lossPercent = ((double)loss / (double)totalP) * 100.00;
numPacketsStatistic = 0;
+7 -1
View File
@@ -32,7 +32,7 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
uint64_t GetNumCompleteFramesCaught() const;
uint64_t GetLastFrameIndexCaught() const;
/** negative values in case of extra packets */
int64_t GetNumMissingPacket(bool stoppedFlag, uint64_t numPackets) const;
int64_t GetNumMissingPacket(bool stoppedFlag, uint64_t numFrames) const;
bool GetStartedFlag() const;
uint64_t GetCurrentFrameIndex() const;
uint64_t GetListenedIndex() const;
@@ -45,6 +45,7 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
void SetDetectorDatastream(bool enable);
void SetIsOutsideRoi(bool enable);
void SetSilentMode(bool enable);
void SetReadNRows(int value);
void ResetParametersforNewAcquisition();
void CreateUDPSocket(int &actualSize);
@@ -104,6 +105,10 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
void PrintFifoStatistics();
/** packets per frame expected from detector (fewer than
* packetsPerFrame in partial readout, as only center rows are sent) */
uint32_t GetNumPacketsPerFrameExpected() const;
static const std::string TypeName;
GeneralData *generalData{nullptr};
Fifo *fifo;
@@ -119,6 +124,7 @@ class Listener : private virtual slsDetectorDefs, public ThreadObject {
bool isOutsideRoi{false};
bool silentMode;
bool disabledPort{false};
int readNRows{0};
/** row hardcoded as 1D or 2d,
* if detector does not send them yet or