}
# TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "0.0 + 50.0*int(step)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "2000.0 + 500.0*int(step/500)", # 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
#Using an ordered dictionary, so results will be determined (or prompted for) in this order.
# 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
- ("Venault Voltage" , None),
+ ("Chamber Pressure" , None), # Chamber pressure now automatically determined
("Title" , None),
("Comment" , None),
+ ("602 Scale" , None),
+ ("Venault Voltage" , None),
("Accelerating Voltage" , None),
("Focus Voltage" , None),
("Deflection Voltage" , None),
#("610B Zero" , None),
("602 Zero" , None),
#("610B Scale" , None),
- ("602 Scale" , None),
+
("602 0.1 Battery" , None),
("602 0.03 Battery" , None),
("602 0.01 Battery" , None),
("602 0.003 Battery" , None),
("602 0.001 Battery" , None),
- ("ADC Regulator" , None),
("Sample", None),
("Sample Angle", None),
+ ("ADC Regulator" , None),
("Data" , None),
("Parameters last checked", None)
])
return str(datetime.datetime.now()).split(" ")[0]
def getPressure():
- return 0.0
- p = subprocess.Popen("./pressure/get_pressure.sh", stdout=subprocess.PIPE)
- return float(p.stdout.readline().strip(" \r\n\t"))
+
+ try:
+ p = subprocess.Popen("./pressure/get_pressure.sh", stdout=subprocess.PIPE)
+ #p = subprocess.Popen("./this_program_does_not_exist.sh", stdout=subprocess.PIPE)
+ #result = float("a")
+ result = float(p.stdout.readline().strip(" \r\n\t"))
+ except:
+ return 0.0
+ return result
# Used for when I press Control-C to stop things
continue
if item == "Chamber Pressure":
#sys.stdout.write("\""+str(item)+"\" = " + str(parameters[item]) + " - get new pressure... ")
- #parameters[item] = getPressure()
+ parameters[item] = getPressure()
#sys.stdout.write(str(parameters[item]) + "\n")
continue
for out in output:
out.write("# Parameters:\n")
- #parameters["Chamber Pressure"] = getPressure() # Update chamber pressure
+ parameters["Chamber Pressure"] = getPressure() # Update chamber pressure
for field in parameters:
for out in output: