From a0f915316e36d871752b41e8d03f828af4bac506 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 10 Sep 2020 14:11:21 +0200 Subject: [PATCH] rx_readfreq to rx_zmqfreq and rx_datastream to rx_zmqstream --- examples/gotthard_two.config | 4 +-- examples/jctb_moench03_T1.config | 4 +-- examples/moench03_T1.config | 4 +-- python/slsdet/detector.py | 10 +++---- python/tests/detector_eiger.py | 10 +++---- python/tests/detector_test.py | 10 +++---- slsDetectorSoftware/src/CmdProxy.h | 12 ++++---- .../tests/test-CmdProxy-rx.cpp | 28 +++++++++---------- 8 files changed, 42 insertions(+), 40 deletions(-) diff --git a/examples/gotthard_two.config b/examples/gotthard_two.config index 9830095ca..4cbeef01a 100755 --- a/examples/gotthard_two.config +++ b/examples/gotthard_two.config @@ -41,11 +41,11 @@ hostname bchip074+bchip075+ r_readfreq 1 -rx_datastream 1 +rx_zmqstream 1 #replace my_receiver_hostname with the hostname of 1Gb IP of the machine where the receiver runs rx_hostname my_receiver_hostname -rx_datastream 1 +rx_zmqstream 1 outdir /tmp/ diff --git a/examples/jctb_moench03_T1.config b/examples/jctb_moench03_T1.config index d21dd2b26..29572d3aa 100644 --- a/examples/jctb_moench03_T1.config +++ b/examples/jctb_moench03_T1.config @@ -459,8 +459,8 @@ rx_hostname mpc2011 tengiga 1 -rx_datastream 1 -rx_readfreq 1 +rx_zmqstream 1 +rx_zmqfreq 1 dac 6 800 diff --git a/examples/moench03_T1.config b/examples/moench03_T1.config index add227a02..f69c7b185 100644 --- a/examples/moench03_T1.config +++ b/examples/moench03_T1.config @@ -35,7 +35,7 @@ zmqport 50001 tengiga 1 -rx_datastream 1 +rx_zmqstream 1 @@ -46,7 +46,7 @@ period 0.0006 ############################################ fpath /mnt/moench_data/scratch/ fwrite 0 -rx_datastream 1 +rx_zmqstream 1 rx_jsonpara frameMode frame rx_jsonpara detectorMode counting diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index 560a66019..f3e1856c5 100755 --- a/python/slsdet/detector.py +++ b/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 diff --git a/python/tests/detector_eiger.py b/python/tests/detector_eiger.py index 889e97f07..cc36e93e3 100755 --- a/python/tests/detector_eiger.py +++ b/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): diff --git a/python/tests/detector_test.py b/python/tests/detector_test.py index 08185ca53..aa639ef3b 100755 --- a/python/tests/detector_test.py +++ b/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): diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index 542653e77..f19d06ba6 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -602,7 +602,9 @@ class CmdProxy { {"r_framesperfile", "rx_framesperfile"}, /* ZMQ Streaming Parameters (Receiver<->Client) */ - {"r_readfreq", "rx_readfreq"}, + {"r_readfreq", "rx_zmqfreq"}, + {"rx_readfreq", "rx_zmqfreq"}, + {"rx_datastream", "rx_zmqstream"}, /* Eiger Specific */ {"trimdir", "settingspath"}, @@ -837,8 +839,8 @@ class CmdProxy { {"rx_framesperfile", &CmdProxy::rx_framesperfile}, /* ZMQ Streaming Parameters (Receiver<->Client) */ - {"rx_datastream", &CmdProxy::rx_datastream}, - {"rx_readfreq", &CmdProxy::rx_readfreq}, + {"rx_zmqstream", &CmdProxy::rx_zmqstream}, + {"rx_zmqfreq", &CmdProxy::rx_zmqfreq}, {"rx_zmqstartfnum", &CmdProxy::rx_zmqstartfnum}, {"rx_zmqport", &CmdProxy::rx_zmqport}, {"zmqport", &CmdProxy::zmqport}, @@ -1847,7 +1849,7 @@ class CmdProxy { /* ZMQ Streaming Parameters (Receiver<->Client) */ INTEGER_COMMAND( - rx_datastream, getRxZmqDataStream, setRxZmqDataStream, StringTo, + rx_zmqstream, getRxZmqDataStream, setRxZmqDataStream, StringTo, "[0, 1]\n\tEnable/ disable data streaming from receiver via zmq (eg. " "to GUI or to another process for further processing). This creates/ " "destroys zmq streamer threads in receiver. \n\tSwitching to Gui " @@ -1856,7 +1858,7 @@ class CmdProxy { "receiver for fast applications. "); INTEGER_COMMAND( - rx_readfreq, getRxZmqFrequency, setRxZmqFrequency, StringTo, + rx_zmqfreq, getRxZmqFrequency, setRxZmqFrequency, StringTo, "[nth frame]\n\tFrequency of frames streamed out from receiver via " "zmq\n\tDefault: 1, Means every frame is streamed out. \n\tIf 2, every " "second frame is streamed out. \n\tIf 0, streaming timer is the " diff --git a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp index 4e08946ff..152ac00b4 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp @@ -574,25 +574,25 @@ TEST_CASE("rx_framesperfile", "[.cmd][.rx][.new]") { /* ZMQ Streaming Parameters (Receiver<->Client) */ -TEST_CASE("rx_datastream", "[.cmd][.rx][.new]") { +TEST_CASE("rx_zmqstream", "[.cmd][.rx][.new]") { Detector det; CmdProxy proxy(&det); auto prev_val = det.getRxZmqDataStream(); { std::ostringstream oss; - proxy.Call("rx_datastream", {"1"}, -1, PUT, oss); - REQUIRE(oss.str() == "rx_datastream 1\n"); + proxy.Call("rx_zmqstream", {"1"}, -1, PUT, oss); + REQUIRE(oss.str() == "rx_zmqstream 1\n"); REQUIRE(det.getRxZmqDataStream().squash() == true); } { std::ostringstream oss; - proxy.Call("rx_datastream", {}, -1, GET, oss); - REQUIRE(oss.str() == "rx_datastream 1\n"); + proxy.Call("rx_zmqstream", {}, -1, GET, oss); + REQUIRE(oss.str() == "rx_zmqstream 1\n"); } { std::ostringstream oss; - proxy.Call("rx_datastream", {"0"}, -1, PUT, oss); - REQUIRE(oss.str() == "rx_datastream 0\n"); + proxy.Call("rx_zmqstream", {"0"}, -1, PUT, oss); + REQUIRE(oss.str() == "rx_zmqstream 0\n"); REQUIRE(det.getRxZmqDataStream().squash() == false); } for (int i = 0; i != det.size(); ++i) { @@ -600,24 +600,24 @@ TEST_CASE("rx_datastream", "[.cmd][.rx][.new]") { } } -TEST_CASE("rx_readfreq", "[.cmd][.rx][.new]") { +TEST_CASE("rx_zmqfreq", "[.cmd][.rx][.new]") { Detector det; CmdProxy proxy(&det); auto prev_val = det.getRxZmqFrequency(); { std::ostringstream oss; - proxy.Call("rx_readfreq", {"1"}, -1, PUT, oss); - REQUIRE(oss.str() == "rx_readfreq 1\n"); + proxy.Call("rx_zmqfreq", {"1"}, -1, PUT, oss); + REQUIRE(oss.str() == "rx_zmqfreq 1\n"); } { std::ostringstream oss; - proxy.Call("rx_readfreq", {}, -1, GET, oss); - REQUIRE(oss.str() == "rx_readfreq 1\n"); + proxy.Call("rx_zmqfreq", {}, -1, GET, oss); + REQUIRE(oss.str() == "rx_zmqfreq 1\n"); } { std::ostringstream oss; - proxy.Call("rx_readfreq", {"0"}, -1, PUT, oss); - REQUIRE(oss.str() == "rx_readfreq 0\n"); + proxy.Call("rx_zmqfreq", {"0"}, -1, PUT, oss); + REQUIRE(oss.str() == "rx_zmqfreq 0\n"); } for (int i = 0; i != det.size(); ++i) { det.setRxZmqFrequency(prev_val[i], {i});