pshell_config/x07ma
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
x07maop
2015-12-11 16:00:15 +01:00
parent a1f0455f55
commit 0ba2ab9e55
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+2 -2
View File
@@ -3,9 +3,9 @@ data=ch.psi.pshell.epics.ChannelDoubleArray|DATA 3|Read||
edata=ch.psi.pshell.epics.ChannelDoubleArray|EDATA 3|Read||
idata=ch.psi.pshell.epics.ChannelDoubleArray|IDATA 3|Read||
fdata=ch.psi.pshell.epics.ChannelDoubleArray|FDATA 3|Read||
field_x=ch.psi.pshell.epics.ChannelDouble|X07MA-PC-PS2:M:GO.A|||
field_x=ch.psi.pshell.epics.ControlledVariable|X07MA-PC-PS2:M:GO.A X07MA-PC-PS2:STS:PMCURRENT|||
field_x_done=ch.psi.pshell.epics.ChannelInteger|X07MA-PC-MAG:X:RAMP:DONE|Read||
field_z=ch.psi.pshell.epics.ChannelDouble|X07MA-PC-PS1:M:GO.A|||
field_z=ch.psi.pshell.epics.ControlledVariable|X07MA-PC-PS1:M:GO.A X07MA-PC-PS1:STS:PMCURRENT|||
field_z_done=ch.psi.pshell.epics.ChannelInteger|X07MA-PC-MAG:Z:RAMP:DONE|Read||
pol_mode=ch.psi.pshell.epics.DiscretePositioner|X07MA-ID:MODE|||
pol_offset=ch.psi.pshell.epics.ChannelDouble|X07MA-ID:ENERGY-OFFS|||
script/local.py
+7 -7
View File
@@ -76,23 +76,23 @@ def setHz(field, timeout = -1):
field_z.write(field)
field_z_done.waitValue(1,timeout)
def set_pol_cplus(off = None, timeout = -1):
def set_pol_cplus(offset = None, timeout = -1):
pol_mode.write("CIRC +")
if off is not None:
offset.write(off)
pol_offset.write(offset)
pol_done.waitValue("DONE",timeout)
def set_pol_cminus(off = None, timeout = -1):
def set_pol_cminus(offset = None, timeout = -1):
pol_mode.write("CIRC -")
if off is not None:
offset.write(off)
pol_offset.write(offset)
pol_done.waitValue("DONE",timeout)
def set_pol_lin(angle, off = None, timeout = -1):
def set_pol_lin(angle, offset = None, timeout = -1):
pol_mode.write("LINEAR")
alpha.write(angle)
pol_angle.write(angle)
if off is not None:
offset.write(off)
pol_offset.write(offset)
pol_done.waitValue("DONE",timeout)