bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 10 Actions Packages Projects Releases 126 Wiki Activity

Codestyle

Browse Source
This commit is contained in:
mohacsi_i 2022-11-14 18:00:18 +01:00
parent c7867a910f
commit 3a7dd4e3cf
5 changed files with 107 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ophyd_devices/epics/proxies/SpmBase.py
View File

@ -53,13 +53,13 @@ class SpmSim(SpmBase):
def _simFrame(self): def _simFrame(self):
"""Generator to simulate a jumping gaussian""" """Generator to simulate a jumping gaussian"""
# define normalized 2D gaussian # Define normalized 2D gaussian
def gaus2d(x=0, y=0, mx=0, my=0, sx=1, sy=1): def gaus2d(x=0, y=0, mx=0, my=0, sx=1, sy=1):
return np.exp(-((x - mx)**2. / (2. * sx**2.) + (y - my)**2. / (2. * sy**2.))) return np.exp(-((x - mx)**2. / (2. * sx**2.) + (y - my)**2. / (2. * sy**2.)))
#Generator for dynamic values # Generator for dynamic values
self._MX = 0.75 * self._MX + 0.25 * (10.0 * np.random.random()-5.0) self._MX = 0.75 * self._MX + 0.25 * (10.0 * np.random.random() - 5.0)
self._MY = 0.75 * self._MY + 0.25 * (10.0 * np.random.random()-5.0) self._MY = 0.75 * self._MY + 0.25 * (10.0 * np.random.random() - 5.0)
self._I0 = 0.75 * self._I0 + 0.25 * (255.0 * np.random.random()) self._I0 = 0.75 * self._I0 + 0.25 * (255.0 * np.random.random())
arr = self._I0 * gaus2d(self._x, self._y, self._MX, self._MY) arr = self._I0 * gaus2d(self._x, self._y, self._MX, self._MY)
@ -68,12 +68,12 @@ class SpmSim(SpmBase):
def sim(self): def sim(self):
# Get next frame # Get next frame
beam = self._simFrame() beam = self._simFrame()
total = np.sum(beam) - np.sum(beam[24:48,:]) total = np.sum(beam) - np.sum(beam[24:48, :])
rnge = np.floor(np.log10(total) - 0.0 ) rnge = np.floor(np.log10(total) - 0.0)
s1 = np.sum(beam[0:16,:]) / 10**rnge s1 = np.sum(beam[0:16, :]) / 10**rnge
s2 = np.sum(beam[16:24,:]) / 10**rnge s2 = np.sum(beam[16:24, :]) / 10**rnge
s3 = np.sum(beam[40:48,:]) / 10**rnge s3 = np.sum(beam[40:48, :]) / 10**rnge
s4 = np.sum(beam[48:64,:]) / 10**rnge s4 = np.sum(beam[48:64, :]) / 10**rnge
self.s1w.set(s1).wait() self.s1w.set(s1).wait()
self.s2w.set(s2).wait() self.s2w.set(s2).wait()
@ -82,8 +82,8 @@ class SpmSim(SpmBase):
self.rangew.set(rnge).wait() self.rangew.set(rnge).wait()
# Print debug info # Print debug info
print(f"Raw signals: R={rnge}\t{s1}\t{s2}\t{s3}\t{s4}") print(f"Raw signals: R={rnge}\t{s1}\t{s2}\t{s3}\t{s4}")
#plt.imshow(beam) # plt.imshow(beam)
#plt.show(block=False) # plt.show(block=False)
plt.pause(0.5) plt.pause(0.5)

41
ophyd_devices/epics/proxies/mono_dccm.py
View File

