Update plot cache and fix import order mistakes

stonerlab · Dec 21, 2020 · 5907a4f · 5907a4f
1 parent b4f5be8
commit 5907a4f
Show file tree

Hide file tree

Showing 227 changed files with 71 additions and 44 deletions.
diff --git a/Stoner/folders/mixins.py b/Stoner/folders/mixins.py
@@ -15,8 +15,8 @@
 from numpy.ma import masked_invalid
 from matplotlib.pyplot import figure, Figure, subplot, tight_layout
 
-from ..compat import string_types, get_filedialog, _pattern_type, makedirs, path_types
 from Stoner.tools import isIterable, make_Data
+from ..compat import string_types, get_filedialog, _pattern_type, makedirs, path_types
 from ..core.base import metadataObject, string_to_type
 from ..core.exceptions import StonerUnrecognisedFormat
 from .core import baseFolder, __add_core__ as _base__add_core__, __sub_core__ as _base__sub_core__

diff --git a/Stoner/folders/utils.py b/Stoner/folders/utils.py
@@ -14,9 +14,9 @@
 import string
 import fnmatch
 import pathlib
+from multiprocessing.pool import ThreadPool
 
 from numpy import array
-from multiprocessing.pool import ThreadPool
 import multiprocess as multiprocessing
 
 from Stoner.compat import string_types, _pattern_type

diff --git a/Stoner/formats/rigs.py b/Stoner/formats/rigs.py
@@ -9,10 +9,10 @@
 
 import numpy as np
 
-import Stoner.Core as Core
-from .generic import CSVFile
 from Stoner.compat import bytes2str
 from Stoner.core.base import string_to_type
+import Stoner.Core as Core
+from .generic import CSVFile
 
 
 class BigBlueFile(CSVFile):

