From c8f73ea1e5a4f3471c80f844aea6c694087872c7 Mon Sep 17 00:00:00 2001 From: Dan White Date: Fri, 20 Jun 2014 01:08:23 -0500 Subject: [PATCH] fixup TCAS cal figures --- python-lib/test-data/cal-histograms.pdf | Bin 188071 -> 188071 bytes python-lib/test-data/cal-trajectories.pdf | Bin 140057 -> 139447 bytes python-lib/test-data/cal-trajectories.py | 9 +++++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-lib/test-data/cal-histograms.pdf b/python-lib/test-data/cal-histograms.pdf index 28299589e281bbc1a1e61ed13e0d51e4844388dd..77f5e28012b8fdbaef5c175104c500f6306ffb63 100644 GIT binary patch delta 78 zcmZ3!mwWkM?uHh|Elg3j3``XajTHAz_p-f{1Lvtw8M8U`s$~00iGMwIZ Si|H7Psj;E?_K@35!OQ?r=@icZ delta 78 zcmZ3!mwWkM?uHh|Elg3j3``V^EENnCf)w=Kj1-Ivp-f{1Lvtw8P{GI)$~09lG@jmd Si|H7Pv4x4j_K@35!OQ?sK@`pa diff --git a/python-lib/test-data/cal-trajectories.pdf b/python-lib/test-data/cal-trajectories.pdf index 593a463705d8b64caf6c0bee5f60eec6b9809333..8f55778c239cc5179a13ee3da98ab0117aa5af36 100644 GIT binary patch delta 4795 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 sE?+^rlEx=>eoe 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 diff --git a/python-lib/test-data/cal-trajectories.py b/python-lib/test-data/cal-trajectories.py index 748e37e..9afce60 100644 --- a/python-lib/test-data/cal-trajectories.py +++ b/python-lib/test-data/cal-trajectories.py @@ -166,7 +166,9 @@ if 1: ax = subplot(N_PLOTS, N_COLS, i+1) plot(g[:sample_nevals[i]+1], '.-') - ylim((0, 127)) + yticks(range(0, 128, 25)) + ylim((0, 120)) + xlim((0, 14)) ax.set_xticks(range(0, 15, 4)) ax.set_xticklabels([''] * len(ax.get_xticks())) @@ -187,8 +189,11 @@ if 1: plot(1e-3*r[:sample_nevals[i]+1], '.-') hlines(0, -1, 15, linewidth=0.5, color='0.40') - xlim((0, 14)) ax.set_xticks(range(0, 15, 4)) + xlim((0, 14)) + + yticks(arange(-0.3, 1.3, 0.3)) + ylim((-0.3, 1.2)) #xlabel('Step') if i == 0: -- 2.25.1