diff --git a/python/simple-integration-tests/eiger/test.config b/python/simple-integration-tests/eiger/test.config index 75fc82b40..79ab1f6be 100755 --- a/python/simple-integration-tests/eiger/test.config +++ b/python/simple-integration-tests/eiger/test.config @@ -27,7 +27,7 @@ dr 32 threaded 1 tengiga 0 -vhighvoltage 150 +highvoltage 150 iodelay 660 #gappixels 1 diff --git a/python/simple-integration-tests/jungfrau_0_6/tests/test.par b/python/simple-integration-tests/jungfrau_0_6/tests/test.par index b04533952..78fb87f03 100755 --- a/python/simple-integration-tests/jungfrau_0_6/tests/test.par +++ b/python/simple-integration-tests/jungfrau_0_6/tests/test.par @@ -1 +1 @@ -vhighvoltage 200 \ No newline at end of file +highvoltage 200 \ No newline at end of file diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index e7e197d17..76ad24578 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -508,11 +508,11 @@ class Detector(CppDetectorApi): self.setSourceUDPMAC2(MacAddr(mac)) @property - def vhighvoltage(self): + def highvoltage(self): return element_if_equal(self.getHighVoltage()) - @vhighvoltage.setter - def vhighvoltage(self, v): + @highvoltage.setter + def highvoltage(self, v): self.setHighVoltage(v) @property diff --git a/python/unit-tests/detector_eiger.py b/python/unit-tests/detector_eiger.py index be5d56c61..889e97f07 100755 --- a/python/unit-tests/detector_eiger.py +++ b/python/unit-tests/detector_eiger.py @@ -164,18 +164,18 @@ def test_cannot_set_fw_version(d): def test_get_high_voltage_call_signature(d, mocker): m = mocker.patch('_slsdet.DetectorApi.getDac') d.high_voltage - m.assert_called_once_with('vhighvoltage', -1) + m.assert_called_once_with('highvoltage', -1) def test_get_high_voltage(d, mocker): m = mocker.patch('_slsdet.DetectorApi.getDac') m.return_value = 80 assert d.high_voltage == 80 -#self._api.setDac('vhighvoltage', -1, voltage) +#self._api.setDac('highvoltage', -1, voltage) def test_set_high_voltage(d, mocker): m = mocker.patch('_slsdet.DetectorApi.setDac') d.high_voltage = 80 - m.assert_called_once_with('vhighvoltage', -1, 80) + m.assert_called_once_with('highvoltage', -1, 80) def test_decode_hostname_two_names(d, mocker): m = mocker.patch('_slsdet.DetectorApi.getHostname') diff --git a/python/unit-tests/detector_test.py b/python/unit-tests/detector_test.py index c20bd6f65..08185ca53 100755 --- a/python/unit-tests/detector_test.py +++ b/python/unit-tests/detector_test.py @@ -170,18 +170,18 @@ def test_set_counters_single(d, mocker): # def test_get_high_voltage_call_signature(d, mocker): # m = mocker.patch('_slsdet.DetectorApi.getDac') # d.high_voltage -# m.assert_called_once_with('vhighvoltage', -1) +# m.assert_called_once_with('highvoltage', -1) # def test_get_high_voltage(d, mocker): # m = mocker.patch('_slsdet.DetectorApi.getDac') # m.return_value = 80 # assert d.high_voltage == 80 -# #self._api.setDac('vhighvoltage', -1, voltage) +# #self._api.setDac('highvoltage', -1, voltage) # def test_set_high_voltage(d, mocker): # m = mocker.patch('_slsdet.DetectorApi.setDac') # d.high_voltage = 80 -# m.assert_called_once_with('vhighvoltage', -1, 80) +# m.assert_called_once_with('highvoltage', -1, 80) # def test_decode_hostname_two_names(d, mocker): # m = mocker.patch('_slsdet.DetectorApi.getHostname')