Closedown

script/HystScan.py

@@ -28,7 +28,7 @@ if RAMP_RATE is not None:
     ramp_rate.write(RAMP_RATE)
     ramp_rate.waitValue(RAMP_RATE,10000)
     
-
+    
 
 if len(ENERGIES) ==2:
   #  dif_series = plot([],"Dif", context="Dif")[0].getSeries(0)
@@ -48,9 +48,8 @@ print "SKIPPED Waiting for start field"
 
 if abs(field.readback.read() - START_FIELD) > FIELD_PRECISION:
     field.write(START_FIELD)
-
-
-#wait_device(field_done, 1)   #ramp_done.wait_for_value(1.0)
+    time.sleep(3.0)
+    wait_device(field_done, 1)   #ramp_done.wait_for_value(1.0)
 wait_device(pol_done, "DONE") 
 
 #open(2.0)
@@ -108,6 +107,5 @@ scan.end()
 
 if RAMP_RATE is not None:
     ramp_rate.write(2.0)
-    time.wait(3.0)
-    ramp_rate.waitValue(2.0,10000)
+    time.sleep(5.0)