X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=research%2FTCS%2Finterface.py;fp=research%2FTCS%2Finterface.py;h=43f7a6dfac0bfdb1760c648bba1c90b91ed6854e;hb=d6bdb39c05481f4deef15a535452a31a7019d09c;hp=7b3c0e15ea0a805622f59758c3e82067d42fdfc4;hpb=42977a93534c13419167a935c5ff9b1f1ab00019;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index 7b3c0e15..43f7a6df 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -35,7 +35,7 @@ calibrate = {
 }
 
 # 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
@@ -62,10 +62,11 @@ ser = serial.Serial(
 #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),
@@ -76,15 +77,15 @@ parameters = odict.odict([
 	#("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)
 ])
@@ -96,9 +97,15 @@ def getDate():
 	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
@@ -262,7 +269,7 @@ def checkList():
 				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
 
@@ -300,7 +307,7 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None):
 	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: