From: Dan White Date: Tue, 12 Aug 2014 02:04:51 +0000 (-0500) Subject: save changes X-Git-Tag: cheetah~10^2 X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=3a490ba65c2424d3222b72c01d1ef8317928fe9c;p=430.git save changes --- diff --git a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-05.pdf b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-05.pdf index 7577de5..89d4c0b 100644 Binary files a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-05.pdf and b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-05.pdf differ diff --git a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-15.pdf b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-15.pdf index 6165966..d706e7a 100644 Binary files a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-15.pdf and b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-15.pdf differ diff --git a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-20.pdf b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-20.pdf index 9ddb04d..7724524 100644 Binary files a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-20.pdf and b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-05-20.pdf differ diff --git a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-10-10.pdf b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-10-10.pdf index 21a4a8e..fe4cb13 100644 Binary files a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-10-10.pdf and b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-10-10.pdf differ diff --git a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-10-30.pdf b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-10-30.pdf index e728af6..e1bebce 100644 Binary files a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-10-30.pdf and b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-10-30.pdf differ diff --git a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase-10.pdf b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase-10.pdf index e9699df..669a78e 100644 Binary files a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase-10.pdf and b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase-10.pdf differ diff --git a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase-5.pdf b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase-5.pdf index 29db6bb..489449a 100644 Binary files a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase-5.pdf and b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase-5.pdf differ diff --git a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase.pdf b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase.pdf index f33b130..2e0cd47 100644 Binary files a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase.pdf and b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase.pdf differ diff --git a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase.py b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase.py index b31fe60..6309d70 100644 --- a/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase.py +++ b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/harmonic-phase.py @@ -100,15 +100,15 @@ text(0.55, 0.01, horizontalalignment='center', rotation='horizontal') -#savefig('harmonic-phase.pdf') +savefig('harmonic-phase.pdf') # # 5 Hz basis row only # -fig = figure(figsize=(6.0, 2.0)) -subplots_adjust(top=0.97, bottom=0.25, left=0.10, right=0.98) +fig = figure(figsize=(6.0, 1.5)) +subplots_adjust(top=0.95, bottom=0.28, left=0.10, right=0.98) for name in glob('arb0-*5.0-005-*.npz'): # ['f0', 'fs', 'vout', 'phase', 'Nperiods', 'fh', 'fsin', 'duration'] @@ -186,7 +186,7 @@ for name in glob('arb0-*5.0-005-*.npz'): # verticalalignment='center', # rotation='vertical') -text(0.55, 0.02, +text(0.55, 0.03, 'Input frequency', size='large', transform=fig.transFigure, @@ -199,8 +199,8 @@ savefig('harmonic-phase-5.pdf') # # 10 Hz basis row only # -fig = figure(figsize=(6.0, 2.0)) -subplots_adjust(top=0.97, bottom=0.25, left=0.10, right=0.98) +fig = figure(figsize=(6.0, 1.5)) +subplots_adjust(top=0.95, bottom=0.28, left=0.10, right=0.98) for name in glob('arb0-*5.0-010-*.npz'): # ['f0', 'fs', 'vout', 'phase', 'Nperiods', 'fh', 'fsin', 'duration'] @@ -278,7 +278,7 @@ for name in glob('arb0-*5.0-010-*.npz'): # verticalalignment='center', # rotation='vertical') -text(0.55, 0.02, +text(0.55, 0.03, 'Input frequency', size='large', transform=fig.transFigure, @@ -293,20 +293,20 @@ savefig('harmonic-phase-10.pdf') -x = 5.0 * arange(1, 8) +#x = 5.0 * arange(1, 8) -figure() -subplot(211) -plot(x, zphase_outs[0,:], 'o') -plot([0, 70], [0, 0], '-k') -ylim((-0.1, 0.8)) -xlim((4, 31)) +#figure() +#subplot(211) +#plot(x, zphase_outs[0,:], 'o') +#plot([0, 70], [0, 0], '-k') +#ylim((-0.1, 0.8)) +#xlim((4, 31)) -subplot(212) -plot(x, zphase_outs[1,:], 'o') -plot([0, 70], [0, 0], '-k') -ylim((-0.1, 0.8)) -xlim((4, 31)) +#subplot(212) +#plot(x, zphase_outs[1,:], 'o') +#plot([0, 70], [0, 0], '-k') +#ylim((-0.1, 0.8)) +#xlim((4, 31)) #savefig('tmp.pdf') @@ -321,7 +321,6 @@ for fh, fsin in ((5, 5), (5, 20), (10, 10), (10, 30)): - break fig = figure(figsize=(5.0, 3.0)) subplots_adjust(top=0.92, bottom=0.14, left=0.12, right=0.96) @@ -353,7 +352,7 @@ for fh, fsin in ((5, 5), xlabel(r'$\Delta \phi$, deg') ylim((-0.8, 0.8)) - ylabel('$y_{I,%i}$ (V)' % (fsin/fh)) + ylabel('$y_{Q,%i}$ (V)' % (fsin/fh)) if fsin/fh in (1, 3, 5): legend(loc='lower right')