From d7456f248b9f2fbfb3f2b2e1d06325ac9d04b398 Mon Sep 17 00:00:00 2001 From: lrlunin Date: Thu, 21 May 2026 10:54:36 +0200 Subject: [PATCH] renamed restream stop functions to stream dummy --- slsDetectorSoftware/src/Detector.cpp | 2 +- slsDetectorSoftware/src/DetectorImpl.cpp | 2 +- slsDetectorSoftware/src/Module.cpp | 6 +++--- slsDetectorSoftware/src/Module.h | 2 +- slsReceiverSoftware/src/ClientInterface.cpp | 8 ++++---- slsReceiverSoftware/src/ClientInterface.h | 2 +- slsReceiverSoftware/src/DataStreamer.cpp | 20 +++++++++---------- slsReceiverSoftware/src/DataStreamer.h | 2 +- slsReceiverSoftware/src/Implementation.cpp | 6 +++--- slsReceiverSoftware/src/Implementation.h | 2 +- .../include/sls/sls_detector_funcs.h | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index de8e0f6f9..1b15819f6 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -1637,7 +1637,7 @@ void Detector::setRxZmqHwm(const int limit) { } void Detector::streamRxDummyHeader(Positions pos) const { - pimpl->Parallel(&Module::restreamStopFromReceiver, pos); + pimpl->Parallel(&Module::streamRxDummyHeader, pos); } // Eiger Specific diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index b83e3a52e..101cf6939 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -1151,7 +1151,7 @@ int DetectorImpl::acquire() { setJoinThreadFlag(true); } else if (receiver) { while (numZmqRunning != 0) { - Parallel(&Module::restreamStopFromReceiver, {}); + Parallel(&Module::streamRxDummyHeader, {}); std::this_thread::sleep_for(std::chrono::milliseconds(200)); } } diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 17fe8841b..ecf9a4db0 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -993,15 +993,15 @@ void Module::stopAcquisition() { try { if (shm()->useReceiverFlag && getReceiverStreaming()) { if (detStatus == IDLE && getReceiverStatus() == IDLE) { - restreamStopFromReceiver(); + streamRxDummyHeader(); } } } catch (...) { } } -void Module::restreamStopFromReceiver() { - sendToReceiver(F_RESTREAM_STOP_FROM_RECEIVER); +void Module::streamRxDummyHeader() { + sendToReceiver(F_STREAM_RX_DUMMY_HEADER_FROM_RECEIVER); } void Module::startAndReadAll() { diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h index cf4672c93..55fd6c0b9 100644 --- a/slsDetectorSoftware/src/Module.h +++ b/slsDetectorSoftware/src/Module.h @@ -215,7 +215,7 @@ class Module : public virtual slsDetectorDefs { void startAcquisition(); void startReadout(); void stopAcquisition(); - void restreamStopFromReceiver(); + void streamRxDummyHeader(); void startAndReadAll(); runStatus getRunStatus() const; runStatus getReceiverStatus() const; diff --git a/slsReceiverSoftware/src/ClientInterface.cpp b/slsReceiverSoftware/src/ClientInterface.cpp index 0c08534a8..9ce6b22be 100644 --- a/slsReceiverSoftware/src/ClientInterface.cpp +++ b/slsReceiverSoftware/src/ClientInterface.cpp @@ -166,7 +166,7 @@ int ClientInterface::functionTable(){ flist[F_GET_RECEIVER_STREAMING_PORT] = &ClientInterface::get_streaming_port; flist[F_SET_RECEIVER_SILENT_MODE] = &ClientInterface::set_silent_mode; flist[F_GET_RECEIVER_SILENT_MODE] = &ClientInterface::get_silent_mode; - flist[F_RESTREAM_STOP_FROM_RECEIVER] = &ClientInterface::restream_stop; + flist[F_STREAM_RX_DUMMY_HEADER_FROM_RECEIVER] = &ClientInterface::stream_rx_dummy_header; flist[F_SET_ADDITIONAL_JSON_HEADER] = &ClientInterface::set_additional_json_header; flist[F_GET_ADDITIONAL_JSON_HEADER] = &ClientInterface::get_additional_json_header; flist[F_RECEIVER_UDP_SOCK_BUF_SIZE] = &ClientInterface::set_udp_socket_buffer_size; @@ -1082,14 +1082,14 @@ int ClientInterface::get_silent_mode(Interface &socket) { return socket.sendResult(retval); } -int ClientInterface::restream_stop(Interface &socket) { +int ClientInterface::stream_rx_dummy_header(Interface &socket) { verifyIdle(socket); if (!impl()->getDataStreamEnable()) { throw RuntimeError( - "Could not restream stop packet as data Streaming is disabled"); + "Could not stream rx dummy header as data Streaming is disabled"); } else { LOG(logDEBUG1) << "Restreaming stop"; - impl()->restreamStop(); + impl()->streamRxDummyHeader(); } return socket.Send(OK); } diff --git a/slsReceiverSoftware/src/ClientInterface.h b/slsReceiverSoftware/src/ClientInterface.h index f2dbaa764..0486367e2 100644 --- a/slsReceiverSoftware/src/ClientInterface.h +++ b/slsReceiverSoftware/src/ClientInterface.h @@ -111,7 +111,7 @@ class ClientInterface : private virtual slsDetectorDefs { int get_streaming_port(ServerInterface &socket); int set_silent_mode(ServerInterface &socket); int get_silent_mode(ServerInterface &socket); - int restream_stop(ServerInterface &socket); + int stream_rx_dummy_header(ServerInterface &socket); int set_additional_json_header(ServerInterface &socket); int get_additional_json_header(ServerInterface &socket); int set_udp_socket_buffer_size(ServerInterface &socket); diff --git a/slsReceiverSoftware/src/DataStreamer.cpp b/slsReceiverSoftware/src/DataStreamer.cpp index 51c8dc679..7e2826f4a 100644 --- a/slsReceiverSoftware/src/DataStreamer.cpp +++ b/slsReceiverSoftware/src/DataStreamer.cpp @@ -206,23 +206,23 @@ int DataStreamer::SendDataHeader(sls_detector_header header, uint32_t size) { zHeader.data = true; // parameter from detector header - zHeader.column = header.column; + zHeader.frameNumber = header.frameNumber; + zHeader.expLength = header.expLength; + zHeader.packetNumber = header.packetNumber; zHeader.detSpec1 = header.detSpec1; + zHeader.timestamp = header.timestamp; + zHeader.modId = header.modId; + zHeader.row = header.row; + zHeader.column = header.column; zHeader.detSpec2 = header.detSpec2; zHeader.detSpec3 = header.detSpec3; zHeader.detSpec4 = header.detSpec4; zHeader.detType = header.detType; - zHeader.expLength = header.expLength; - zHeader.frameNumber = header.frameNumber; - zHeader.modId = header.modId; - zHeader.packetNumber = header.packetNumber; - zHeader.row = header.row; - zHeader.timestamp = header.timestamp; zHeader.version = header.version; // parameter derived from header and receiver - uint64_t frameIndex = header.frameNumber - firstIndex; uint64_t acquisitionIndex = header.frameNumber; + uint64_t frameIndex = header.frameNumber - firstIndex; zHeader.acqIndex = acquisitionIndex; zHeader.completeImage = (header.packetNumber < generalData->packetsPerFrame ? false : true); @@ -234,9 +234,9 @@ int DataStreamer::SendDataHeader(sls_detector_header header, uint32_t size) { return zmqSocket->SendHeader(index, zHeader); } -void DataStreamer::RestreamStop() { +void DataStreamer::StreamRxDummyHeader() { if (!SendDummyHeader()) { - throw RuntimeError("Could not restream Dummy Header via ZMQ for port " + + throw RuntimeError("Could not stream Dummy Header via ZMQ for port " + std::to_string(zmqSocket->GetPortNumber())); } } diff --git a/slsReceiverSoftware/src/DataStreamer.h b/slsReceiverSoftware/src/DataStreamer.h index da659873f..f2f8dd1f9 100644 --- a/slsReceiverSoftware/src/DataStreamer.h +++ b/slsReceiverSoftware/src/DataStreamer.h @@ -51,7 +51,7 @@ class DataStreamer : private virtual slsDetectorDefs, public ThreadObject { */ void CreateZmqSockets(uint16_t port, int hwm); void CloseZmqSocket(); - void RestreamStop(); + void StreamRxDummyHeader(); private: /** diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index e13e9e5e2..41cd95a56 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -842,13 +842,13 @@ void Implementation::shutDownUDPSockets() { it->ShutDownUDPSocket(); } -void Implementation::restreamStop() { +void Implementation::streamRxDummyHeader() { std::string fnametostream = (filePath / fileName).string(); for (const auto &it : dataStreamer) { it->SetFileName(fnametostream); - it->RestreamStop(); + it->StreamRxDummyHeader(); } - LOG(logINFO) << "Restreaming Dummy Header via ZMQ successful"; + LOG(logINFO) << "Streaming Dummy Header via ZMQ successful"; } void Implementation::ResetParametersforNewAcquisition() { diff --git a/slsReceiverSoftware/src/Implementation.h b/slsReceiverSoftware/src/Implementation.h index 3680cb84e..87b631e79 100644 --- a/slsReceiverSoftware/src/Implementation.h +++ b/slsReceiverSoftware/src/Implementation.h @@ -104,7 +104,7 @@ class Implementation : private virtual slsDetectorDefs { void stopReceiver(); void startReadout(); void shutDownUDPSockets(); - void restreamStop(); + void streamRxDummyHeader(); /************************************************** * * diff --git a/slsSupportLib/include/sls/sls_detector_funcs.h b/slsSupportLib/include/sls/sls_detector_funcs.h index c2fd7eb82..56db44c78 100755 --- a/slsSupportLib/include/sls/sls_detector_funcs.h +++ b/slsSupportLib/include/sls/sls_detector_funcs.h @@ -367,7 +367,7 @@ enum detFuncs { F_GET_RECEIVER_STREAMING_SRC_IP, F_SET_RECEIVER_SILENT_MODE, F_GET_RECEIVER_SILENT_MODE, - F_RESTREAM_STOP_FROM_RECEIVER, + F_STREAM_RX_DUMMY_HEADER_FROM_RECEIVER, F_SET_ADDITIONAL_JSON_HEADER, F_GET_ADDITIONAL_JSON_HEADER, F_RECEIVER_UDP_SOCK_BUF_SIZE, @@ -786,7 +786,7 @@ const char* getFunctionNameFromEnum(enum detFuncs func) { case F_GET_RECEIVER_STREAMING_SRC_IP: return "F_GET_RECEIVER_STREAMING_SRC_IP - obsolete"; case F_SET_RECEIVER_SILENT_MODE: return "F_SET_RECEIVER_SILENT_MODE"; case F_GET_RECEIVER_SILENT_MODE: return "F_GET_RECEIVER_SILENT_MODE"; - case F_RESTREAM_STOP_FROM_RECEIVER: return "F_RESTREAM_STOP_FROM_RECEIVER"; + case F_STREAM_RX_DUMMY_HEADER_FROM_RECEIVER: return "F_STREAM_RX_DUMMY_HEADER_FROM_RECEIVER"; case F_SET_ADDITIONAL_JSON_HEADER: return "F_SET_ADDITIONAL_JSON_HEADER"; case F_GET_ADDITIONAL_JSON_HEADER: return "F_GET_ADDITIONAL_JSON_HEADER"; case F_RECEIVER_UDP_SOCK_BUF_SIZE: return "F_RECEIVER_UDP_SOCK_BUF_SIZE";