Older blacking

This commit is contained in:
mohacsi_i 2022-11-23 12:09:05 +01:00
parent 9c27f8f999
commit 7adb38ddfc
3 changed files with 19 additions and 27 deletions

View File

@ -58,7 +58,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
@ -74,10 +74,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()

View File

@ -88,7 +88,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
@ -104,10 +104,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()

View File

@ -95,8 +95,7 @@ class PmDetectorRotation(PseudoPositioner):
class GirderMotorX1(PVPositioner):
"""Girder X translation pseudo motor
"""
"""Girder X translation pseudo motor"""
setpoint = Component(EpicsSignal, ":X_SET", name="sp")
readback = Component(EpicsSignalRO, ":X1", name="rbv")
@ -104,8 +103,7 @@ class GirderMotorX1(PVPositioner):
class GirderMotorY1(PVPositioner):
"""Girder Y translation pseudo motor
"""
"""Girder Y translation pseudo motor"""
setpoint = Component(EpicsSignal, ":Y_SET", name="sp")
readback = Component(EpicsSignalRO, ":Y1", name="rbv")
@ -113,8 +111,7 @@ class GirderMotorY1(PVPositioner):
class GirderMotorYAW(PVPositioner):
"""Girder YAW pseudo motor
"""
"""Girder YAW pseudo motor"""
setpoint = Component(EpicsSignal, ":YAW_SET", name="sp")
readback = Component(EpicsSignalRO, ":YAW1", name="rbv")
@ -122,8 +119,7 @@ class GirderMotorYAW(PVPositioner):
class GirderMotorROLL(PVPositioner):
"""Girder ROLL pseudo motor
"""
"""Girder ROLL pseudo motor"""
setpoint = Component(EpicsSignal, ":ROLL_SET", name="sp")
readback = Component(EpicsSignalRO, ":ROLL1", name="rbv")
@ -131,8 +127,7 @@ class GirderMotorROLL(PVPositioner):
class GirderMotorPITCH(PVPositioner):
"""Girder YAW pseudo motor
"""
"""Girder YAW pseudo motor"""
setpoint = Component(EpicsSignal, ":PITCH_SET", name="sp")
readback = Component(EpicsSignalRO, ":PITCH1", name="rbv")
@ -159,8 +154,7 @@ class VirtualEpicsSignalRO(EpicsSignalRO):
class MonoTheta1(VirtualEpicsSignalRO):
"""Converts the pusher motor position to theta angle
"""
"""Converts the pusher motor position to theta angle"""
_mono_a0_enc_scale1 = -1.0
_mono_a1_lever_length1 = 206.706
@ -176,8 +170,7 @@ class MonoTheta1(VirtualEpicsSignalRO):
class MonoTheta2(VirtualEpicsSignalRO):
"""Converts the pusher motor position to theta angle
"""
"""Converts the pusher motor position to theta angle"""
_mono_a3_enc_offs2 = -19.7072
_mono_a2_pusher_offs2 = 5.93905
@ -193,8 +186,7 @@ class MonoTheta2(VirtualEpicsSignalRO):
class EnergyKev(VirtualEpicsSignalRO):
"""Converts the pusher motor position to energy in keV
"""
"""Converts the pusher motor position to energy in keV"""
_mono_a3_enc_offs2 = -19.7072
_mono_a2_pusher_offs2 = 5.93905