rx_readfreq to rx_zmqfreq and rx_datastream to rx_zmqstream

python/slsdet/detector.py

@@ -664,7 +664,7 @@ class Detector(CppDetectorApi):
     # ZMQ Streaming Parameters (Receiver<->Client)
 
     @property
-    def rx_datastream(self):
+    def rx_zmqstream(self):
         """
         Enable/ disable data streaming from receiver via zmq (eg. to GUI or to another process for further processing). \n
         This creates/ destroys zmq streamer threads in receiver. \n
@@ -673,12 +673,12 @@ class Detector(CppDetectorApi):
         """
         return element_if_equal(self.getRxZmqDataStream())
 
-    @rx_datastream.setter
+    @rx_zmqstream.setter
     def rx_zmqdatastream(self, enable):
         self.setRxZmqDataStream(enable)
 
     @property
-    def rx_readfreq(self):
+    def rx_zmqfreq(self):
         """Frequency of frames streamed out from receiver via zmq.
         Notes
         -----
@@ -688,8 +688,8 @@ class Detector(CppDetectorApi):
         """
         return element_if_equal(self.getRxZmqFrequency())
 
-    @rx_readfreq.setter
-    def rx_readfreq(self, nth_frame):
+    @rx_zmqfreq.setter
+    def rx_zmqfreq(self, nth_frame):
         self.setRxZmqFrequency(nth_frame)
 
     @property

python/tests/detector_eiger.py

@@ -379,15 +379,15 @@ def test_set_readout_clock_3(d, mocker):
     d.readout_clock = 'Super Slow Speed'
     m.assert_called_once_with(3)
 
-#----------------------------------------------------------------rx_datastream
-def test_get_rx_datastream(d, mocker):
+#----------------------------------------------------------------rx_zmqstream
+def test_get_rx_zmqstream(d, mocker):
     m = mocker.patch('_slsdet.DetectorApi.getRxDataStreamStatus')
     m.return_value = False
-    assert d.rx_datastream == False
+    assert d.rx_zmqstream == False
 
-def test_set_rx_datastream(d, mocker):
+def test_set_rx_zmqstream(d, mocker):
     m = mocker.patch('_slsdet.DetectorApi.setRxDataStreamStatus')
-    d.rx_datastream = True
+    d.rx_zmqstream = True
     m.assert_called_once_with(True)
 
 def test_get_rx_zmqip(d, mocker):

python/tests/detector_test.py

@@ -412,15 +412,15 @@ def test_set_counters_single(d, mocker):
 #     d.readout_clock = 'Super Slow Speed'
 #     m.assert_called_once_with(3)
 
-# #----------------------------------------------------------------rx_datastream
-# def test_get_rx_datastream(d, mocker):
+# #----------------------------------------------------------------rx_zmqstream
+# def test_get_rx_zmqstream(d, mocker):
 #     m = mocker.patch('_slsdet.DetectorApi.getRxDataStreamStatus')
 #     m.return_value = False
-#     assert d.rx_datastream == False
+#     assert d.rx_zmqstream == False
 
-# def test_set_rx_datastream(d, mocker):
+# def test_set_rx_zmqstream(d, mocker):
 #     m = mocker.patch('_slsdet.DetectorApi.setRxDataStreamStatus')
-#     d.rx_datastream = True
+#     d.rx_zmqstream = True
 #     m.assert_called_once_with(True)
 
 # def test_get_rx_zmqip(d, mocker):