Automatic commit. Mon Jul 30 16:00:03 WST 2012

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

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 50aa7d1..d49f1f8 100755 (executable)
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -31,11 +31,11 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "2200.0 - 50.0*int(step/1000)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0",#"0.0 + 250.0*int(step/200)", # 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
+       "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" : 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
@@ -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, "Measure Ie and Is .Sweep DOWN " + str(sweep) + " (started on " + aquire["start_date"]+")")
+               record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 2300, "ADC4 = Is; ADC5 = Va, manually change initial energy" + str(sweep) + " (started on " + aquire["start_date"]+")")
                sweep += 1