nxs-analysis-tools 0.0.37__py3-none-any.whl → 0.0.39__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.37'
+__version__ = '0.0.39'
 __repo_url__ = 'https://github.com/stevenjgomez/nxs_analysis_tools'

nxs_analysis_tools/pairdistribution.py

@@ -433,30 +433,33 @@ class Symmetrizer3D:
         q1, q2, q3 = self.q1, self.q2, self.q3
         out_array = np.zeros(data[data.signal].shape)
 
-        print('Symmetrizing ' + self.plane1 + ' planes...')
-        for k, value in enumerate(q3):
-            print(f'Symmetrizing {q3.nxname}={value:.02f}...', end='\r')
-            data_symmetrized = self.plane1symmetrizer.symmetrize_2d(data[:, :, k])
-            out_array[:, :, k] = data_symmetrized[data.signal].nxdata
-        print('\nSymmetrized ' + self.plane1 + ' planes.')
-
-        print('Symmetrizing ' + self.plane2 + ' planes...')
-        for j, value in enumerate(q2):
-            print(f'Symmetrizing {q2.nxname}={value:.02f}...', end='\r')
-            data_symmetrized = self.plane2symmetrizer.symmetrize_2d(
-                NXdata(NXfield(out_array[:, j, :], name=data.signal), (q1, q3))
-            )
-            out_array[:, j, :] = data_symmetrized[data.signal].nxdata
-        print('\nSymmetrized ' + self.plane2 + ' planes.')
-
-        print('Symmetrizing ' + self.plane3 + ' planes...')
-        for i, value in enumerate(q1):
-            print(f'Symmetrizing {q1.nxname}={value:.02f}...', end='\r')
-            data_symmetrized = self.plane3symmetrizer.symmetrize_2d(
-                NXdata(NXfield(out_array[i, :, :], name=data.signal), (q2, q3))
-            )
-            out_array[i, :, :] = data_symmetrized[data.signal].nxdata
-        print('\nSymmetrized ' + self.plane3 + ' planes.')
+        if self.plane1symmetrizer.theta_max:
+            print('Symmetrizing ' + self.plane1 + ' planes...')
+            for k, value in enumerate(q3):
+                print(f'Symmetrizing {q3.nxname}={value:.02f}...', end='\r')
+                data_symmetrized = self.plane1symmetrizer.symmetrize_2d(data[:, :, k])
+                out_array[:, :, k] = data_symmetrized[data.signal].nxdata
+            print('\nSymmetrized ' + self.plane1 + ' planes.')
+
+        if self.plane2symmetrizer.theta_max:
+            print('Symmetrizing ' + self.plane2 + ' planes...')
+            for j, value in enumerate(q2):
+                print(f'Symmetrizing {q2.nxname}={value:.02f}...', end='\r')
+                data_symmetrized = self.plane2symmetrizer.symmetrize_2d(
+                    NXdata(NXfield(out_array[:, j, :], name=data.signal), (q1, q3))
+                )
+                out_array[:, j, :] = data_symmetrized[data.signal].nxdata
+            print('\nSymmetrized ' + self.plane2 + ' planes.')
+
+        if self.plane3symmetrizer.theta_max:
+            print('Symmetrizing ' + self.plane3 + ' planes...')
+            for i, value in enumerate(q1):
+                print(f'Symmetrizing {q1.nxname}={value:.02f}...', end='\r')
+                data_symmetrized = self.plane3symmetrizer.symmetrize_2d(
+                    NXdata(NXfield(out_array[i, :, :], name=data.signal), (q2, q3))
+                )
+                out_array[i, :, :] = data_symmetrized[data.signal].nxdata
+            print('\nSymmetrized ' + self.plane3 + ' planes.')
 
         out_array[out_array < 0] = 0
 
@@ -1028,11 +1031,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
@@ -1041,7 +1044,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
 
@@ -1070,11 +1073,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
@@ -1088,7 +1091,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_))
@@ -1102,7 +1105,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
@@ -1210,7 +1213,7 @@ def fourier_transform_nxdata(data):
     fft = NXdata(NXfield(fft_array, name='dPDF'),
                  (NXfield(np.linspace(-0.5 / H_step, 0.5 / H_step, padded.shape[0]), name='x'),
                   NXfield(np.linspace(-0.5 / K_step, 0.5 / K_step, padded.shape[1]), name='y'),
-                  NXfield(np.linspace(-0.5 / L_step, 0.5 / L_step, padded.shape[1]), name='z'),
+                  NXfield(np.linspace(-0.5 / L_step, 0.5 / L_step, padded.shape[2]), name='z'),
                   )
                  )
     return fft
@@ -1289,6 +1292,10 @@ class DeltaPDF:
         self.data = data
         self.puncher.set_data(data)
         self.interpolator.set_data(data)
+        self.tapered = data
+        self.padded = data
+        self.interpolated = data
+        self.punched = data
 
     def set_lattice_params(self, lattice_params):
         """

{nxs_analysis_tools-0.0.37.dist-info → nxs_analysis_tools-0.0.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxs-analysis-tools
-Version: 0.0.37
+Version: 0.0.39
 Summary: Reduce and transform nexus format (.nxs) scattering data.
 Author-email: "Steven J. Gomez Alvarado" <stevenjgomez@ucsb.edu>
 License: MIT License
@@ -50,7 +50,7 @@ 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.10.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.39.dist-info/RECORD

@@ -0,0 +1,11 @@
+_meta/__init__.py,sha256=dCtE47jAbdBWpjNKN_CjDYSYI-hSlE17bPC-eOua6bE,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=2Pp9_50JhteGp2vGSZWnt7cbVHRsaHANj56zgWdnzJI,57939
+nxs_analysis_tools-0.0.39.dist-info/LICENSE,sha256=tdnoYVH1-ogW_5-gGs9bK-IkCamH1ATJqrdL37kWTHk,1102
+nxs_analysis_tools-0.0.39.dist-info/METADATA,sha256=UCKCYGt2XwKCRedk4UFGeHl8tWuHpBf0b2oWdHXzoIo,3895
+nxs_analysis_tools-0.0.39.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+nxs_analysis_tools-0.0.39.dist-info/top_level.txt,sha256=8U000GNPzo6T6pOMjRdgOSO5heMzLMGjkxa1CDtyMHM,25
+nxs_analysis_tools-0.0.39.dist-info/RECORD,,

{nxs_analysis_tools-0.0.37.dist-info → nxs_analysis_tools-0.0.39.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

nxs_analysis_tools-0.0.37.dist-info/RECORD

@@ -1,11 +0,0 @@
-_meta/__init__.py,sha256=uNldaTslIy-elGWjLbMXnzV9xexcZq-jipe84Z40WOQ,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=9Vim6LPqlcx70KLxRSIquoXg9peXNJEdvjgzHkJOVI0,57537
-nxs_analysis_tools-0.0.37.dist-info/LICENSE,sha256=tdnoYVH1-ogW_5-gGs9bK-IkCamH1ATJqrdL37kWTHk,1102
-nxs_analysis_tools-0.0.37.dist-info/METADATA,sha256=2ftQxthot1mnEhNmVMI7UKwGlKuBiLR7ZEcvsfw4lu0,3895
-nxs_analysis_tools-0.0.37.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-nxs_analysis_tools-0.0.37.dist-info/top_level.txt,sha256=8U000GNPzo6T6pOMjRdgOSO5heMzLMGjkxa1CDtyMHM,25
-nxs_analysis_tools-0.0.37.dist-info/RECORD,,