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-09-24 10:35:20 +02:00
parent a2f430a9f4
commit 60bf6fefec
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
script/HystScan.py
View File

@@ -11,6 +11,11 @@ MODE = 'CIRC +'
OFFSET = -1.0
"""
controller.dataManager.openOutput()
print "Data folder: " + controller.dataManager.output
#TODO: Print filename
FIELD_PRECISION = 0.01
#Pre-actions
@@ -73,7 +78,7 @@ print "SKIPPED Waiting for start field"
#caput("X07MA-PC-MAG:X:DMD", START_FIELD)
#caput("X07MA-PC-MAG:STARTRAMP.PROC", 1)
#ramp_done.wait_for_value(1.0)
ramp_done.wait_for_value(1.0)
cawait('X07MA-ID:DONE', 'DONE', type = 's')
@@ -140,13 +145,13 @@ while(True):
else:
dif = tey_norm-first
dif_series.appendData(field_readback,dif)
print [field_readback, setpoint2]
print [field_readback, readback2]
print [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, tey_norm, trans_norm]
#print [field_readback, setpoint2]
#print [field_readback, readback2]
#print [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, tey_norm, trans_norm]
scan.append ([field_readback, setpoint2], [field_readback, readback2], [detector1, detector2, detector3, detector4, detector5, detector6, detector7, detector8, tey_norm, trans_norm])
print "Field = " + str(fieldReadback.get())
#print "Field = " + str(fieldReadback.get())
if ramp_done.get() == 1: #If not ramping
print "Not ramping, breaking execution"
break