@ -9,14 +9,15 @@ IMPORTANT: Virtual monochromator axes should be implemented already in EPICS!!!
import numpy as np import numpy as np
from math import isclose from math import isclose
from ophyd import EpicsSignal, EpicsSignalRO, EpicsMotor, PseudoPositioner, PseudoSingle, Device, Component, Kind from ophyd import (EpicsSignal, EpicsSignalRO, EpicsMotor, PseudoPositioner,
PseudoSingle, Device, Component, Kind)
from ophyd.pseudopos import pseudo_position_argument, real_position_argument from ophyd.pseudopos import pseudo_position_argument, real_position_argument
from ophyd.sim import SynAxis, Syn2DGauss from ophyd.sim import SynAxis, Syn2DGauss
LN_CORR = 2e-4 LN_CORR = 2e-4
def a2e(angle, hkl=[1,1,1], lnc=False, bent=False, deg=False): def a2e(angle, hkl=[1, 1, 1], lnc=False, bent=False, deg=False):
"""Convert between angle and energy for Si monchromators """Convert between angle and energy for Si monchromators
ATTENTION: 'angle' must be in radians, not degrees! ATTENTION: 'angle' must be in radians, not degrees!
""" """
@ -24,7 +25,7 @@ def a2e(angle, hkl=[1,1,1], lnc=False, bent=False, deg=False):
angle = angle*np.pi/180 if deg else angle angle = angle*np.pi/180 if deg else angle
# Lattice constant along direction # Lattice constant along direction
d0 = 5.43102 * (1.0-lncorr) / np.linalg.norm(hkl) d0 = 5.43102 * (1.0 - lncorr) / np.linalg.norm(hkl)
energy = 12.39842 / (2.0 * d0 * np.sin(angle)) energy = 12.39842 / (2.0 * d0 * np.sin(angle))
return energy return energy
@ -41,22 +42,22 @@ def w2e(wwl):
return 12398.42 * 0.1 / wwl return 12398.42 * 0.1 / wwl
def e2a(energy, hkl=[1,1,1], lnc=False, bent=False): def e2a(energy, hkl=[1, 1, 1], lnc=False, bent=False):
"""Convert between energy and angle for Si monchromators """Convert between energy and angle for Si monchromators
ATTENTION: 'angle' must be in radians, not degrees! ATTENTION: 'angle' must be in radians, not degrees!
""" """
lncorr = LN_CORR if lnc else 0.0 lncorr = LN_CORR if lnc else 0.0
# Lattice constant along direction # Lattice constant along direction
d0 = 2*5.43102 * (1.0-lncorr) / np.linalg.norm(hkl) d0 = 2 * 5.43102 * (1.0 - lncorr) / np.linalg.norm(hkl)
angle = np.arcsin(12.39842/d0/energy) angle = np.arcsin(12.39842 / d0 / energy)
# Rfine for bent mirror # Rfine for bent mirror
if bent: if bent:
rho = 2 * 19.65 * 8.35 / 28 * np.sin(angle) rho = 2 * 19.65 * 8.35 / 28 * np.sin(angle)
dt = 0.2e-3 / rho * 0.279 dt = 0.2e-3 / rho * 0.279
d0 = 2 * 5.43102 * (1.0+dt) / np.linalg.norm(hkl) d0 = 2 * 5.43102 * (1.0 + dt) / np.linalg.norm(hkl)
angle = np.arcsin(12.39842/d0/energy) angle = np.arcsin(12.39842 / d0 / energy)
return angle return angle
@ -102,22 +103,30 @@ class MonoDccm(PseudoPositioner):
energy = Component(PseudoSingle, name='energy', kind=Kind.hinted) energy = Component(PseudoSingle, name='energy', kind=Kind.hinted)
# Other parameters # Other parameters
#feedback = Component(EpicsSignal, "MONOBEAM", name="feedback") # feedback = Component(EpicsSignal, "MONOBEAM", name="feedback")
#enc1 = Component(EpicsSignalRO, "1:EXC1", name="enc1") # enc1 = Component(EpicsSignalRO, "1:EXC1", name="enc1")
#enc2 = Component(EpicsSignalRO, "1:EXC2", name="enc2") # enc2 = Component(EpicsSignalRO, "1:EXC2", name="enc2")
@pseudo_position_argument @pseudo_position_argument
def forward(self, pseudo_pos): def forward(self, pseudo_pos):
"""WARNING: We have an overdefined system! Not sure if common crystal movement is reliable without retuning""" """WARNING: We have an overdefined system! Not sure if common crystal movement is reliable without retuning"""
if abs(pseudo_pos.energy-self.energy.position) > 0.0001 and abs(pseudo_pos.en1-self.en1.position) < 0.0001 and abs(pseudo_pos.en2-self.en2.position) < 0.0001: if abs(pseudo_pos.energy-self.energy.position) > 0.0001 and abs(pseudo_pos.en1-self.en1.position) < 0.0001 and abs(pseudo_pos.en2-self.en2.position) < 0.0001:
# Probably the common energy was changed # Probably the common energy was changed
return self.RealPosition(th1=-180.0*e2a(pseudo_pos.energy)/3.141592, th2=180.0*e2a(pseudo_pos.energy)/3.141592) return self.RealPosition(
th1=-180.0 * e2a(pseudo_pos.energy) / 3.141592,
th2=180.0 * e2a(pseudo_pos.energy) / 3.141592
)
else: else:
# Probably the individual axes was changes # Probably the individual axes was changes
return self.RealPosition(th1=-180.0*e2a(pseudo_pos.en1)/3.141592, th2=180.0*e2a(pseudo_pos.en2)/3.141592) return self.RealPosition(
th1=-180.0 * e2a(pseudo_pos.en1 / 3.141592,
th2=180.0 * e2a(pseudo_pos.en2) / 3.141592
)
@real_position_argument @real_position_argument
def inverse(self, real_pos): def inverse(self, real_pos):
return self.PseudoPosition(en1=-a2e(3.141592*real_pos.th1/180.0), return self.PseudoPosition(
en2=a2e(3.141592*real_pos.th2/180.0), en1=-a2e(3.141592 * real_pos.th1 / 180.0),
energy=-a2e(3.141592*real_pos.th1/180.0)) en2=a2e(3.141592 * real_pos.th2 / 180.0),
energy=-a2e(3.141592 * real_pos.th1 / 180.0)
)

6
ophyd_devices/epics/proxies/slits.py
View File

@ -1,5 +1,5 @@
from ophyd import Device, Component, EpicsMotor, PseudoPositioner, PseudoSingle from ophyd import Device, Component, EpicsMotor, PseudoPositioner, PseudoSingle
from ophyd.pseudopos import pseudo_position_argument,real_position_argument from ophyd.pseudopos import pseudo_position_argument, real_position_argument
class SlitH(PseudoPositioner): class SlitH(PseudoPositioner):
@ -20,13 +20,13 @@ class SlitH(PseudoPositioner):
@pseudo_position_argument @pseudo_position_argument
def forward(self, pseudo_pos): def forward(self, pseudo_pos):
'''Run a forward (pseudo -> real) calculation''' """Run a forward (pseudo -> real) calculation"""
return self.RealPosition(x1=pseudo_pos.cenx-pseudo_pos.gapx/2, return self.RealPosition(x1=pseudo_pos.cenx-pseudo_pos.gapx/2,
x2=pseudo_pos.cenx+pseudo_pos.gapx/2) x2=pseudo_pos.cenx+pseudo_pos.gapx/2)
@real_position_argument @real_position_argument
def inverse(self, real_pos): def inverse(self, real_pos):
'''Run an inverse (real -> pseudo) calculation''' """Run an inverse (real -> pseudo) calculation"""
return self.PseudoPosition(cenx=(real_pos.x1+real_pos.x2)/2, return self.PseudoPosition(cenx=(real_pos.x1+real_pos.x2)/2,
gapx=real_pos.x2-real_pos.x1) gapx=real_pos.x2-real_pos.x1)