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

Startup

Browse Source
This commit is contained in:
x07maop
2016-05-01 17:06:11 +02:00
parent a7449aa8fe
commit ca26c43aca
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
script/HystScan.py
View File

@@ -96,9 +96,12 @@ while(True):
dif_series.appendData(field_readback,dif)
scan.append ([field_readback, setpoint2], [field_readback, readback2], [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, tey_norm, trans_norm])
if field_done.read() == 1: #If not ramping #ramp_done.get() == 1:
print "Not ramping, breaking execution"
#if field_done.read() == 1: #If not ramping #ramp_done.get() == 1:
if abs(field_readback - END_FIELD) < 0.007:
print "Field has reached target, breaking execution."
break
index = index+1
scan.end()
ramp_rate.write(2.0)

2
script/local.py
View File

@@ -222,7 +222,7 @@ def close_valve(delay = 0.0): #TODO: Check default delay
"""
"""
valve_try_open.write(0)
time.sleep(fset_pol_cplusloat(delay))
time.sleep(float(delay))
def set_energy (value, delay=0.5):
"""