git.ucc.asn.au
/
matches
/
honours.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatic commit. Tue Oct 16 00:00:03 WST 2012
[matches/honours.git]
/
research
/
TCS
/
interface.py
diff --git
a/research/TCS/interface.py
b/research/TCS/interface.py
index
7553ab4
..
771ab3c
100755
(executable)
--- a/
research/TCS/interface.py
+++ b/
research/TCS/interface.py
@@
-35,7
+35,7
@@
calibrate = {
}
# TODO: Adjust aqcuisition parameters here
}
# TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "0.0 +
1
.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "0.0 +
50
.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!)
"ADC_Averages" : 100,
#"ADC_Vi" : 5, # ADC channel to read back Vi (set by DAC) through
#"ADC_Is" : 4, # ADC channel to read back Is through
"ADC_Averages" : 100,
#"ADC_Vi" : 5, # ADC channel to read back Vi (set by DAC) through
#"ADC_Is" : 4, # ADC channel to read back Is through
@@
-63,13
+63,15
@@
ser = serial.Serial(
# Put things that are being changed a lot near the top of the list.
parameters = odict.odict([
("Chamber Pressure" , None), # Chamber pressure now automatically determined
# Put things that are being changed a lot near the top of the list.
parameters = odict.odict([
("Chamber Pressure" , None), # Chamber pressure now automatically determined
+ ("Focus Voltage" , None),
("Deflection Voltage" , None),
("Deflection Voltage" , None),
+ ("Accelerating Voltage" , None),
+ ("Venault Voltage" , None),
+
("Title" , None),
("Comment" , None),
("602 Scale" , None),
("Title" , None),
("Comment" , None),
("602 Scale" , None),
- ("Venault Voltage" , None),
- ("Accelerating Voltage" , None),
- ("Focus Voltage" , None),
+
("Initial Voltage" , None),
("Heating Current" , None),
("Initial Voltage" , None),
("Heating Current" , None),
@@
-227,8
+229,8
@@
def main():
# Experiment
# TODO: Modify data to record here
sweep = 1
# Experiment
# TODO: Modify data to record here
sweep = 1
-
#
for i in range(0,1):
- while True:
+ for i in range(0,1):
+
#
while True:
os.system("mkdir -p " + getDate())
record_data([5], getDate()+"/"+str(getTime())+".dat", None, 4001)
os.system("mkdir -p " + getDate())
record_data([5], getDate()+"/"+str(getTime())+".dat", None, 4001)
@@
-396,7
+398,7
@@
def record_data(ADC_channels, output, pollTime = None, dac_max = None):
#gnuplot("set xrange [0:4000]")
gnuplot("set xlabel \"DAC (counts)\"")
gnuplot("set ylabel \"Sample Current (ADC counts)\"")
#gnuplot("set xrange [0:4000]")
gnuplot("set xlabel \"DAC (counts)\"")
gnuplot("set ylabel \"Sample Current (ADC counts)\"")
- gnuplot.plot(Gnuplot.Data(data, title="t = "+str(measure_time), with_="lp", using="
2
:3"))
+ gnuplot.plot(Gnuplot.Data(data, title="t = "+str(measure_time), with_="lp", using="
1
:3"))
for out in output:
if out != sys.stdout:
log_close(out)
for out in output:
if out != sys.stdout:
log_close(out)
UCC
git Repository :: git.ucc.asn.au