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

Merge branch 'fix-delaygen' into 'sgalil_integration_cSAXS'

Browse Source 
Delaygen pseudoaxis fix

See merge request bec/ophyd_devices!30
This commit is contained in:
appel_c 2023-07-04 15:12:31 +00:00
commit 913188fd85
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ophyd_devices/epics/devices/DelayGeneratorDG645.py
View File

@ -6,7 +6,7 @@ Created on Tue Nov 9 16:12:47 2021
""" """
from ophyd import Device, Component, EpicsSignal, EpicsSignalRO, Kind from ophyd import Device, Component, EpicsSignal, EpicsSignalRO, Kind
from ophyd import PositionerBase from ophyd import PositionerBase, PVPositioner, Signal
from ophyd.pseudopos import ( from ophyd.pseudopos import (
pseudo_position_argument, pseudo_position_argument,
real_position_argument, real_position_argument,
@ -40,10 +40,10 @@ class DelayStatic(Device):
) )
class DummyPositioner(Device, PositionerBase): class DummyPositioner(PVPositioner):
setpoint = Component(EpicsSignal, "DelayAO", kind=Kind.config) setpoint = Component(EpicsSignal, "DelayAO", put_complete=True, kind=Kind.config)
readback = Component(EpicsSignalRO, "DelayAI", kind=Kind.config) readback = Component(EpicsSignalRO, "DelayAI", kind=Kind.config)
done = Component(Signal, value=1)
class DelayPair(PseudoPositioner): class DelayPair(PseudoPositioner):
"""Delay pair interface for DG645 """Delay pair interface for DG645
@ -56,6 +56,8 @@ class DelayPair(PseudoPositioner):
delay = Component(PseudoSingle, limits=(0, 2000.0), name="delay") delay = Component(PseudoSingle, limits=(0, 2000.0), name="delay")
width = Component(PseudoSingle, limits=(0, 2000.0), name="pulsewidth") width = Component(PseudoSingle, limits=(0, 2000.0), name="pulsewidth")
# The real delay axes # The real delay axes
#ch1 = Component(EpicsSignal, "DelayAI", write_pv="DelayAO", name="ch1", put_complete=True, kind=Kind.config)
#ch2 = Component(EpicsSignal, "DelayAI", write_pv="DelayAO", name="ch2", put_complete=True, kind=Kind.config)
ch1 = Component(DummyPositioner, name="ch1") ch1 = Component(DummyPositioner, name="ch1")
ch2 = Component(DummyPositioner, name="ch2") ch2 = Component(DummyPositioner, name="ch2")
@ -150,8 +152,7 @@ class DelayGeneratorDG645(Device):
) )
# Command PVs # Command PVs
arm = Component( arm = Component(EpicsSignal, "TriggerDelayBO", name="arm", kind=Kind.omitted
EpicsSignal, "TriggerDelayBI", write_pv="TriggerDelayBO", name="arm", kind=Kind.omitted
) )
# Burst mode # Burst mode