diff --git a/doc/plot_cache/3D.hires.png b/doc/plot_cache/3D.hires.png
diff --git a/doc/plot_cache/3D.pdf b/doc/plot_cache/3D.pdf
diff --git a/doc/plot_cache/3D.png b/doc/plot_cache/3D.png
diff --git a/doc/plot_cache/arrhenius-class.hires.png b/doc/plot_cache/arrhenius-class.hires.png
diff --git a/doc/plot_cache/arrhenius-class.pdf b/doc/plot_cache/arrhenius-class.pdf
diff --git a/doc/plot_cache/arrhenius-class.png b/doc/plot_cache/arrhenius-class.png
diff --git a/doc/plot_cache/bdr-class.hires.png b/doc/plot_cache/bdr-class.hires.png
diff --git a/doc/plot_cache/bdr-class.pdf b/doc/plot_cache/bdr-class.pdf
diff --git a/doc/plot_cache/bdr-class.png b/doc/plot_cache/bdr-class.png
diff --git a/doc/plot_cache/bins.hires.png b/doc/plot_cache/bins.hires.png
diff --git a/doc/plot_cache/bins.pdf b/doc/plot_cache/bins.pdf
diff --git a/doc/plot_cache/bins.png b/doc/plot_cache/bins.png
diff --git a/doc/plot_cache/blochgruneisen-class.hires.png b/doc/plot_cache/blochgruneisen-class.hires.png
diff --git a/doc/plot_cache/blochgruneisen-class.pdf b/doc/plot_cache/blochgruneisen-class.pdf
diff --git a/doc/plot_cache/blochgruneisen-class.png b/doc/plot_cache/blochgruneisen-class.png
diff --git a/doc/plot_cache/channel_math.hires.png b/doc/plot_cache/channel_math.hires.png
diff --git a/doc/plot_cache/channel_math.pdf b/doc/plot_cache/channel_math.pdf
diff --git a/doc/plot_cache/channel_math.png b/doc/plot_cache/channel_math.png
diff --git a/doc/plot_cache/colormap.hires.png b/doc/plot_cache/colormap.hires.png
diff --git a/doc/plot_cache/colormap.pdf b/doc/plot_cache/colormap.pdf
diff --git a/doc/plot_cache/colormap.png b/doc/plot_cache/colormap.png
diff --git a/doc/plot_cache/common_y.hires.png b/doc/plot_cache/common_y.hires.png
diff --git a/doc/plot_cache/common_y.pdf b/doc/plot_cache/common_y.pdf
diff --git a/doc/plot_cache/common_y.png b/doc/plot_cache/common_y.png
diff --git a/doc/plot_cache/contour.hires.png b/doc/plot_cache/contour.hires.png
diff --git a/doc/plot_cache/contour.pdf b/doc/plot_cache/contour.pdf
diff --git a/doc/plot_cache/contour.png b/doc/plot_cache/contour.png
diff --git a/doc/plot_cache/curve_fit_line.hires.png b/doc/plot_cache/curve_fit_line.hires.png
diff --git a/doc/plot_cache/curve_fit_line.pdf b/doc/plot_cache/curve_fit_line.pdf
diff --git a/doc/plot_cache/curve_fit_line.png b/doc/plot_cache/curve_fit_line.png
diff --git a/doc/plot_cache/curvefit_plane.hires.png b/doc/plot_cache/curvefit_plane.hires.png
diff --git a/doc/plot_cache/curvefit_plane.pdf b/doc/plot_cache/curvefit_plane.pdf
diff --git a/doc/plot_cache/curvefit_plane.png b/doc/plot_cache/curvefit_plane.png
diff --git a/doc/plot_cache/curvefit_plane2.hires.png b/doc/plot_cache/curvefit_plane2.hires.png
diff --git a/doc/plot_cache/curvefit_plane2.pdf b/doc/plot_cache/curvefit_plane2.pdf
diff --git a/doc/plot_cache/curvefit_plane2.png b/doc/plot_cache/curvefit_plane2.png
diff --git a/doc/plot_cache/curvefit_sphere.hires.png b/doc/plot_cache/curvefit_sphere.hires.png
diff --git a/doc/plot_cache/curvefit_sphere.pdf b/doc/plot_cache/curvefit_sphere.pdf
diff --git a/doc/plot_cache/curvefit_sphere.png b/doc/plot_cache/curvefit_sphere.png
diff --git a/doc/plot_cache/curvefit_sphere_2.hires.png b/doc/plot_cache/curvefit_sphere_2.hires.png
diff --git a/doc/plot_cache/curvefit_sphere_2.pdf b/doc/plot_cache/curvefit_sphere_2.pdf
diff --git a/doc/plot_cache/curvefit_sphere_2.png b/doc/plot_cache/curvefit_sphere_2.png
diff --git a/doc/plot_cache/customising.hires.png b/doc/plot_cache/customising.hires.png
diff --git a/doc/plot_cache/customising.pdf b/doc/plot_cache/customising.pdf
diff --git a/doc/plot_cache/customising.png b/doc/plot_cache/customising.png
diff --git a/doc/plot_cache/decompose.hires.png b/doc/plot_cache/decompose.hires.png
diff --git a/doc/plot_cache/decompose.pdf b/doc/plot_cache/decompose.pdf
diff --git a/doc/plot_cache/decompose.png b/doc/plot_cache/decompose.png
diff --git a/doc/plot_cache/defaultstyle.hires.png b/doc/plot_cache/defaultstyle.hires.png
diff --git a/doc/plot_cache/defaultstyle.pdf b/doc/plot_cache/defaultstyle.pdf
diff --git a/doc/plot_cache/defaultstyle.png b/doc/plot_cache/defaultstyle.png
diff --git a/doc/plot_cache/diffev1.hires.png b/doc/plot_cache/diffev1.hires.png
diff --git a/doc/plot_cache/diffev1.pdf b/doc/plot_cache/diffev1.pdf
diff --git a/doc/plot_cache/diffev1.png b/doc/plot_cache/diffev1.png
diff --git a/doc/plot_cache/diffev2.hires.png b/doc/plot_cache/diffev2.hires.png
diff --git a/doc/plot_cache/diffev2.pdf b/doc/plot_cache/diffev2.pdf
diff --git a/doc/plot_cache/diffev2.png b/doc/plot_cache/diffev2.png
diff --git a/doc/plot_cache/double_y.hires.png b/doc/plot_cache/double_y.hires.png
diff --git a/doc/plot_cache/double_y.pdf b/doc/plot_cache/double_y.pdf
diff --git a/doc/plot_cache/double_y.png b/doc/plot_cache/double_y.png
diff --git a/doc/plot_cache/extrapolate-demo.hires.png b/doc/plot_cache/extrapolate-demo.hires.png
diff --git a/doc/plot_cache/extrapolate-demo.pdf b/doc/plot_cache/extrapolate-demo.pdf
diff --git a/doc/plot_cache/extrapolate-demo.png b/doc/plot_cache/extrapolate-demo.png
diff --git a/doc/plot_cache/fluchsdondheimer-class.hires.png b/doc/plot_cache/fluchsdondheimer-class.hires.png
diff --git a/doc/plot_cache/fluchsdondheimer-class.pdf b/doc/plot_cache/fluchsdondheimer-class.pdf
diff --git a/doc/plot_cache/fluchsdondheimer-class.png b/doc/plot_cache/fluchsdondheimer-class.png
diff --git a/doc/plot_cache/fowlernordheim-class.hires.png b/doc/plot_cache/fowlernordheim-class.hires.png
diff --git a/doc/plot_cache/fowlernordheim-class.pdf b/doc/plot_cache/fowlernordheim-class.pdf
diff --git a/doc/plot_cache/fowlernordheim-class.png b/doc/plot_cache/fowlernordheim-class.png
diff --git a/doc/plot_cache/gbstyle.hires.png b/doc/plot_cache/gbstyle.hires.png
diff --git a/doc/plot_cache/gbstyle.pdf b/doc/plot_cache/gbstyle.pdf
diff --git a/doc/plot_cache/gbstyle.png b/doc/plot_cache/gbstyle.png
diff --git a/doc/plot_cache/ic_b_airy_class.hires.png b/doc/plot_cache/ic_b_airy_class.hires.png
diff --git a/doc/plot_cache/ic_b_airy_class.pdf b/doc/plot_cache/ic_b_airy_class.pdf
diff --git a/doc/plot_cache/ic_b_airy_class.png b/doc/plot_cache/ic_b_airy_class.png
diff --git a/doc/plot_cache/inset.hires.png b/doc/plot_cache/inset.hires.png
diff --git a/doc/plot_cache/inset.pdf b/doc/plot_cache/inset.pdf
diff --git a/doc/plot_cache/inset.png b/doc/plot_cache/inset.png
diff --git a/doc/plot_cache/jtbstyle.hires.png b/doc/plot_cache/jtbstyle.hires.png
diff --git a/doc/plot_cache/jtbstyle.pdf b/doc/plot_cache/jtbstyle.pdf
diff --git a/doc/plot_cache/jtbstyle.png b/doc/plot_cache/jtbstyle.png
diff --git a/doc/plot_cache/kittel-class.hires.png b/doc/plot_cache/kittel-class.hires.png
diff --git a/doc/plot_cache/kittel-class.pdf b/doc/plot_cache/kittel-class.pdf
diff --git a/doc/plot_cache/kittel-class.png b/doc/plot_cache/kittel-class.png
diff --git a/doc/plot_cache/langevin-class.hires.png b/doc/plot_cache/langevin-class.hires.png
diff --git a/doc/plot_cache/langevin-class.pdf b/doc/plot_cache/langevin-class.pdf
diff --git a/doc/plot_cache/langevin-class.png b/doc/plot_cache/langevin-class.png
diff --git a/doc/plot_cache/lmfit2.hires.png b/doc/plot_cache/lmfit2.hires.png
diff --git a/doc/plot_cache/lmfit2.pdf b/doc/plot_cache/lmfit2.pdf
diff --git a/doc/plot_cache/lmfit2.png b/doc/plot_cache/lmfit2.png
diff --git a/doc/plot_cache/lmfit_example.hires.png b/doc/plot_cache/lmfit_example.hires.png
diff --git a/doc/plot_cache/lmfit_example.pdf b/doc/plot_cache/lmfit_example.pdf
diff --git a/doc/plot_cache/lmfit_example.png b/doc/plot_cache/lmfit_example.png
diff --git a/doc/plot_cache/lorentzian_diff_class.hires.png b/doc/plot_cache/lorentzian_diff_class.hires.png
diff --git a/doc/plot_cache/lorentzian_diff_class.pdf b/doc/plot_cache/lorentzian_diff_class.pdf
diff --git a/doc/plot_cache/lorentzian_diff_class.png b/doc/plot_cache/lorentzian_diff_class.png
diff --git a/doc/plot_cache/make_model.hires.png b/doc/plot_cache/make_model.hires.png
diff --git a/doc/plot_cache/make_model.pdf b/doc/plot_cache/make_model.pdf
diff --git a/doc/plot_cache/make_model.png b/doc/plot_cache/make_model.png
diff --git a/doc/plot_cache/matrix.hires.png b/doc/plot_cache/matrix.hires.png
diff --git a/doc/plot_cache/matrix.pdf b/doc/plot_cache/matrix.pdf
diff --git a/doc/plot_cache/matrix.png b/doc/plot_cache/matrix.png
diff --git a/doc/plot_cache/modarrhenius-class.hires.png b/doc/plot_cache/modarrhenius-class.hires.png
diff --git a/doc/plot_cache/modarrhenius-class.pdf b/doc/plot_cache/modarrhenius-class.pdf
diff --git a/doc/plot_cache/modarrhenius-class.png b/doc/plot_cache/modarrhenius-class.png
diff --git a/doc/plot_cache/multiple_y.hires.png b/doc/plot_cache/multiple_y.hires.png
diff --git a/doc/plot_cache/multiple_y.pdf b/doc/plot_cache/multiple_y.pdf
diff --git a/doc/plot_cache/multiple_y.png b/doc/plot_cache/multiple_y.png
diff --git a/doc/plot_cache/nDimarrhenius-class.hires.png b/doc/plot_cache/nDimarrhenius-class.hires.png
diff --git a/doc/plot_cache/nDimarrhenius-class.pdf b/doc/plot_cache/nDimarrhenius-class.pdf
diff --git a/doc/plot_cache/nDimarrhenius-class.png b/doc/plot_cache/nDimarrhenius-class.png
diff --git a/doc/plot_cache/odr_demo.hires.png b/doc/plot_cache/odr_demo.hires.png
diff --git a/doc/plot_cache/odr_demo.pdf b/doc/plot_cache/odr_demo.pdf
diff --git a/doc/plot_cache/odr_demo.png b/doc/plot_cache/odr_demo.png
diff --git a/doc/plot_cache/odrfit1.hires.png b/doc/plot_cache/odrfit1.hires.png
diff --git a/doc/plot_cache/odrfit1.pdf b/doc/plot_cache/odrfit1.pdf
diff --git a/doc/plot_cache/odrfit1.png b/doc/plot_cache/odrfit1.png
diff --git a/doc/plot_cache/odrfit2.hires.png b/doc/plot_cache/odrfit2.hires.png
diff --git a/doc/plot_cache/odrfit2.pdf b/doc/plot_cache/odrfit2.pdf
diff --git a/doc/plot_cache/odrfit2.png b/doc/plot_cache/odrfit2.png
diff --git a/doc/plot_cache/outlier.hires.png b/doc/plot_cache/outlier.hires.png
diff --git a/doc/plot_cache/outlier.pdf b/doc/plot_cache/outlier.pdf
diff --git a/doc/plot_cache/outlier.png b/doc/plot_cache/outlier.png
diff --git a/doc/plot_cache/panels.hires.png b/doc/plot_cache/panels.hires.png
diff --git a/doc/plot_cache/panels.pdf b/doc/plot_cache/panels.pdf
diff --git a/doc/plot_cache/panels.png b/doc/plot_cache/panels.png
diff --git a/doc/plot_cache/peaks.hires.png b/doc/plot_cache/peaks.hires.png
diff --git a/doc/plot_cache/peaks.pdf b/doc/plot_cache/peaks.pdf
diff --git a/doc/plot_cache/peaks.png b/doc/plot_cache/peaks.png
diff --git a/doc/plot_cache/powerlaw-class.hires.png b/doc/plot_cache/powerlaw-class.hires.png
diff --git a/doc/plot_cache/powerlaw-class.pdf b/doc/plot_cache/powerlaw-class.pdf
diff --git a/doc/plot_cache/powerlaw-class.png b/doc/plot_cache/powerlaw-class.png
diff --git a/doc/plot_cache/prbstyle.hires.png b/doc/plot_cache/prbstyle.hires.png
diff --git a/doc/plot_cache/prbstyle.pdf b/doc/plot_cache/prbstyle.pdf
diff --git a/doc/plot_cache/prbstyle.png b/doc/plot_cache/prbstyle.png
diff --git a/doc/plot_cache/quadratic-class.hires.png b/doc/plot_cache/quadratic-class.hires.png
diff --git a/doc/plot_cache/quadratic-class.pdf b/doc/plot_cache/quadratic-class.pdf
diff --git a/doc/plot_cache/quadratic-class.png b/doc/plot_cache/quadratic-class.png
diff --git a/doc/plot_cache/rsj_noiseless_class.hires.png b/doc/plot_cache/rsj_noiseless_class.hires.png
diff --git a/doc/plot_cache/rsj_noiseless_class.pdf b/doc/plot_cache/rsj_noiseless_class.pdf
diff --git a/doc/plot_cache/rsj_noiseless_class.png b/doc/plot_cache/rsj_noiseless_class.png
diff --git a/doc/plot_cache/rsj_simple_class.hires.png b/doc/plot_cache/rsj_simple_class.hires.png
diff --git a/doc/plot_cache/rsj_simple_class.pdf b/doc/plot_cache/rsj_simple_class.pdf
diff --git a/doc/plot_cache/rsj_simple_class.png b/doc/plot_cache/rsj_simple_class.png
diff --git a/doc/plot_cache/scale.hires.png b/doc/plot_cache/scale.hires.png
diff --git a/doc/plot_cache/scale.pdf b/doc/plot_cache/scale.pdf
diff --git a/doc/plot_cache/scale.png b/doc/plot_cache/scale.png
diff --git a/doc/plot_cache/seabornstyle.hires.png b/doc/plot_cache/seabornstyle.hires.png
diff --git a/doc/plot_cache/seabornstyle.pdf b/doc/plot_cache/seabornstyle.pdf
diff --git a/doc/plot_cache/seabornstyle.png b/doc/plot_cache/seabornstyle.png
diff --git a/doc/plot_cache/select.hires.png b/doc/plot_cache/select.hires.png
diff --git a/doc/plot_cache/select.pdf b/doc/plot_cache/select.pdf
diff --git a/doc/plot_cache/select.png b/doc/plot_cache/select.png
diff --git a/doc/plot_cache/simmons-class.hires.png b/doc/plot_cache/simmons-class.hires.png
diff --git a/doc/plot_cache/simmons-class.pdf b/doc/plot_cache/simmons-class.pdf
diff --git a/doc/plot_cache/simmons-class.png b/doc/plot_cache/simmons-class.png
diff --git a/doc/plot_cache/single.hires.png b/doc/plot_cache/single.hires.png
diff --git a/doc/plot_cache/single.pdf b/doc/plot_cache/single.pdf
diff --git a/doc/plot_cache/single.png b/doc/plot_cache/single.png
diff --git a/doc/plot_cache/sketchstyle.hires.png b/doc/plot_cache/sketchstyle.hires.png
diff --git a/doc/plot_cache/sketchstyle.pdf b/doc/plot_cache/sketchstyle.pdf
diff --git a/doc/plot_cache/sketchstyle.png b/doc/plot_cache/sketchstyle.png
diff --git a/doc/plot_cache/smooth.hires.png b/doc/plot_cache/smooth.hires.png
diff --git a/doc/plot_cache/smooth.pdf b/doc/plot_cache/smooth.pdf
diff --git a/doc/plot_cache/smooth.png b/doc/plot_cache/smooth.png
diff --git a/doc/plot_cache/stitch.hires.png b/doc/plot_cache/stitch.hires.png
diff --git a/doc/plot_cache/stitch.pdf b/doc/plot_cache/stitch.pdf
diff --git a/doc/plot_cache/stitch.png b/doc/plot_cache/stitch.png
diff --git a/doc/plot_cache/strijkers_class.hires.png b/doc/plot_cache/strijkers_class.hires.png
diff --git a/doc/plot_cache/strijkers_class.pdf b/doc/plot_cache/strijkers_class.pdf
diff --git a/doc/plot_cache/strijkers_class.png b/doc/plot_cache/strijkers_class.png
diff --git a/doc/plot_cache/subplots.hires.png b/doc/plot_cache/subplots.hires.png
diff --git a/doc/plot_cache/subplots.pdf b/doc/plot_cache/subplots.pdf
diff --git a/doc/plot_cache/subplots.png b/doc/plot_cache/subplots.png
diff --git a/doc/plot_cache/template.hires.png b/doc/plot_cache/template.hires.png
diff --git a/doc/plot_cache/template.pdf b/doc/plot_cache/template.pdf
diff --git a/doc/plot_cache/template.png b/doc/plot_cache/template.png
diff --git a/doc/plot_cache/template2.hires.png b/doc/plot_cache/template2.hires.png
diff --git a/doc/plot_cache/template2.pdf b/doc/plot_cache/template2.pdf
diff --git a/doc/plot_cache/template2.png b/doc/plot_cache/template2.png
diff --git a/doc/plot_cache/vector_field.hires.png b/doc/plot_cache/vector_field.hires.png
diff --git a/doc/plot_cache/vector_field.pdf b/doc/plot_cache/vector_field.pdf
diff --git a/doc/plot_cache/vector_field.png b/doc/plot_cache/vector_field.png
diff --git a/doc/plot_cache/vft-class.hires.png b/doc/plot_cache/vft-class.hires.png
diff --git a/doc/plot_cache/vft-class.pdf b/doc/plot_cache/vft-class.pdf
diff --git a/doc/plot_cache/vft-class.png b/doc/plot_cache/vft-class.png
diff --git a/doc/plot_cache/voxel2.hires.png b/doc/plot_cache/voxel2.hires.png
diff --git a/doc/plot_cache/voxel2.pdf b/doc/plot_cache/voxel2.pdf
diff --git a/doc/plot_cache/voxel2.png b/doc/plot_cache/voxel2.png
diff --git a/doc/plot_cache/voxels.hires.png b/doc/plot_cache/voxels.hires.png
diff --git a/doc/plot_cache/voxels.pdf b/doc/plot_cache/voxels.pdf
diff --git a/doc/plot_cache/voxels.png b/doc/plot_cache/voxels.png
diff --git a/doc/plot_cache/wlfit.hires.png b/doc/plot_cache/wlfit.hires.png
diff --git a/doc/plot_cache/wlfit.pdf b/doc/plot_cache/wlfit.pdf
diff --git a/doc/plot_cache/wlfit.png b/doc/plot_cache/wlfit.png
diff --git a/doc/samples/3D_plot.py b/doc/samples/3D_plot.py
@@ -1,9 +1,10 @@
 """3D surface plot example."""
 # pylint: disable=invalid-name
