Rev 3413 Rev 3414
Line 80... Line 80...
80 while True: 80 while True:
81 sys.stdout.write("Start measurement now? [ENTER]") 81 sys.stdout.write("Start measurement now? [ENTER]")
82 sys.stdin.readline() 82 sys.stdin.readline()
83   83  
84 ser.write(':DISP?\n') 84 ser.write(':DISP?\n')
85 Prefstart = ser.readline(100) 85 Prefstart = eval(ser.readline(100))
86   86  
87 gauge1.route() 87 gauge1.route()
88 (t1, p1) = gauge1.get_tp() 88 (t1, p1) = gauge1.get_tp()
89 gauge2.route() 89 gauge2.route()
90 (t2, p2) = gauge2.get_tp() 90 (t2, p2) = gauge2.get_tp()
Line 100... Line 100...
100 # (t7, p7) = gauge7.get_tp() 100 # (t7, p7) = gauge7.get_tp()
101 gauge8.route() 101 gauge8.route()
102 (t8, p8) = gauge8.get_tp() 102 (t8, p8) = gauge8.get_tp()
103   103  
104 ser.write(':DISP?\n') 104 ser.write(':DISP?\n')
105 Prefstop = ser.readline(100) 105 Prefstop = eval(ser.readline(100))
106   106  
107 sys.stdout.write(" Temperature: %.2f %.2f %.2f %.2f %.2f %.2f %.2f Pressure: %d %d %d %d %d %d %d %s %s Note: " % (t1, t2, t3, t4, t5, t6, t8, p1, p2, p3, p4, p5, p6, p8, Prefstart, Prefstop )) 107 sys.stdout.write(" Temperature: %.2f %.2f %.2f %.2f %.2f %.2f %.2f Pressure: %d %d %d %d %d %d %d %s %s Note: " % (t1, t2, t3, t4, t5, t6, t8, p1, p2, p3, p4, p5, p6, p8, Prefstart, Prefstop ))
108 note = sys.stdin.readline() 108 note = sys.stdin.readline()
109 f.write("%d\t%s\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%s\t%s\t%s\n" % (time.time(), datetime.datetime.now().isoformat(),t1, t2, t3, t4, t5, t6, t8, p1, p2, p3, p4, p5, p6, p8, Prefstart, Prefstop, note, )) 109 f.write("%d\t%s\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%s\t%s\t%s\n" % (time.time(), datetime.datetime.now().isoformat(),t1, t2, t3, t4, t5, t6, t8, p1, p2, p3, p4, p5, p6, p8, Prefstart, Prefstop, note, ))
110 sys.stdout.flush() 110 sys.stdout.flush()