-
-parameters = {
- "Accelerating Voltage" : None,
- "Focus Voltage" : None,
- "Deflection Voltage" : None,
- "Venault Voltage" : None,
- "Initial Voltage" : None,
- "Heating Current" : None,
- "Heating Voltage" : None,
- "Chamber Pressure" : 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
-}
+#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
+ ("Focus Voltage" , None),
+ ("Deflection Voltage" , None),
+ ("Accelerating Voltage" , None),
+ ("Venault Voltage" , None),
+
+ ("Title" , None),
+ ("Comment" , None),
+ ("602 Scale" , None),
+
+
+ ("Initial Voltage" , None),
+ ("Heating Current" , None),
+ ("Heating Voltage (across filament)" , None),
+ ("Heating Voltage (across power supply)", None),
+ #("610B Zero" , None),
+ ("602 Zero" , None),
+ #("610B 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),
+ ("Sample", None),
+ ("Sample Angle", None),
+ ("ADC Regulator" , None),
+ ("Data" , None),
+ ("Parameters last checked", None)
+])