-from Stoner import Data
 import numpy as np
 import matplotlib.cm
 
+from Stoner import Data
+
 x, y = np.meshgrid(np.linspace(-2, 2, 100), np.linspace(-2, 2, 100))
 x = x.ravel()
 y = y.ravel()

diff --git a/doc/samples/Fitting/Arrhenius.py b/doc/samples/Fitting/Arrhenius.py
@@ -1,10 +1,11 @@
 """Example of Arrhenius Fit."""
 # pylint: disable=invalid-name
-from Stoner import Data
-from Stoner.analysis.fitting.models.thermal import Arrhenius, arrhenius
 from numpy import linspace, ceil, log10, abs as np_abs
 from numpy.random import normal
 
+from Stoner import Data
+from Stoner.analysis.fitting.models.thermal import Arrhenius, arrhenius
+
 # Make some data
 T = linspace(200, 350, 101)
 R = arrhenius(T + normal(size=len(T), scale=3.0, loc=0.0), 1e6, 0.5)

diff --git a/doc/samples/Fitting/BDR.py b/doc/samples/Fitting/BDR.py
@@ -1,10 +1,11 @@
 """Example of nDimArrhenius Fit."""
 # pylint: disable=invalid-name
-from Stoner import Data
-from Stoner.analysis.fitting.models.tunnelling import BDR, bdr
 from numpy import linspace, ones_like
 from numpy.random import normal
 
