Automatic commit. Fri Jul 27 11:00:02 WST 2012

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

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index d82a61a..afcac7e 100755 (executable)
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -31,12 +31,12 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "1500",#"0.0 + 250.0*int(step/250)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "1500",#"0.0 + 250.0*int(step/1000)", # DAC Sweep value (t is in STEPS, not seconds!)
        "ADC_Averages" : 200,
        "ADC_Vi" : 5, # ADC channel to read back Vi (set by DAC) through
        "ADC_Is" : 4, # ADC channel to read back Is through
        "ADC_Ie" : 4, # ADC channel to read back Ie through
-       "DAC_Settle" : 2.0, # Time in seconds to wait for DAC to stabilise
+       "DAC_Settle" : 0.0, # Time in seconds to wait for DAC to stabilise
        #"response_wait" : 0.2, # Time to wait in seconds between sending data and reading back
        "start_date" : None
 }
@@ -142,12 +142,12 @@ def main():
 
        # Experiment
        # TODO: Modify data to record here
-       #sweep = 1
-       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, 1500, "ADC4 = Power supply output. Sweep " + str(sweep) + " (started on " + aquire["start_date"]+")")
-       #       sweep += 1
+       sweep = 1
+       #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, 2250, " Sweep " + str(sweep) + " (started on " + aquire["start_date"]+")")
+               sweep += 1
        
 
 def checkList():