# HG changeset patch
# User Daniel O'Connor <doconnor@gsoft.com.au>
# Date 1359599411 -37800
# Node ID d143ef509fb73c0e2ea710e4d0a236159596f959
# Parent  22187590594b45e22997e1381b5f608db2978077
- Print configuration details before starting
- Display units

diff -r 22187590594b -r d143ef509fb7 rs_fsp7_noisetest.py
--- a/rs_fsp7_noisetest.py	Thu Jan 31 12:53:22 2013 +1030
+++ b/rs_fsp7_noisetest.py	Thu Jan 31 13:00:11 2013 +1030
@@ -162,9 +162,10 @@
 
     r.write("INIT:CONT OFF")
 
+    print "Centre: %.1f Mhz, Span %.1f Mhz, Input %.1f MHz, %d sweeps, ENR %.2f dB" % (freq / 1e6, options.span / 1e6, options.input / 1e6, options.sweeps, enr)
     while True:
         off, on, nf = donoisetest(r, enr)
-        print "Off %.3f dB, on %.3f dB, ENR %.2f, NF %.2f" % (off, on, enr, nf)
+        print "Off %.3f dBm/Hz, on %.3f dBm/Hz, NF %.2f dB" % (off, on, nf)
         print "Press enter to perform a new measurement"
         sys.stdin.readline()