+from Stoner import Data
+from Stoner.analysis.fitting.models.tunnelling import BDR, bdr
+
 # Make some data
 V = linspace(-10, 10, 1000)
 I = bdr(V, 2.5, 3.2, 0.3, 15.0, 1.0) + normal(size=len(V), scale=1.0e-3)

diff --git a/doc/samples/Fitting/FowlerNordheim.py b/doc/samples/Fitting/FowlerNordheim.py
@@ -1,12 +1,13 @@
 """Example of nDimArrhenius Fit."""
 # pylint: disable=invalid-name
+from numpy import linspace, ones_like
+from numpy.random import normal
+
 from Stoner import Data
 from Stoner.analysis.fitting.models.tunnelling import (
     fowlerNordheim,
     FowlerNordheim,
 )
-from numpy import linspace, ones_like
-from numpy.random import normal
 
 # Make some data
 V = linspace(-4, 4, 1000)

diff --git a/doc/samples/Fitting/Powerlaw.py b/doc/samples/Fitting/Powerlaw.py
@@ -1,10 +1,11 @@
 """Example of PowerLaw Fit."""
 # pylint: disable=invalid-name
-from Stoner import Data
-from Stoner.analysis.fitting.models.generic import PowerLaw, powerLaw
 from numpy import linspace
 from numpy.random import normal
 
