X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;h=19946edec603c553b29e439be23cd547510a77b5;hb=4b1189c76ae4840a483b3186b086feea43e0536b;hp=f1e3997b66a40af95262dbf3501e590308556aaa;hpb=df79d0a9c6c8d8fb2f91212a31868033e4841b8b;p=matches%2Fhonours.git diff --git a/research/TCS/interface.py b/research/TCS/interface.py index f1e3997b..19946ede 100755 --- a/research/TCS/interface.py +++ b/research/TCS/interface.py @@ -32,7 +32,7 @@ calibrate = { } # TODO: Adjust aqcuisition parameters here -aquire = { "DAC_Sweep" : "0.0 + 50.0*int(step/60)", # DAC Sweep value (t is in STEPS, not seconds!) +aquire = { "DAC_Sweep" : "0.0 + 25.0*int(step/120)", # 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 @@ -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), @@ -109,7 +110,7 @@ def killed_handler(signal, frame): reason = sys.stdin.readline().strip("\r\n ") for out in aquire["open_files"]: sys.stdout.write("# Closing file " + str(out) + "\n") - out.write("# Recieved KILL signal.\n# Reason: " + str(reason)) + out.write("# Recieved KILL signal.\n# Reason: " + str(reason) + "\n") log_close(out)