Automatic commit. Mon Aug 20 12:00:04 WST 2012

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

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 5c0a7c4..0495467 100755 (executable)
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -32,8 +32,8 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "1000.0",#"0.0 + 50.0*int(step/60)", # DAC Sweep value (t is in STEPS, not seconds!)
-       "ADC_Averages" : 200,
+aquire = { "DAC_Sweep" : "0.0 + 12.0*int(step/15)", # DAC Sweep value (t is in STEPS, not seconds!)
+       "ADC_Averages" : 50,
        #"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
@@ -77,6 +77,7 @@ parameters = odict.odict([
        ("602 0.001 Battery" , None), 
        ("ADC Regulator" , None),
        ("Sample", None),
+       ("Sample Angle", None),
        ("Title" , None),
        ("Comment" , None),
        ("Data" , None),