+from Stoner import Data
+from Stoner.analysis.fitting.models.generic import PowerLaw, powerLaw
+
 # Make some data
 T = linspace(50, 500, 101)
 R = powerLaw(T, 1e-2, 0.6666666) * normal(size=len(T), scale=0.1, loc=1.0)

diff --git a/doc/samples/Fitting/Quadratic.py b/doc/samples/Fitting/Quadratic.py
@@ -1,11 +1,12 @@
 """Example of Quadratic Fit."""
 # pylint: disable=invalid-name
-from Stoner import Data
-from Stoner.analysis.fitting.models.generic import quadratic, Quadratic
 from numpy import linspace
 from numpy.random import normal
 import matplotlib.pyplot as plt
 
+from Stoner import Data
+from Stoner.analysis.fitting.models.generic import quadratic, Quadratic
+
 # Make some data
 x = linspace(-10, 10, 101)
 y = quadratic(x + normal(size=len(x), scale=0.1), 4, -2, 11) * normal(

diff --git a/doc/samples/Fitting/Simmons.py b/doc/samples/Fitting/Simmons.py
@@ -1,10 +1,11 @@
 """Example of nDimArrhenius Fit."""
 # pylint: disable=invalid-name
-from Stoner import Data
-from Stoner.analysis.fitting.models.tunnelling import simmons, Simmons
 from numpy import linspace, ones_like
 from numpy.random import normal
 
+from Stoner import Data
+from Stoner.analysis.fitting.models.tunnelling import simmons, Simmons
+
 # Make some data
 V = linspace(-4, 4, 101)
 I = simmons(V, 2500, 3.2, 15.0) + normal(size=len(V), scale=5e-7)

diff --git a/doc/samples/Fitting/blochlaw.py b/doc/samples/Fitting/blochlaw.py
@@ -1,10 +1,11 @@
 """Test langevin fitting."""
 # pylint: disable=invalid-name
-from Stoner import Data
-from Stoner.analysis.fitting.models.magnetism import blochLaw, BlochLaw
 from numpy import linspace, ones_like, where, nan, isnan
 from numpy.random import normal
 
+from Stoner import Data
+from Stoner.analysis.fitting.models.magnetism import blochLaw, BlochLaw
+
 T = linspace(10, 1000, 100)
 Ms = 1714
 Tc = 1046

diff --git a/doc/samples/Fitting/f_s.py b/doc/samples/Fitting/f_s.py
@@ -1,12 +1,13 @@
 """Test Weak-localisation fitting."""
 # pylint: disable=invalid-name
+from numpy import logspace, ones_like, log10
+from numpy.random import normal
+
 from Stoner import Data
 from Stoner.analysis.fitting.models.e_transport import (
     fluchsSondheimer,
     FluchsSondheimer,
 )
-from numpy import logspace, ones_like, log10
-from numpy.random import normal
 
 B = logspace(log10(2), 2, 26)
 params = [12.5, 0.75, 1e3]

diff --git a/doc/samples/Fitting/lorentzian.py b/doc/samples/Fitting/lorentzian.py
@@ -1,15 +1,16 @@
 """Test langevin fitting."""
 # pylint: disable=invalid-name
+from copy import copy
+
+from numpy import linspace, ones_like
+from numpy.random import normal
+
 from Stoner import Data
 from Stoner.analysis.fitting.models.generic import (
     Lorentzian_diff,
     lorentzian_diff,
 )
 
-from numpy import linspace, ones_like
-from numpy.random import normal
-from copy import copy
-
 x = linspace(-1.0, 1.0, 101)
 params = [1, 0.1, -0.25]
 y = lorentzian_diff(x, *params) + normal(size=len(x), scale=0.5)

diff --git a/doc/samples/Fitting/modArrhenius.py b/doc/samples/Fitting/modArrhenius.py
@@ -1,10 +1,11 @@
 """Example of nDimArrhenius Fit."""
 # pylint: disable=invalid-name
-from Stoner import Data
-from Stoner.analysis.fitting.models.thermal import modArrhenius, ModArrhenius
 from numpy import linspace
 from numpy.random import normal
 
+from Stoner import Data
+from Stoner.analysis.fitting.models.thermal import modArrhenius, ModArrhenius
+
 # Make some data
 T = linspace(200, 350, 101)
 R = modArrhenius(T, 1e6, 0.5, 1.5) * normal(scale=0.00005, loc=1.0, size=len(T))

diff --git a/doc/samples/Fitting/nDimArrhenius.py b/doc/samples/Fitting/nDimArrhenius.py
@@ -1,10 +1,11 @@
 """Example of nDimArrhenius Fit."""
 # pylint: disable=invalid-name
-from Stoner import Data
-from Stoner.analysis.fitting.models.thermal import nDimArrhenius, NDimArrhenius
 from numpy import linspace
 from numpy.random import normal
 
+from Stoner import Data
+from Stoner.analysis.fitting.models.thermal import nDimArrhenius, NDimArrhenius
+
 # Make some data
 T = linspace(50, 500, 101)
 R = nDimArrhenius(T + normal(size=len(T), scale=5.0, loc=1.0), 1e6, 0.5, 2)

diff --git a/doc/samples/Fitting/vftEquation.py b/doc/samples/Fitting/vftEquation.py
@@ -1,10 +1,11 @@
 """Example of Arrhenius Fit."""
 # pylint: disable=invalid-name
-from Stoner import Data
-from Stoner.analysis.fitting.models.thermal import vftEquation, VFTEquation
 from numpy import logspace, log10
 from numpy.random import normal
 
+from Stoner import Data
+from Stoner.analysis.fitting.models.thermal import vftEquation, VFTEquation
+
 # Make some data
 T = logspace(log10(200), log10(350), 51)
 params = (1e16, 0.5, 150)

diff --git a/doc/samples/channel_math.py b/doc/samples/channel_math.py
@@ -1,8 +1,9 @@
 """Demonstrate Channel math operations."""
 # pylint: disable=invalid-name
-from Stoner import Data
 from numpy import linspace, ones_like, sin, cos, pi
 from numpy.random import normal
+
+from Stoner import Data
 from Stoner.plot.utils import errorfill
 
 x = linspace(0, 10 * pi, 101)

diff --git a/doc/samples/colormap_plot.py b/doc/samples/colormap_plot.py
@@ -1,8 +1,9 @@
 """Plot 3d fdata as a colourmap."""
 # pylint: disable=invalid-name
-from Stoner import Data
 import numpy as np
 
+from Stoner import Data
+
 x, y = np.meshgrid(np.linspace(-2, 2, 100), np.linspace(-2, 2, 100))
 x = x.ravel()
 y = y.ravel()

diff --git a/doc/samples/contour_plot.py b/doc/samples/contour_plot.py
@@ -1,7 +1,7 @@
 """Plot 3D data on a contour plot."""
 # pylint: disable=invalid-name
-from Stoner import Data
 import numpy as np
+from Stoner import Data
 
 x, y = np.meshgrid(np.linspace(-2, 2, 100), np.linspace(-2, 2, 100))
 x = x.ravel()

diff --git a/doc/samples/curvefit_models.py b/doc/samples/curvefit_models.py
@@ -1,9 +1,10 @@
 """Simple use of lmfit to fit data."""
 # pylint: disable=invalid-name
+from numpy import linspace, random
+
 from Stoner import Data
 from Stoner.analysis.fitting.models.generic import PowerLaw
 from Stoner.analysis.fitting import odr_Model
-from numpy import linspace, random
 
 # Make some data
 x = linspace(0, 10.0, 101)

diff --git a/doc/samples/decompose.py b/doc/samples/decompose.py
@@ -1,8 +1,9 @@
 """Decompose Into symmetric and antisymmetric parts example."""
 # pylint: disable=invalid-name
+from numpy import linspace, reshape, array
+
 from Stoner import Data
 from Stoner.tools import format_val
-from numpy import linspace, reshape, array
 
 x = linspace(-10, 10, 201)
 y = 0.3 * x ** 3 - 6 * x ** 2 + 11 * x - 20

diff --git a/doc/samples/differential_evolution_simple.py b/doc/samples/differential_evolution_simple.py
@@ -1,8 +1,9 @@
 """Simple use of lmfit to fit data."""
 # pylint: disable=invalid-name
-from Stoner import Data
 from numpy import linspace, exp, random
 
+from Stoner import Data
+
 # Make some data
 x = linspace(0, 10.0, 101)
 y = 2 + 4 * exp(-x / 1.7) + random.normal(scale=0.2, size=101)

diff --git a/doc/samples/extrapolate-demo.py b/doc/samples/extrapolate-demo.py
@@ -1,9 +1,10 @@
 """Extrapolate data example."""
 # pylint: disable=invalid-name
-from Stoner import Data
 from numpy import linspace, ones_like, column_stack, exp, sqrt
 from numpy.random import normal
 import matplotlib.pyplot as plt
+
+from Stoner import Data
 from Stoner.plot.utils import errorfill
 
 x = linspace(1, 10, 101)

diff --git a/doc/samples/joy_division_plot.py b/doc/samples/joy_division_plot.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # pylint: disable=invalid-name
 """Demonstrate a waterfall plot styled after the famous album cover from Joy Division."""
+from numpy import log10
 
 from Stoner import Data, DataFolder
 from Stoner.formats.instruments import RigakuFile
 from Stoner.plot.utils import joy_division
-from numpy import log10
 
 
 class RigakuFolder(DataFolder):

diff --git a/doc/samples/lmfit_chi^2_demo.py b/doc/samples/lmfit_chi^2_demo.py
@@ -1,6 +1,7 @@
 """Demo of new Stoner.Analysis.AnalyseFile.lmfit."""
 # pylint: disable=invalid-name
 from os.path import join
+
 from Stoner.analysis.fitting.models import cfg_data_from_ini, cfg_model_from_ini
 from Stoner import __home__
 

diff --git a/doc/samples/lmfit_demo.py b/doc/samples/lmfit_demo.py
@@ -1,6 +1,7 @@
 """Demo of new Stoner.Analysis.AnalyseFile.lmfit"""
 # pylint: disable=invalid-name
 from os.path import join
+
 from Stoner.analysis.fitting.models import cfg_data_from_ini, cfg_model_from_ini
 from Stoner import __home__
 

diff --git a/doc/samples/lmfit_simple.py b/doc/samples/lmfit_simple.py
@@ -1,8 +1,9 @@
 """Simple use of lmfit to fit data."""
 # pylint: disable=invalid-name
-from Stoner import Data
 from numpy import linspace, exp, random
 
+from Stoner import Data
+
 # Make some data
 x = linspace(0, 10.0, 101)
 y = 2 + 4 * exp(-x / 1.7) + random.normal(scale=0.2, size=101)

diff --git a/doc/samples/make_model.py b/doc/samples/make_model.py
@@ -4,6 +4,7 @@
 # pylint: disable=invalid-name, redefined-outer-name
 from numpy import linspace
 from numpy.random import normal
+
 from Stoner import Data
 from Stoner.analysis.fitting.models import make_model
 

diff --git a/doc/samples/matrix_plot.py b/doc/samples/matrix_plot.py
@@ -1,8 +1,9 @@
 """Plot data defined on a matrix."""
 # pylint: disable=invalid-name
-from Stoner import Data
 import numpy as np
 
+from Stoner import Data
+
 x, y = np.meshgrid(np.linspace(-2, 2, 101), np.linspace(-2, 2, 101))
 z = np.cos(4 * np.pi * np.sqrt(x ** 2 + y ** 2)) * np.exp(
     -np.sqrt(x ** 2 + y ** 2)

diff --git a/doc/samples/odr_demo.py b/doc/samples/odr_demo.py
@@ -1,6 +1,7 @@
 """Demo of new Stoner.Analysis.AnalyseFile.lmfit."""
 # pylint: disable=invalid-name
 from os.path import join
+
 from Stoner.analysis.fitting.models import cfg_data_from_ini, cfg_model_from_ini
 from Stoner import __home__
 

diff --git a/doc/samples/outlier.py b/doc/samples/outlier.py
@@ -1,8 +1,9 @@
 """Detect outlying points from a lione."""
 # pylint: disable=invalid-name
+import numpy as np
+
 from Stoner import Data
 from Stoner.analysis.utils import poly_outlier
-import numpy as np
 
 x = np.linspace(0, 100, 201)
 y = 0.01 * x ** 2 + 5 * np.sin(x / 10.0)

diff --git a/scripts/GenX/stoner.py b/scripts/GenX/stoner.py
@@ -6,12 +6,13 @@
 # pylint: disable=invalid-name
 import numpy as np
 import wx
-from Stoner import Data
-from Stoner.compat import string_types
 
 from plugins.data_loader_framework import Template
 from plugins.utils import ShowWarningDialog
 
+from Stoner import Data
+from Stoner.compat import string_types
+
 
 class Plugin(Template):