Automatic commit. Thu Jul 26 01:00:02 WST 2012

[matches/honours.git] / research / TCS / interface.py

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index a650834..1422c44 100755 (executable)
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -146,7 +146,7 @@ def main():
        #record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, None, "Measure emission&sample current varying with time, constant initial energy.")
        while True:
                os.system("mkdir -p " + getDate())
-               record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 2300, "Sweep " + str(sweep) + " (started on " + aquire["start_date"]+")")
+               record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 2250, "Sweep " + str(sweep) + " (started on " + aquire["start_date"]+")")
                sweep += 1
        
 
@@ -193,7 +193,7 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None, comment =
                                dacValue = nextDacValue
                                setDAC(dacValue)
                        step += 1
-               if (dac_max != None and dacValue == dac_max):
+               if (dac_max != None and dacValue >= dac_max):
                        break
 
                measure_start = time.time()