Closedown

script/local.py

@@ -111,10 +111,10 @@ from keithley import KeiSample, KeiReference
 
 def prepare_keithleys(dwell, triggered):
     """
-    prepare keithleys for gpib polling:
-    passive, bus triggered, dwell time
-    
-    dwell = dwell time in seconds (0.1 - 20.0)
+    prepare keithleys.
+
+    at the moment, the dwell time has to be set manually by selecting one of the poll modes
+    slow = 100 ms, medium = 20 ms, fast = 2 ms.
     """
     KeiSample.prepare(dwell, triggered)
     KeiReference.prepare(dwell, triggered)
@@ -130,7 +130,6 @@ def trig_keithleys():
 def wait_keithleys():
     """
     wait for one dwell time so that the keithleys can finish their measurement.
-    if we polled them too early, they would produce an error message.
     """
     time.sleep(KeiSample.dwell * 2.2)
 
@@ -325,7 +324,7 @@ def after_scan():
     Close shutter and turn off analyser
     """
     caput("X03DA-PC:AFTER-SCAN.PROC", 1)
-    release_keithleys()
+    #release_keithleys()
     
 def set_adc_averaging(dwelltime=0.0):
     if dwelltime == 0.0: