From 97798da4e00179671db1a09d11dafba33659084d Mon Sep 17 00:00:00 2001
From: Anton Akhmerov <anton.akhmerov@gmail.com>
Date: Tue, 4 Jun 2013 15:14:43 +0800
Subject: [PATCH] minor cleanup of doc scripts
---
doc/source/images/ab_ring.py.diff | 20 +++++++------
doc/source/images/band_structure.py.diff | 4 +--
doc/source/images/closed_system.py.diff | 17 ++++++-----
doc/source/images/graphene.py.diff | 28 +++++++++----------
doc/source/images/quantum_well.py.diff | 4 +--
doc/source/images/quantum_wire.py.diff | 13 +++++----
doc/source/images/spin_orbit.py.diff | 4 +--
.../superconductor_band_structure.py.diff | 7 +++--
.../images/superconductor_transport.py.diff | 7 +++--
9 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/doc/source/images/ab_ring.py.diff b/doc/source/images/ab_ring.py.diff
index bce43b4f..d4f2c825 100644
--- a/doc/source/images/ab_ring.py.diff
+++ b/doc/source/images/ab_ring.py.diff
@@ -79,7 +79,7 @@
def plot_conductance(sys, energy, fluxes):
# compute conductance
-@@ -87,18 +133,29 @@
+@@ -87,18 +133,31 @@
smatrix = kwant.solve(sys, energy, args=[flux])
data.append(smatrix.transmission(1, 0))
@@ -109,22 +109,26 @@
# Check that the system looks as intended.
- kwant.plot(sys)
+ size = (_defs.figwidth_in, _defs.figwidth_in)
-+ kwant.plot(sys, file="ab_ring_sys.pdf", fig_size=size, dpi=_defs.dpi)
-+ kwant.plot(sys, file="ab_ring_sys.png", fig_size=size, dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ kwant.plot(sys, file="ab_ring_sys." + extension,
++ fig_size=size, dpi=_defs.dpi)
++
# Finalize the system.
sys = sys.finalized()
-@@ -108,6 +165,15 @@
+@@ -108,6 +167,17 @@
for i in xrange(100)])
+ # Finally, some plots needed for the notes
+ sys = make_system_note1()
-+ kwant.plot(sys, file="ab_ring_note1.pdf", fig_size=size, dpi=_defs.dpi)
-+ kwant.plot(sys, file="ab_ring_note1.png", fig_size=size, dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ kwant.plot(sys, file="ab_ring_note1." + extension,
++ fig_size=size, dpi=_defs.dpi)
+ sys = make_system_note2()
-+ kwant.plot(sys, file="ab_ring_note2.pdf", fig_size=size, dpi=_defs.dpi)
-+ kwant.plot(sys, file="ab_ring_note2.png", fig_size=size, dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ kwant.plot(sys, file="ab_ring_note2." + extension,
++ fig_size=size, dpi=_defs.dpi)
+
+
# Call the main function if the script gets executed (as opposed to imported).
diff --git a/doc/source/images/band_structure.py.diff b/doc/source/images/band_structure.py.diff
index a5e51aaa..2fceecb0 100644
--- a/doc/source/images/band_structure.py.diff
+++ b/doc/source/images/band_structure.py.diff
@@ -26,8 +26,8 @@
+ fontsize=_defs.mpl_tick_size)
+ fig.set_size_inches(_defs.mpl_width_in, _defs.mpl_width_in * 3. / 4.)
+ fig.subplots_adjust(left=0.15, right=0.95, top=0.95, bottom=0.15)
-+ fig.savefig("band_structure_result.pdf")
-+ fig.savefig("band_structure_result.png", dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ fig.savefig("band_structure_result." + extension, dpi=_defs.dpi)
+
diff --git a/doc/source/images/closed_system.py.diff b/doc/source/images/closed_system.py.diff
index fb27cedf..693d44a5 100644
--- a/doc/source/images/closed_system.py.diff
+++ b/doc/source/images/closed_system.py.diff
@@ -8,7 +8,7 @@
def make_system(a=1, t=1.0, r=10):
-@@ -65,29 +66,40 @@
+@@ -65,29 +66,39 @@
energies.append(ev)
@@ -27,8 +27,8 @@
+ fontsize=_defs.mpl_tick_size)
+ fig.set_size_inches(_defs.mpl_width_in, _defs.mpl_width_in * 3. / 4.)
+ fig.subplots_adjust(left=0.15, right=0.95, top=0.95, bottom=0.15)
-+ fig.savefig("closed_system_result.pdf")
-+ fig.savefig("closed_system_result.png", dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ fig.savefig("closed_system_result." + extension, dpi=_defs.dpi)
def plot_wave_function(sys):
@@ -41,12 +41,11 @@
# Plot the probability density of the 10th eigenmode.
- kwant.plotter.map(sys, np.abs(evecs[:, 9])**2,
- colorbar=False, oversampling=1)
-+ kwant.plotter.map(
-+ sys, np.abs(evecs[:, 9])**2, colorbar=False, oversampling=1,
-+ file="closed_system_eigenvector.pdf", fig_size=size, dpi=_defs.dpi)
-+ kwant.plotter.map(
-+ sys, np.abs(evecs[:, 9])**2, colorbar=False, oversampling=1,
-+ file="closed_system_eigenvector.png", fig_size=size, dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ kwant.plotter.map(
++ sys, np.abs(evecs[:, 9])**2, colorbar=False, oversampling=1,
++ file="closed_system_eigenvector." + extension,
++ fig_size=size, dpi=_defs.dpi)
def main():
diff --git a/doc/source/images/graphene.py.diff b/doc/source/images/graphene.py.diff
index 3e41785c..9c158dfc 100644
--- a/doc/source/images/graphene.py.diff
+++ b/doc/source/images/graphene.py.diff
@@ -28,8 +28,8 @@
+ fontsize=_defs.mpl_tick_size)
+ fig.set_size_inches(_defs.mpl_width_in, _defs.mpl_width_in * 3. / 4.)
+ fig.subplots_adjust(left=0.15, right=0.95, top=0.95, bottom=0.15)
-+ fig.savefig("graphene_result.pdf")
-+ fig.savefig("graphene_result.png", dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ fig.savefig("graphene_result." + extension, dpi=_defs.dpi)
def plot_bandstructure(flead, momenta):
@@ -52,8 +52,8 @@
+ fontsize=_defs.mpl_tick_size)
+ fig.set_size_inches(_defs.mpl_width_in, _defs.mpl_width_in * 3. / 4.)
+ fig.subplots_adjust(left=0.15, right=0.95, top=0.95, bottom=0.15)
-+ fig.savefig("graphene_bs.pdf")
-+ fig.savefig("graphene_bs.png", dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ fig.savefig("graphene_bs." + extension, dpi=_defs.dpi)
def main():
@@ -64,14 +64,14 @@
- # Plot the closed system without leads.
- kwant.plot(sys, site_color=family_colors, site_lw=0.12, colorbar=False)
+ size = (_defs.figwidth_in, _defs.figwidth_in)
-+ kwant.plot(sys, site_color=family_colors, site_lw=0.12, colorbar=False,
-+ file="graphene_sys1.pdf", fig_size=size, dpi=_defs.dpi)
-+ kwant.plot(sys, site_color=family_colors, site_lw=0.12, colorbar=False,
-+ file="graphene_sys1.png", fig_size=size, dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ kwant.plot(sys, site_color=family_colors, site_lw=0.12, colorbar=False,
++ file="graphene_sys1." + extension,
++ fig_size=size, dpi=_defs.dpi)
# Compute some eigenvalues.
compute_evs(sys.finalized())
-@@ -137,9 +159,13 @@
+@@ -137,9 +159,11 @@
for lead in leads:
sys.attach_lead(lead)
@@ -79,12 +79,10 @@
- kwant.plot(sys, site_color=family_colors, site_lw=0.12,
- lead_site_lw=0, colorbar=False)
+ size = (_defs.figwidth_in, 0.9 * _defs.figwidth_in)
-+ kwant.plot(sys, site_color=family_colors, colorbar=False, site_lw=0.12,
-+ file="graphene_sys2.pdf", fig_size=size, dpi=_defs.dpi,
-+ lead_site_lw=0)
-+ kwant.plot(sys, site_color=family_colors, colorbar=False, site_lw=0.12,
-+ file="graphene_sys2.png", fig_size=size, dpi=_defs.dpi,
-+ lead_site_lw=0)
++ for extension in ('pdf', 'png'):
++ kwant.plot(sys, site_color=family_colors, colorbar=False, site_lw=0.12,
++ file="graphene_sys2." + extension,
++ fig_size=size, dpi=_defs.dpi, lead_site_lw=0)
# Finalize the system.
sys = sys.finalized()
diff --git a/doc/source/images/quantum_well.py.diff b/doc/source/images/quantum_well.py.diff
index 7d64ca0a..9262fd01 100644
--- a/doc/source/images/quantum_well.py.diff
+++ b/doc/source/images/quantum_well.py.diff
@@ -28,8 +28,8 @@
+ fontsize=_defs.mpl_tick_size)
+ fig.set_size_inches(_defs.mpl_width_in, _defs.mpl_width_in * 3. / 4.)
+ fig.subplots_adjust(left=0.15, right=0.95, top=0.95, bottom=0.15)
-+ fig.savefig("quantum_well_result.pdf")
-+ fig.savefig("quantum_well_result.png", dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ fig.savefig("quantum_well_result." + extension, dpi=_defs.dpi)
def main():
diff --git a/doc/source/images/quantum_wire.py.diff b/doc/source/images/quantum_wire.py.diff
index 5ce212e2..21dce730 100644
--- a/doc/source/images/quantum_wire.py.diff
+++ b/doc/source/images/quantum_wire.py.diff
@@ -8,18 +8,19 @@
# First, define the tight-binding system
-@@ -65,7 +66,9 @@
+@@ -65,7 +66,10 @@
sys.attach_lead(right_lead)
# Plot it, to make sure it's OK
-kwant.plot(sys)
+size = (_defs.figwidth_in, 0.3 * _defs.figwidth_in)
-+kwant.plot(sys, file="quantum_wire_sys.pdf", fig_size=size, dpi=_defs.dpi)
-+kwant.plot(sys, file="quantum_wire_sys.png", fig_size=size, dpi=_defs.dpi)
++for extension in ('pdf', 'png'):
++ kwant.plot(sys, file="quantum_wire_sys." + extension,
++ fig_size=size, dpi=_defs.dpi)
# Finalize the system
sys = sys.finalized()
-@@ -86,8 +89,13 @@
+@@ -86,8 +90,13 @@
# Use matplotlib to write output
# We should see conductance steps
@@ -35,5 +36,5 @@
+pyplot.setp(fig.get_axes()[0].get_yticklabels(), fontsize=_defs.mpl_tick_size)
+fig.set_size_inches(_defs.mpl_width_in, _defs.mpl_width_in * 3. / 4.)
+fig.subplots_adjust(left=0.15, right=0.95, top=0.95, bottom=0.15)
-+fig.savefig("quantum_wire_result.pdf")
-+fig.savefig("quantum_wire_result.png", dpi=_defs.dpi)
++for extension in ('pdf', 'png'):
++ fig.savefig("quantum_wire_result." + extension, dpi=_defs.dpi)
diff --git a/doc/source/images/spin_orbit.py.diff b/doc/source/images/spin_orbit.py.diff
index 7e269d51..d16e4a85 100644
--- a/doc/source/images/spin_orbit.py.diff
+++ b/doc/source/images/spin_orbit.py.diff
@@ -27,8 +27,8 @@
+ fontsize=_defs.mpl_tick_size)
+ fig.set_size_inches(_defs.mpl_width_in, _defs.mpl_width_in * 3. / 4.)
+ fig.subplots_adjust(left=0.15, right=0.95, top=0.95, bottom=0.15)
-+ fig.savefig("spin_orbit_result.pdf")
-+ fig.savefig("spin_orbit_result.png", dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ fig.savefig("spin_orbit_result." + extension, dpi=_defs.dpi)
def main():
diff --git a/doc/source/images/superconductor_band_structure.py.diff b/doc/source/images/superconductor_band_structure.py.diff
index f0ce1ea6..5271aa49 100644
--- a/doc/source/images/superconductor_band_structure.py.diff
+++ b/doc/source/images/superconductor_band_structure.py.diff
@@ -8,7 +8,7 @@
tau_x = tinyarray.array([[0, 1], [1, 0]])
tau_z = tinyarray.array([[1, 0], [0, -1]])
-@@ -46,11 +47,19 @@
+@@ -46,11 +47,20 @@
# Make system and finalize it right away.
lead = make_lead().finalized()
@@ -25,8 +25,9 @@
+ fontsize=_defs.mpl_tick_size)
+ fig.set_size_inches(_defs.mpl_width_in, _defs.mpl_width_in * 3. / 4.)
+ fig.subplots_adjust(left=0.15, right=0.95, top=0.95, bottom=0.15)
-+ fig.savefig("superconductor_band_structure_result.pdf")
-+ fig.savefig("superconductor_band_structure_result.png", dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ fig.savefig("superconductor_band_structure_result." + extension,
++ dpi=_defs.dpi)
# Call the main function if the script gets executed (as opposed to imported).
diff --git a/doc/source/images/superconductor_transport.py.diff b/doc/source/images/superconductor_transport.py.diff
index 477a2534..947651df 100644
--- a/doc/source/images/superconductor_transport.py.diff
+++ b/doc/source/images/superconductor_transport.py.diff
@@ -8,7 +8,7 @@
def make_system(a=1, W=10, L=10, barrier=1.5, barrierpos=(3, 4),
-@@ -82,19 +83,23 @@
+@@ -82,19 +83,24 @@
smatrix.transmission(0, 0) +
smatrix.transmission(1, 0))
@@ -24,8 +24,9 @@
+ fontsize=_defs.mpl_tick_size)
+ fig.set_size_inches(_defs.mpl_width_in, _defs.mpl_width_in * 3. / 4.)
+ fig.subplots_adjust(left=0.15, right=0.95, top=0.95, bottom=0.15)
-+ fig.savefig("superconductor_transport_result.pdf")
-+ fig.savefig("superconductor_transport_result.png", dpi=_defs.dpi)
++ for extension in ('pdf', 'png'):
++ fig.savefig("superconductor_transport_result." + extension,
++ dpi=_defs.dpi)
def main():
--
GitLab