funcnodes-span 0.1.5__tar.gz → 0.1.7__tar.gz

{funcnodes_span-0.1.5 → funcnodes_span-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcnodes-span
-Version: 0.1.5
+Version: 0.1.7
 Summary: 
 Author: Kourosh Rezaei
 Author-email: kouroshrezaei90@gmail.com

{funcnodes_span-0.1.5 → funcnodes_span-0.1.7}/funcnodes_span/__init__.py

@@ -4,7 +4,7 @@ from .normalization import NORM_NODE_SHELF as NORM
 from .smoothing import SMOOTH_NODE_SHELF as SMOOTH
 from .peak_analysis import PEAKS_NODE_SHELF as PEAK
 
-__version__ = "0.1.5"
+__version__ = "0.1.7"
 
 NODE_SHELF = fn.Shelf(
     name="Spectral Analysis",

{funcnodes_span-0.1.5 → funcnodes_span-0.1.7}/funcnodes_span/peak_analysis.py

@@ -179,7 +179,7 @@ def compute_peak_properties(
     return peak_properties
 
 
-@NodeDecorator(id="span.basics.peaks", name="Peak finder node")
+@NodeDecorator(id="span.basics.peaks", name="Peak finder")
 @controlled_wrapper(find_peaks, wrapper_attribute="__fnwrapped__")
 def peak_finder(
     x_array: np.ndarray,
@@ -310,14 +310,14 @@ class FittingModel(Enum):
     Moffat = "Moffat"
     Pearson4 = "Pearson4"
     Pearson7 = "Pearson7"
+    SkewedGaussian = "Skewed Gaussian"
+    SkewedVoigt = "Skewed Voigt"
     StudentsT = "StudentsT"
     BreitWigner = "Breit-Wigner"
     LogNormal = "Log-Normal"
     DampedOscillator = "Damped Oscillator"
     DampedHarmonicOscillator = "Damped Harmonic Oscillator"
     ExponentialGaussian = "Exponential Gaussian"
-    SkewedGaussian = "Skewed Gaussian"
-    SkewedVoigt = "Skewed Voigt"
     ThermalDistribution = "Thermal Distribution"
     Doniach = "Doniach"
     PowerLaw = "Power Law"
@@ -337,7 +337,7 @@ def fit_1D(
     x_array: np.ndarray,
     y_array: np.ndarray,
     basic_peaks: List[PeakProperties],
-    model: FittingModel = FittingModel.default(),
+    model_name: FittingModel = FittingModel.default(),
 ) -> List[PeakProperties]:
     # """
     # Fit a 1D model to the given data.
@@ -357,8 +357,8 @@ def fit_1D(
     #         A tuple containing a dictionary of evaluated components of the fit and additional information about the fit, and an optional figure for the plot.
 
     # """
-    if isinstance(model, FittingModel):
-        model = model.value
+    if isinstance(model_name, FittingModel):
+        model_name = model_name.value
     peaks = copy.deepcopy(basic_peaks)
     y = y_array
     x = x_array
@@ -392,7 +392,7 @@ def fit_1D(
     # ['Constant', 'Complex Constant', 'Linear', 'Quadratic', 'Polynomial', 'Spline', 'Gaussian', 'Gaussian-2D', 'Lorentzian', 'Split-Lorentzian', 'Voigt', 'PseudoVoigt', 'Moffat', 'Pearson4', 'Pearson7', 'StudentsT', 'Breit-Wigner', 'Log-Normal', 'Damped Oscillator', 'Damped Harmonic Oscillator', 'Exponential Gaussian', 'Skewed Gaussian', 'Skewed Voigt', 'Thermal Distribution', 'Doniach', 'Power Law', 'Exponential', 'Step', 'Rectangle', 'Expression']
     # peak like models are:  GaussianModel, LorentzianModel, VoigtModel and their modified versions
 
-    fitting_model = lmfit.models.__dict__["lmfit_models"][model]
+    fitting_model = lmfit.models.__dict__["lmfit_models"][model_name]
     # bkg1 = lmfit.models.__dict__["lmfit_models"]["Spline"](prefix="baseline", xknots=np.concatenate((x[:lowest_index], x[highest_index:])))
     bkg2 = lmfit.models.__dict__["lmfit_models"]["Exponential"](prefix="baseline")
 
@@ -412,7 +412,7 @@ def fit_1D(
         )
         pars[f"peak{index+1}_amplitude"].set(value=y[peak["index"]], min=0)
 
-        if model == "Exponential Gaussian" or model == "Skewed Gaussian":
+        if model_name == "Exponential Gaussian" or model_name == "Skewed Gaussian":
             pars[f"peak{index+1}_gamma"].set(value=1)
 
         f += model
@@ -436,7 +436,7 @@ def fit_1D(
             value=out.__dict__["best_values"][f"peak{index+1}_amplitude"], min=0
         )
 
-        if model == "Exponential Gaussian" or model == "Skewed Gaussian":
+        if model_name == "Exponential Gaussian" or model_name == "Skewed Gaussian":
             pars[f"peak{index+1}_gamma"].set(
                 value=out.__dict__["best_values"][f"peak{index+1}_gamma"]
             )
@@ -446,7 +446,7 @@ def fit_1D(
     out = f.fit(y, pars, x=x)
     com = out.eval_components(x=x)
     info_dict = out.__dict__
-    info_dict["model_name"] = model
+    info_dict["model_name"] = model_name
 
     peak_properties_list = []
 

{funcnodes_span-0.1.5 → funcnodes_span-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "funcnodes-span"
-version = "0.1.5"
+version = "0.1.7"
 description = ""
 authors = ["Kourosh Rezaei <kouroshrezaei90@gmail.com>"]
 readme = "README.md"