detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-07-16 13:20:30 +02:00
Code Issues Actions Packages Releases Activity

renamed restream stop functions to stream dummy

Browse Source
This commit is contained in:
lunin_l
2026-05-21 10:54:36 +02:00
parent a0008df449
commit d7456f248b
11 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorSoftware/src/Detector.cpp
+1 -1
View File
@@ -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
slsDetectorSoftware/src/DetectorImpl.cpp
+1 -1
View File
@@ -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));
}
}
slsDetectorSoftware/src/Module.cpp
+3 -3
View File
@@ -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() {
slsDetectorSoftware/src/Module.h
+1 -1
View File
@@ -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;
slsReceiverSoftware/src/ClientInterface.cpp
+4 -4
View File
@@ -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);
}
slsReceiverSoftware/src/ClientInterface.h
+1 -1
View File
@@ -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);
slsReceiverSoftware/src/DataStreamer.cpp
+10 -10
View File
@@ -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()));
}
}
slsReceiverSoftware/src/DataStreamer.h
+1 -1
View File
@@ -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:
/**
slsReceiverSoftware/src/Implementation.cpp
+3 -3
View File
@@ -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() {
slsReceiverSoftware/src/Implementation.h
+1 -1
View File
@@ -104,7 +104,7 @@ class Implementation : private virtual slsDetectorDefs {
void stopReceiver();
void startReadout();
void shutDownUDPSockets();
void restreamStop();
void streamRxDummyHeader();
/**************************************************
* *
slsSupportLib/include/sls/sls_detector_funcs.h
+2 -2
View File
@@ -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";