Minor tweaks

stonerlab · Dec 20, 2023 · 2fb2667 · 2fb2667
1 parent 7ffbe98
commit 2fb2667
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/Stoner/analysis/fitting/models/e_transport.py b/Stoner/analysis/fitting/models/e_transport.py
@@ -2,8 +2,7 @@
 # -*- coding: utf-8 -*-
 """Model classes and functions for various models of electron transport (other than tunnelling processes)."""
 # pylint: disable=invalid-name
-__all__ = ["BlochGrueneisen", "FluchsSondheimer", "WLfit",
-           "blochGrueneisen", "fluchsSondheimer", "wlfit"]
+__all__ = ["BlochGrueneisen", "FluchsSondheimer", "WLfit", "blochGrueneisen", "fluchsSondheimer", "wlfit"]
 
 import numpy as np
 from scipy.integrate import quad
@@ -21,7 +20,7 @@
     int64 = _dummy()
 
 
-@jit(float64(float64, int64), nopython=True, nogil=True)
+@jit(float64(float64, int64), nopython=True)
 def _bgintegrand(x, n):
     """Calculate the integrand for the Bloch Grueneisen model."""
     return x**n / ((np.exp(x) - 1) * (1 - np.exp(-x)))
@@ -61,10 +60,8 @@ def wlfit(B, s0, DS, B1, B2):
             WLpt1 = digamma(0.5 + B2 / np.abs(Bi))
             WLpt2 = digamma(0.5 + B1 / np.abs(Bi))
         else:
-            WLpt1 = (digamma(
-                0.5 + B2 / np.abs(B[tt - 1])) + digamma(0.5 + B2 / np.abs(B[tt + 1]))) / 2
-            WLpt2 = (digamma(
-                0.5 + B1 / np.abs(B[tt - 1])) + digamma(0.5 + B1 / np.abs(B[tt + 1]))) / 2
+            WLpt1 = (digamma(0.5 + B2 / np.abs(B[tt - 1])) + digamma(0.5 + B2 / np.abs(B[tt + 1]))) / 2
+            WLpt2 = (digamma(0.5 + B1 / np.abs(B[tt - 1])) + digamma(0.5 + B1 / np.abs(B[tt + 1]))) / 2
 
         WLpt3 = np.log(B2 / B1)
 
@@ -97,7 +94,8 @@ def fluchsSondheimer(t, l, p, sigma_0):
     """
     k = t / l
 
-    def kernel(x, k): return (x - x**3) * np.exp(-k * x) / (1 - np.exp(-k * x))
+    def kernel(x, k):
+        return (x - x**3) * np.exp(-k * x) / (1 - np.exp(-k * x))
 
     result = np.zeros(k.shape)
     for i, v in enumerate(k):

diff --git a/Stoner/core/base.py b/Stoner/core/base.py
@@ -779,7 +779,7 @@ def _load(self, filename: Filename, *args: Any, **kargs: Any) -> "metadataObject
         raise NotImplementedError("Save is not implemented in the base class.")
 
 
-if pd is not None and not hasattr(pd.DataFrame,"metadata"): # Don;t double add metadata
+if pd is not None and not hasattr(pd.DataFrame, "metadata"):  # Don;t double add metadata
 
     @pd.api.extensions.register_dataframe_accessor("metadata")
     class PandasMetadata(typeHintedDict):

diff --git a/doc/samples/colormap_plot.py b/doc/samples/colormap_plot.py
@@ -2,6 +2,7 @@
 # pylint: disable=invalid-name
 import numpy as np
 
+
 from Stoner import Data
 
 x, y = np.meshgrid(np.linspace(-2, 2, 100), np.linspace(-2, 2, 100))

diff --git a/tests/Stoner/test_Util.py b/tests/Stoner/test_Util.py
@@ -12,7 +12,6 @@
 pth = path.realpath(path.join(pth, "../../"))
 sys.path.insert(0, pth)
 
-
 def is_2tuple(x):
     """Return tru if x is a length two tuple of floats."""
     return isinstance(x, tuple) and len(x) == 2 and isinstance(x[0], float) and isinstance(x[1], float)