nxs-analysis-tools 0.0.36__py3-none-any.whl → 0.0.38__py3-none-any.whl

_meta/__init__.py

@@ -6,5 +6,5 @@ __author__ = 'Steven J. Gomez Alvarado'
 __email__ = 'stevenjgomez@ucsb.edu'
 __copyright__ = f"2023, {__author__}"
 __license__ = 'MIT'
-__version__= '0.0.36'
+__version__ = '0.0.38'
 __repo_url__ = 'https://github.com/stevenjgomez/nxs_analysis_tools'

nxs_analysis_tools/pairdistribution.py

@@ -16,6 +16,11 @@ import pyfftw
 from .datareduction import plot_slice, reciprocal_lattice_params, Padder, \
     array_to_nxdata
 
+__all__ = ['Symmetrizer2D', 'Symmetrizer3D', 'Puncher', 'Interpolator',
+           'fourier_transform_nxdata', 'Gaussian3DKernel', 'DeltaPDF',
+           'generate_gaussian'
+           ]
+
 
 class Symmetrizer2D:
     """
@@ -870,9 +875,6 @@ class Gaussian3DKernel(Kernel):
         The default is [1, 0, 1, 0, 1, 0], corresponding to the Gaussian form:
         (1 * X^2 + 0 * X * Y + 1 * Y^2 + 0 * Y * Z + 1 * Z^2 + 0 * Z * X).
 
-    **kwargs : keyword arguments
-        Additional keyword arguments passed to the parent class constructor.
-
     Raises
     ------
     ValueError
@@ -892,7 +894,7 @@ class Gaussian3DKernel(Kernel):
         x_dim, y_dim, z_dim = size
         x = np.linspace(-x_dim, x_dim, int(x_dim) + 1)
         y = np.linspace(-y_dim, y_dim, int(y_dim) + 1)
-        z = np.linspacein(-z_dim, z_dim, int(z_dim) + 1)
+        z = np.linspace(-z_dim, z_dim, int(z_dim) + 1)
         X, Y, Z = np.meshgrid(x, y, z)
         array = np.exp(-(coeffs[0] * X ** 2 +
                          coeffs[1] * X * Y +
@@ -907,7 +909,7 @@ class Gaussian3DKernel(Kernel):
         self._truncation = np.abs(1. - self._array.sum())
 
 
-class Interpolator():
+class Interpolator:
     """
     A class to perform data interpolation using convolution with a specified
      kernel.
@@ -996,7 +998,6 @@ class Interpolator():
         if self.interp_time:
             print(f"Last interpolation took {self.interp_time / 60:.2f} minutes.")
 
