X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=research%2FTCS%2Finterface.py;h=cd66ebb8fb979b0677e94ee6cdc0a6b16ba0dd64;hb=019f2279eca0841363f8fd2ab95efebaa7192262;hp=d82a61add5002f2b5dd389e71a9db75ec5c6f463;hpb=e92a01e9d76324aade950e94b3ee46ad3109e3dc;p=matches%2Fhonours.git

diff --git a/research/TCS/interface.py b/research/TCS/interface.py
index d82a61ad..cd66ebb8 100755
--- a/research/TCS/interface.py
+++ b/research/TCS/interface.py
@@ -31,12 +31,12 @@ calibrate = {
 }
 
 # TODO: Adjust aqcuisition parameters here
-aquire = { "DAC_Sweep" : "1500",#"0.0 + 250.0*int(step/250)", # DAC Sweep value (t is in STEPS, not seconds!)
+aquire = { "DAC_Sweep" : "2250.0 - 50.0*int(step/1000)", # 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
 	"ADC_Ie" : 4, # ADC channel to read back Ie through
-	"DAC_Settle" : 2.0, # Time in seconds to wait for DAC to stabilise
+	"DAC_Settle" : 0.0, # Time in seconds to wait for DAC to stabilise
 	#"response_wait" : 0.2, # Time to wait in seconds between sending data and reading back
 	"start_date" : None
 }
@@ -142,12 +142,12 @@ def main():
 
 	# Experiment
 	# TODO: Modify data to record here
-	#sweep = 1
-	record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, None, "Measure emission&sample current varying with time, constant initial energy.")
-	#while True:
-	#	os.system("mkdir -p " + getDate())
-	#	record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 1500, "ADC4 = Power supply output. Sweep " + str(sweep) + " (started on " + aquire["start_date"]+")")
-	#	sweep += 1
+	sweep = 1
+	#record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, None, "Measure emission&sample current varying with time, constant initial energy.")
+	while True:
+		os.system("mkdir -p " + getDate())
+		record_data([4, 5], getDate()+"/"+str(getTime())+".dat", None, 2300, "Measure Ie and Is .Sweep DOWN " + str(sweep) + " (started on " + aquire["start_date"]+")")
+		sweep += 1
 	
 
 def checkList():
@@ -191,8 +191,12 @@ def record_data(ADC_channels, output, pollTime = None, dac_max = None, comment =
 			nextDacValue = int(eval(aquire["DAC_Sweep"]))
 			if (nextDacValue != dacValue):
 				dacValue = nextDacValue
+				if (dacValue < 0):
+					break
 				setDAC(dacValue)
 			step += 1
+		
+
 		if (dac_max != None and dacValue >= dac_max):
 			break