Merge branch 'dev/remove_rxzmqip_missed' into dev/reg_bit_change_no_v…

…alidate
slsdetectorgroup · Sep 18, 2024 · 74fc485 · 74fc485
2 parents 6bed106 + 0437193
commit 74fc485
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git a/python/src/detector.cpp b/python/src/detector.cpp
@@ -1039,15 +1039,6 @@ void init_det(py::module &m) {
  (void (Detector::*)(uint16_t, int)) &
  Detector::setRxZmqPort,
  py::arg(), py::arg() = -1);
- CppDetectorApi.def(
- "getRxZmqIP",
- (Result<sls::IpAddr>(Detector::*)(sls::Positions) const) &
- Detector::getRxZmqIP,
- py::arg() = Positions{});
- CppDetectorApi.def("setRxZmqIP",
- (void (Detector::*)(const sls::IpAddr, sls::Positions)) &
- Detector::setRxZmqIP,
- py::arg(), py::arg() = Positions{});
  CppDetectorApi.def("getClientZmqPort",
  (Result<uint16_t>(Detector::*)(sls::Positions) const) &
  Detector::getClientZmqPort,

diff --git a/slsDetectorSoftware/include/sls/Detector.h b/slsDetectorSoftware/include/sls/Detector.h
@@ -1104,14 +1104,6 @@ class Detector {
  */
  void setRxZmqPort(uint16_t port, int module_id = -1);
 
- Result<IpAddr> getRxZmqIP(Positions pos = {}) const;
-
- /** Zmq Ip Address from which data is to be streamed out of the receiver. \n
- * Also restarts receiver zmq streaming if enabled. \n Default is from
- * rx_hostname. \n Modified only when using an intermediate process between
- * receiver. */
- void setRxZmqIP(const IpAddr ip, Positions pos = {});
-
  Result<uint16_t> getClientZmqPort(Positions pos = {}) const;
 
  /** Port number to listen to zmq data streamed out from receiver or