From: Dan White Date: Mon, 4 Aug 2014 22:16:03 +0000 (-0500) Subject: update X-Git-Tag: cheetah~14 X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=ad43a3ea9b3447c7cc98eac693b86ca3f2adac63;p=430.git update --- 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 33f3e34..dfa5692 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 50b13c8..51f2ff4 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 new file mode 100644 index 0000000..f4798a0 Binary files /dev/null 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 4450838..436f2da 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 b2c26fa..93fbfca 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/aht-unity.pdf b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-unity.pdf new file mode 100644 index 0000000..928f870 Binary files /dev/null and b/python-lib/test-data/chip14/arb0/harmonic-sin-phase/aht-unity.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 912fc8b..5d7f783 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 228f08e..b7cde0d 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 @@ -48,12 +48,19 @@ for name in glob('arb0-*5.0-*.npz'): 'n=%i'%(fsin/fh), horizontalalignment='center') else: - style = '+g' + style = 'xg' zphase_outs[col, row] = vout[0] - vout.mean() + a = zeros((16,)) + vo = zeros((16,)) + for i, ang in enumerate(arange(0, 360, 360/16.)): + a[i] = ang + vo[i] = mean(vout[range(i, len(wphase), 16)]) + #plot(wphase, vout, style) - plot(wphase, vout-vout.mean(), style) + #plot(wphase, vout-vout.mean(), style) + plot(a, vo-vo.mean(), style) ylim([-0.8, 0.8]) xlim([0, 360]) @@ -112,7 +119,7 @@ plot([0, 70], [0, 0], '-k') ylim((-0.1, 0.8)) xlim((4, 31)) -savefig('tmp.pdf') +#savefig('tmp.pdf') @@ -122,6 +129,7 @@ savefig('tmp.pdf') # for fh, fsin in ((5, 5), (5, 15), + (5, 20), (10, 10), (10, 30)): fig = figure(figsize=(5.0, 3.0)) @@ -142,21 +150,23 @@ for fh, fsin in ((5, 5), plot(a, vo, 'o', label='data') hlines(0, 0, 360, linewidth=0.5, color='0.40') - x = linspace(0, 360) - plot(x, vo[0]*cos(pi*x/180), '-g', label='$\cos()$') + if fsin/fh in (1, 3, 5): + x = linspace(0, 360) + plot(x, vo[0]*cos(pi*x/180), '-g', label='$\cos()$') #scale = vouts[fh, fh][0] - vouts[fh, fh].mean() - #plot(x, 1.0*fh/fsin*scale*cos(pi*x/180), '-r', label='$\cos()$') + #plot(x, 1.0*fh/fsin*vouts[fh, fh][0]*cos(pi*x/180), '-r', label='$\cos()$') ax = fig.gca() xlim((0, 360)) ax.set_xticks(range(0, 360+1, 45)) - xlabel('Relative phase, deg') + xlabel(r'$\Delta \phi$, deg') ylim((-0.8, 0.8)) ylabel('$y_{I,%i}$ (V)' % (fsin/fh)) - legend(loc='lower right') + if fsin/fh in (1, 3, 5): + legend(loc='lower right') title(r'FF = $%i\,\mathrm{Hz}$, Input = $%i\,\mathrm{Hz}$' % (fh, fsin)) @@ -167,14 +177,16 @@ for fh, fsin in ((5, 5), # # 1-1 correlation # -for i, fh in enumerate((5, 10)): - break - print i, fh - fig = figure(figsize=(6.0, 4.0)) - subplots_adjust(top=0.92, bottom=0.14, left=0.12, right=0.96) +fig = figure(figsize=(6.0, 4.0)) +subplots_adjust(top=0.92, bottom=0.14, left=0.12, right=0.96) + +for n, fh in enumerate((5, 10)): + print n, fh + si = 0 + style = ['.', 'x'] for fsin in (fh, 3*fh): - subplot(2, 1, i+1) + subplot(2, 1, n+1) angle = angles[fh, fsin] vout = vouts[fh, fsin] @@ -187,24 +199,32 @@ for i, fh in enumerate((5, 10)): idx = find(angle == ang) vo = vo - vo.mean() - plot(a, vo, 'o', label='data') + plot(a, vo, style[si], label='data') hlines(0, 0, 360, linewidth=0.5, color='0.40') x = linspace(0, 360) - plot(x, vo[0]*cos(pi*x/180), '-g', label='$\cos()$') + plot(x, vo[0]*cos(pi*x/180), '-k', linewidth=0.5) ax = fig.gca() xlim((0, 360)) ax.set_xticks(range(0, 360+1, 45)) - xlabel('Relative phase, deg') ylim((-0.8, 0.8)) ylabel('$V_{out} = y_{I,%i}$ (V)' % (fsin/fh)) + si += 1 - legend(loc='lower right') + text(0.50, 0.70, + '$\mathrm{FF}=%i\,\mathrm{Hz}$' % fh, + size='large', + transform=ax.transAxes, + horizontalalignment='center') - title(r'Input = $%i\,\mathrm{Hz}$, Harmonic = $%i\,\mathrm{Hz}$' - % (fh, fsin)) +xlabel('$\Delta \phi$, deg') - savefig('aht-%02i-%02i.pdf' % (fh, fsin)) + #legend(loc='lower right') + +#title(r'Input = $%i\,\mathrm{Hz}$, Harmonic = $%i\,\mathrm{Hz}$' +# % (fh, fsin)) + +savefig('aht-unity.pdf')