Merge branch 'master' of https://github.com/stonerlab/Stoner-PythonCode

stonerlab · Nov 6, 2019 · 4100e47 · 4100e47
2 parents 1fba05a + 4071cbc
commit 4100e47
Show file tree

Hide file tree

Showing 204 changed files with 25 additions and 1 deletion.
diff --git a/Stoner/core/Typing.py b/Stoner/core/Typing.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Defines type hint types for various common types in the package
+"""
+import typing
+
+from Stoner.core.setas import setas
+
+# Column Indices
+Single_Column_Index = typing.Union[str, int]
+Column_Index = typing.Union[typing.Sequence[Single_Column_Index], Single_Column_Index]
+
+# Setas
+Setas_Base = typing.Sequence[str]
+Setas_Dict = typing.Mapping[str, Column_Index]
+Setas = typing.Union[Setas_Base, Setas_Dict, str, setas]
diff --git a/Stoner/core/__init__.py b/Stoner/core/__init__.py
@@ -13,9 +13,11 @@
     "setas",
     "exceptions",
     "utils",
+    "Typing",
 ]
 
 from .base import regexpDict, typeHintedDict, metadataObject, string_to_type
 from .setas import setas as _setas
 from .array import DataArray
 from . import utils, exceptions, base, array
+from . import Typing
diff --git a/doc/Stoner.rst b/doc/Stoner.rst
@@ -75,7 +75,12 @@ Analysis Package
     :no-inheritance-diagram:
     :headings: -~
 
-    Fitting Models <analysis-fitting>
+Fitting Models
+^^^^^^^^^^^^^^
+.. toctree::
+   :maxdepth: 2
+
+   Fitting Models <analysis-fitting>
 
 Plot Package and Modules
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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/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/arrhenius.hires.png b/doc/plot_cache/arrhenius.hires.png
diff --git a/doc/plot_cache/arrhenius.pdf b/doc/plot_cache/arrhenius.pdf
diff --git a/doc/plot_cache/arrhenius.png b/doc/plot_cache/arrhenius.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/bdr.hires.png b/doc/plot_cache/bdr.hires.png
diff --git a/doc/plot_cache/bdr.pdf b/doc/plot_cache/bdr.pdf
diff --git a/doc/plot_cache/bdr.png b/doc/plot_cache/bdr.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/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/blochgruneisen.hires.png b/doc/plot_cache/blochgruneisen.hires.png
diff --git a/doc/plot_cache/blochgruneisen.pdf b/doc/plot_cache/blochgruneisen.pdf
diff --git a/doc/plot_cache/blochgruneisen.png b/doc/plot_cache/blochgruneisen.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/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/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/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/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/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/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/fluchssondheimer.hires.png b/doc/plot_cache/fluchssondheimer.hires.png
diff --git a/doc/plot_cache/fluchssondheimer.pdf b/doc/plot_cache/fluchssondheimer.pdf
diff --git a/doc/plot_cache/fluchssondheimer.png b/doc/plot_cache/fluchssondheimer.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/fowlernordheim.hires.png b/doc/plot_cache/fowlernordheim.hires.png
diff --git a/doc/plot_cache/fowlernordheim.pdf b/doc/plot_cache/fowlernordheim.pdf
diff --git a/doc/plot_cache/fowlernordheim.png b/doc/plot_cache/fowlernordheim.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_func.hires.png b/doc/plot_cache/ic_b_airy_func.hires.png
diff --git a/doc/plot_cache/ic_b_airy_func.pdf b/doc/plot_cache/ic_b_airy_func.pdf
diff --git a/doc/plot_cache/ic_b_airy_func.png b/doc/plot_cache/ic_b_airy_func.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/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/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/kittel.hires.png b/doc/plot_cache/kittel.hires.png
diff --git a/doc/plot_cache/kittel.pdf b/doc/plot_cache/kittel.pdf
diff --git a/doc/plot_cache/kittel.png b/doc/plot_cache/kittel.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/langevin.hires.png b/doc/plot_cache/langevin.hires.png
diff --git a/doc/plot_cache/langevin.pdf b/doc/plot_cache/langevin.pdf
diff --git a/doc/plot_cache/langevin.png b/doc/plot_cache/langevin.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/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/lorentzian_diff_func.hires.png b/doc/plot_cache/lorentzian_diff_func.hires.png
diff --git a/doc/plot_cache/lorentzian_diff_func.pdf b/doc/plot_cache/lorentzian_diff_func.pdf
diff --git a/doc/plot_cache/lorentzian_diff_func.png b/doc/plot_cache/lorentzian_diff_func.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/modarrhenius.hires.png b/doc/plot_cache/modarrhenius.hires.png
diff --git a/doc/plot_cache/modarrhenius.pdf b/doc/plot_cache/modarrhenius.pdf
diff --git a/doc/plot_cache/modarrhenius.png b/doc/plot_cache/modarrhenius.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/nDimarrehenius.hires.png b/doc/plot_cache/nDimarrehenius.hires.png
diff --git a/doc/plot_cache/nDimarrehenius.pdf b/doc/plot_cache/nDimarrehenius.pdf
diff --git a/doc/plot_cache/nDimarrehenius.png b/doc/plot_cache/nDimarrehenius.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/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/powerlaw.hires.png b/doc/plot_cache/powerlaw.hires.png
diff --git a/doc/plot_cache/powerlaw.pdf b/doc/plot_cache/powerlaw.pdf
diff --git a/doc/plot_cache/powerlaw.png b/doc/plot_cache/powerlaw.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/quadratic.hires.png b/doc/plot_cache/quadratic.hires.png
diff --git a/doc/plot_cache/quadratic.pdf b/doc/plot_cache/quadratic.pdf
diff --git a/doc/plot_cache/quadratic.png b/doc/plot_cache/quadratic.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_func.hires.png b/doc/plot_cache/rsj_noiseless_func.hires.png
diff --git a/doc/plot_cache/rsj_noiseless_func.pdf b/doc/plot_cache/rsj_noiseless_func.pdf
diff --git a/doc/plot_cache/rsj_noiseless_func.png b/doc/plot_cache/rsj_noiseless_func.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_func.hires.png b/doc/plot_cache/rsj_simple_func.hires.png
diff --git a/doc/plot_cache/rsj_simple_func.pdf b/doc/plot_cache/rsj_simple_func.pdf
diff --git a/doc/plot_cache/rsj_simple_func.png b/doc/plot_cache/rsj_simple_func.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.pdf b/doc/plot_cache/seabornstyle.pdf
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/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/simmons.hires.png b/doc/plot_cache/simmons.hires.png
diff --git a/doc/plot_cache/simmons.pdf b/doc/plot_cache/simmons.pdf
diff --git a/doc/plot_cache/simmons.png b/doc/plot_cache/simmons.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/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/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/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/strijkers_func.hires.png b/doc/plot_cache/strijkers_func.hires.png
diff --git a/doc/plot_cache/strijkers_func.pdf b/doc/plot_cache/strijkers_func.pdf
diff --git a/doc/plot_cache/strijkers_func.png b/doc/plot_cache/strijkers_func.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/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/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/wlfit-class.hires.png b/doc/plot_cache/wlfit-class.hires.png
diff --git a/doc/plot_cache/wlfit-class.pdf b/doc/plot_cache/wlfit-class.pdf
diff --git a/doc/plot_cache/wlfit-class.png b/doc/plot_cache/wlfit-class.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