From f3a14ab8b442f501d76eb9937e96407e57d3db57 Mon Sep 17 00:00:00 2001 From: Mohacsi Istvan Date: Tue, 29 Nov 2022 17:03:42 +0100 Subject: [PATCH] Blacked on 3.10 --- ophyd_devices/epics/devices/SpmBase.py | 10 +++++----- ophyd_devices/epics/devices/XbpmBase.py | 10 +++++----- ophyd_devices/epics/devices/specMotors.py | 18 +++++++++++------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ophyd_devices/epics/devices/SpmBase.py b/ophyd_devices/epics/devices/SpmBase.py index f996bd3..be5a1d6 100644 --- a/ophyd_devices/epics/devices/SpmBase.py +++ b/ophyd_devices/epics/devices/SpmBase.py @@ -57,7 +57,7 @@ class SpmSim(SpmBase): # Define normalized 2D gaussian def gaus2d(x=0, y=0, mx=0, my=0, sx=1, sy=1): return np.exp( - -((x - mx) ** 2.0 / (2.0 * sx**2.0) + (y - my) ** 2.0 / (2.0 * sy**2.0)) + -((x - mx) ** 2.0 / (2.0 * sx ** 2.0) + (y - my) ** 2.0 / (2.0 * sy ** 2.0)) ) # Generator for dynamic values @@ -73,10 +73,10 @@ class SpmSim(SpmBase): beam = self._simFrame() total = np.sum(beam) - np.sum(beam[24:48, :]) rnge = np.floor(np.log10(total) - 0.0) - s1 = np.sum(beam[0:16, :]) / 10**rnge - s2 = np.sum(beam[16:24, :]) / 10**rnge - s3 = np.sum(beam[40:48, :]) / 10**rnge - s4 = np.sum(beam[48:64, :]) / 10**rnge + s1 = np.sum(beam[0:16, :]) / 10 ** rnge + s2 = np.sum(beam[16:24, :]) / 10 ** rnge + s3 = np.sum(beam[40:48, :]) / 10 ** rnge + s4 = np.sum(beam[48:64, :]) / 10 ** rnge self.s1w.set(s1).wait() self.s2w.set(s2).wait() diff --git a/ophyd_devices/epics/devices/XbpmBase.py b/ophyd_devices/epics/devices/XbpmBase.py index 9035412..8a2a853 100644 --- a/ophyd_devices/epics/devices/XbpmBase.py +++ b/ophyd_devices/epics/devices/XbpmBase.py @@ -87,7 +87,7 @@ class XbpmSim(XbpmBase): # define normalized 2D gaussian def gaus2d(x=0, y=0, mx=0, my=0, sx=1, sy=1): return np.exp( - -((x - mx) ** 2.0 / (2.0 * sx**2.0) + (y - my) ** 2.0 / (2.0 * sy**2.0)) + -((x - mx) ** 2.0 / (2.0 * sx ** 2.0) + (y - my) ** 2.0 / (2.0 * sy ** 2.0)) ) # Generator for dynamic values @@ -103,10 +103,10 @@ class XbpmSim(XbpmBase): beam = self._simFrame() total = np.sum(beam) rnge = np.floor(np.log10(total) - 0.0) - s1 = np.sum(beam[32:64, 32:64]) / 10**rnge - s2 = np.sum(beam[0:32, 32:64]) / 10**rnge - s3 = np.sum(beam[32:64, 0:32]) / 10**rnge - s4 = np.sum(beam[0:32, 0:32]) / 10**rnge + s1 = np.sum(beam[32:64, 32:64]) / 10 ** rnge + s2 = np.sum(beam[0:32, 32:64]) / 10 ** rnge + s3 = np.sum(beam[32:64, 0:32]) / 10 ** rnge + s4 = np.sum(beam[0:32, 0:32]) / 10 ** rnge self.s1w.set(s1).wait() self.s2w.set(s2).wait() diff --git a/ophyd_devices/epics/devices/specMotors.py b/ophyd_devices/epics/devices/specMotors.py index 696e119..04e83b6 100644 --- a/ophyd_devices/epics/devices/specMotors.py +++ b/ophyd_devices/epics/devices/specMotors.py @@ -17,7 +17,8 @@ from ophyd import ( PseudoPositioner, PseudoSingle, PVPositioner, - Device, Signal, + Device, + Signal, Component, DynamicDeviceComponent, Kind, @@ -208,6 +209,7 @@ class EnergyKev(VirtualEpicsSignalRO): class CurrentSum(Signal): """Adds up four current signals from the parent""" + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.parent.ch1.subscribe(self._emit_value) @@ -215,10 +217,15 @@ class CurrentSum(Signal): def _emit_value(self, **kwargs): timestamp = kwargs.pop("timestamp", time.time()) self.wait_for_connection() - self._run_subs(sub_type='value', timestamp=timestamp, obj=self) + self._run_subs(sub_type="value", timestamp=timestamp, obj=self) def get(self, *args, **kwargs): - total = self.parent.ch1.get() + self.parent.ch2.get() + self.parent.ch3.get() + self.parent.ch4.get() + total = ( + self.parent.ch1.get() + + self.parent.ch2.get() + + self.parent.ch3.get() + + self.parent.ch4.get() + ) return total @@ -230,9 +237,7 @@ class Bpm4i(Device): ch2 = Component(EpicsSignalRO, "S3", auto_monitor=True, kind=Kind.omitted, name="ch2") ch3 = Component(EpicsSignalRO, "S4", auto_monitor=True, kind=Kind.omitted, name="ch3") ch4 = Component(EpicsSignalRO, "S5", auto_monitor=True, kind=Kind.omitted, name="ch4") - sum = Component(CurrentSum, kind=Kind.hinted, name="sum", ) - - + sum = Component(CurrentSum, kind=Kind.hinted, name="sum",) if __name__ == "__main__": @@ -240,4 +245,3 @@ if __name__ == "__main__": dut.wait_for_connection() print(dut.read()) print(dut.describe()) -