-
         print("Running interpolation...")
         result = np.real(
             convolve_fft(self.data[self.data.signal].nxdata,
@@ -1027,11 +1028,11 @@ class Interpolator():
         """
         data = self.data
         tukey_H = np.tile(
-            scipy.signal.tukey(len(data[data.axes[0]]), alpha=tukey_alphas[0])[:, None, None],
+            scipy.signal.windows.tukey(len(data[data.axes[0]]), alpha=tukey_alphas[0])[:, None, None],
             (1, len(data[data.axes[1]]), len(data[data.axes[2]]))
         )
         tukey_K = np.tile(
-            scipy.signal.tukey(len(data[data.axes[1]]), alpha=tukey_alphas[1])[None, :, None],
+            scipy.signal.windows.tukey(len(data[data.axes[1]]), alpha=tukey_alphas[1])[None, :, None],
             (len(data[data.axes[0]]), 1, len(data[data.axes[2]]))
         )
         window = tukey_H * tukey_K
@@ -1040,7 +1041,7 @@ class Interpolator():
         gc.collect()
 
         tukey_L = np.tile(
-            scipy.signal.tukey(len(data[data.axes[2]]), alpha=tukey_alphas[2])[None, None, :],
+            scipy.signal.windows.tukey(len(data[data.axes[2]]), alpha=tukey_alphas[2])[None, None, :],
             (len(data[data.axes[0]]), len(data[data.axes[1]]), 1))
         window = window * tukey_L
 
@@ -1069,11 +1070,11 @@ class Interpolator():
         L_ = data[data.axes[2]]
 
         tukey_H = np.tile(
-            scipy.signal.tukey(len(data[data.axes[0]]), alpha=tukey_alphas[0])[:, None, None],
+            scipy.signal.windows.tukey(len(data[data.axes[0]]), alpha=tukey_alphas[0])[:, None, None],
             (1, len(data[data.axes[1]]), len(data[data.axes[2]]))
         )
         tukey_K = np.tile(
-            scipy.signal.tukey(len(data[data.axes[1]]), alpha=tukey_alphas[1])[None, :, None],
+            scipy.signal.windows.tukey(len(data[data.axes[1]]), alpha=tukey_alphas[1])[None, :, None],
             (len(data[data.axes[0]]), 1, len(data[data.axes[2]]))
         )
         window = tukey_H * tukey_K
@@ -1087,7 +1088,7 @@ class Interpolator():
             np.tile(
                 np.concatenate(
                     (np.zeros(truncation)[:, None, None],
-                     scipy.signal.tukey(len(H_) - 2 * truncation,
+                     scipy.signal.windows.tukey(len(H_) - 2 * truncation,
                                         alpha=tukey_alphas[2])[:, None, None],
                      np.zeros(truncation)[:, None, None])),
                 (1, len(K_), len(L_))
@@ -1101,7 +1102,7 @@ class Interpolator():
         gc.collect()
 
         tukey_L = np.tile(
-            scipy.signal.tukey(len(data[data.axes[2]]), alpha=tukey_alphas[3])[None, None, :],
+            scipy.signal.windows.tukey(len(data[data.axes[2]]), alpha=tukey_alphas[3])[None, None, :],
             (len(data[data.axes[0]]), len(data[data.axes[1]]), 1)
         )
         window = window * tukey_L

{nxs_analysis_tools-0.0.36.dist-info → nxs_analysis_tools-0.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxs-analysis-tools
-Version: 0.0.36
+Version: 0.0.38
 Summary: Reduce and transform nexus format (.nxs) scattering data.
 Author-email: "Steven J. Gomez Alvarado" <stevenjgomez@ucsb.edu>
 License: MIT License
@@ -48,6 +48,9 @@ Requires-Dist: ipython>=1.0.0
 Requires-Dist: pandas>=2.0.2
 Requires-Dist: nexusformat>=1.0.1
 Requires-Dist: lmfit>=1.2.1
+Requires-Dist: astropy>=5.3.4
+Requires-Dist: pyfftw>=0.13.1
+Requires-Dist: scipy>=1.14.1
 Provides-Extra: dev
 Requires-Dist: build>=0.8.0; extra == "dev"
 Requires-Dist: furo>=2022.6.21; extra == "dev"

nxs_analysis_tools-0.0.38.dist-info/RECORD

@@ -0,0 +1,11 @@
+_meta/__init__.py,sha256=Fq9YEQTMUYLfpwp34vFDtGaCAlkmx85tKN1ydDrKlhM,352
+nxs_analysis_tools/__init__.py,sha256=bxbTLpIcKasH3fuRZOvJ9zeu7IBBju82mOTgUV4ZqHE,530
+nxs_analysis_tools/chess.py,sha256=GUW08BcDUGD88MPZCl4yJTQp4hwd9tVNTJN_afNSUUo,24339
+nxs_analysis_tools/datareduction.py,sha256=e__mBGZIpJ-_-Dr6-T9hJURJazFnBy3PoWfwRxOra4U,41848
+nxs_analysis_tools/fitting.py,sha256=vPx75lKvm5pWOGBtRtff8k6J5dA6kRk3EJyzxCH5Tyk,8809
+nxs_analysis_tools/pairdistribution.py,sha256=ymJIzXdvg6aZXHF-T63szBeh3XmBbbAvK5eS6s0aqnM,57593
+nxs_analysis_tools-0.0.38.dist-info/LICENSE,sha256=tdnoYVH1-ogW_5-gGs9bK-IkCamH1ATJqrdL37kWTHk,1102
+nxs_analysis_tools-0.0.38.dist-info/METADATA,sha256=10kCoETrsas_HIGd06j8yH1jG4IZ1tns8eOo2Eq_szc,3895
+nxs_analysis_tools-0.0.38.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+nxs_analysis_tools-0.0.38.dist-info/top_level.txt,sha256=8U000GNPzo6T6pOMjRdgOSO5heMzLMGjkxa1CDtyMHM,25
+nxs_analysis_tools-0.0.38.dist-info/RECORD,,

nxs_analysis_tools-0.0.36.dist-info/RECORD

@@ -1,11 +0,0 @@
-_meta/__init__.py,sha256=MgUQ6hf6wCCPWsne48uNL0cMwcd9-4h5VAzva2i5Y5g,351
-nxs_analysis_tools/__init__.py,sha256=bxbTLpIcKasH3fuRZOvJ9zeu7IBBju82mOTgUV4ZqHE,530
-nxs_analysis_tools/chess.py,sha256=GUW08BcDUGD88MPZCl4yJTQp4hwd9tVNTJN_afNSUUo,24339
-nxs_analysis_tools/datareduction.py,sha256=e__mBGZIpJ-_-Dr6-T9hJURJazFnBy3PoWfwRxOra4U,41848
-nxs_analysis_tools/fitting.py,sha256=vPx75lKvm5pWOGBtRtff8k6J5dA6kRk3EJyzxCH5Tyk,8809
-nxs_analysis_tools/pairdistribution.py,sha256=SD0X5TXaSkodczi-zS8sp80B8VzFoksxo3GDhqDoR_M,57464
-nxs_analysis_tools-0.0.36.dist-info/LICENSE,sha256=tdnoYVH1-ogW_5-gGs9bK-IkCamH1ATJqrdL37kWTHk,1102
-nxs_analysis_tools-0.0.36.dist-info/METADATA,sha256=IVmTja2nIobn4AqJOR7COpjHZh6iHFpQq46Nm7Gbrpo,3803
-nxs_analysis_tools-0.0.36.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-nxs_analysis_tools-0.0.36.dist-info/top_level.txt,sha256=8U000GNPzo6T6pOMjRdgOSO5heMzLMGjkxa1CDtyMHM,25
-nxs_analysis_tools-0.0.36.dist-info/RECORD,,