Mercurial > ~darius > hgwebdir.cgi > pyinst
changeset 77:23c96322cfb6 default tip
Spell Rohde Schwarz correctly.
| author | Daniel O'Connor <doconnor@gsoft.com.au> |
|---|---|
| date | Fri, 27 Sep 2024 11:34:16 +0930 |
| parents | e2bb136bd2ed |
| children | |
| files | fsp7_phasenoise.py rs_fsp7_noisetest.py specan.py |
| diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/fsp7_phasenoise.py Fri Sep 27 10:05:55 2024 +0930 +++ b/fsp7_phasenoise.py Fri Sep 27 11:34:16 2024 +0930 @@ -243,7 +243,7 @@ r.write('MMEM:DEL %s' % (sapath,)) if __name__ == '__main__': - parser = argparse.ArgumentParser(description = 'Configures a Rhode Schwartz FSP7 spectrum analyser to do a phase noise measurement') + parser = argparse.ArgumentParser(description = 'Configures a Rohde Schwarz FSP7 spectrum analyser to do a phase noise measurement') parser.add_argument('-a', '--atten', default = None, help = 'Attenuation level (default: autoamatic)') parser.add_argument('-r', '--rlevel', default = 10, help = 'Reference level (default: %default dBm)', type = float) parser.add_argument('-s', '--ssprefix', default = None, help = 'Path name to save screenshots to (default: none)', type = str)
--- a/rs_fsp7_noisetest.py Fri Sep 27 10:05:55 2024 +0930 +++ b/rs_fsp7_noisetest.py Fri Sep 27 11:34:16 2024 +0930 @@ -48,7 +48,7 @@ rtndb = 10 * math.log10(rtn) return rtndb - + def setup(r, freq, span, sweeps, bw): # Reset to defaults r.write("*RST") @@ -80,7 +80,7 @@ # Set video bandwidth (10x res BW) r.write("SENS1:BAND:VID %f Hz" % (bw * 10)) - + def getnoise(r): # Trigger the sweep r.write("INIT;*WAI") @@ -90,7 +90,7 @@ opc = scpi.getdata(r.read(None), int) #print "OPC - %d" % (opc) assert(opc == 1) - + # Set data format r.write("FORM:DATA ASC") @@ -117,7 +117,7 @@ enr = 10 ** (enrdb / 10) nf = 10 * math.log10(enr / (y - 1)) return nf - + def donoisetest(r, enr): print("Acquiring with noise off..") setnoise(r, False) @@ -128,8 +128,8 @@ return off, on, calcnf(enr, off, on) if __name__ == '__main__': - parser = optparse.OptionParser(usage = '%prog [options] address frequency', - description = 'Configures a Rhode Schwartz FSP7 spectrum analyser to do a noise figure test', + parser = optparse.OptionParser(usage = '%prog [options] address frequency', + description = 'Configures a Rohde Schwarz FSP7 spectrum analyser to do a noise figure test', epilog = 'video bandwidth is set to 10 times the resolution bandwidth') parser.add_option('-s', '--span', dest = 'span', default = 1e6, help = 'Span frequency in Hz (default: %default)', type = float) parser.add_option('-i', '--input', dest = 'input', default = None, help = 'Frequency used to compute ENR (defaults to frequency)', type = float)
--- a/specan.py Fri Sep 27 10:05:55 2024 +0930 +++ b/specan.py Fri Sep 27 11:34:16 2024 +0930 @@ -77,7 +77,7 @@ return rtn class RSSPA(Traceinst): - '''Rhode & Schwartz Spectrum Analyzer''' + '''Rohde & Schwarz Spectrum Analyzer''' attrs = { 'fstart' : ['FREQ:START', float, None], # Page 561 'fstop' : ['FREQ:STOP', float, None],