nxs-analysis-tools 0.0.38__tar.gz → 0.0.39__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of nxs-analysis-tools might be problematic. Click here for more details.

Files changed (24) hide show
  1. {nxs_analysis_tools-0.0.38/src/nxs_analysis_tools.egg-info → nxs_analysis_tools-0.0.39}/PKG-INFO +1 -1
  2. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/pyproject.toml +1 -1
  3. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/src/_meta/__init__.py +1 -1
  4. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/src/nxs_analysis_tools/pairdistribution.py +32 -25
  5. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39/src/nxs_analysis_tools.egg-info}/PKG-INFO +1 -1
  6. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/LICENSE +0 -0
  7. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/MANIFEST.in +0 -0
  8. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/README.md +0 -0
  9. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/setup.cfg +0 -0
  10. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/setup.py +0 -0
  11. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/src/nxs_analysis_tools/__init__.py +0 -0
  12. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/src/nxs_analysis_tools/chess.py +0 -0
  13. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/src/nxs_analysis_tools/datareduction.py +0 -0
  14. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/src/nxs_analysis_tools/fitting.py +0 -0
  15. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/src/nxs_analysis_tools.egg-info/SOURCES.txt +0 -0
  16. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/src/nxs_analysis_tools.egg-info/dependency_links.txt +0 -0
  17. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/src/nxs_analysis_tools.egg-info/requires.txt +0 -0
  18. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/src/nxs_analysis_tools.egg-info/top_level.txt +0 -0
  19. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/tests/test_chess.py +0 -0
  20. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/tests/test_chess_fitting.py +0 -0
  21. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/tests/test_datareduction.py +0 -0
  22. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/tests/test_fitting.py +0 -0
  23. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/tests/test_lmfit.py +0 -0
  24. {nxs_analysis_tools-0.0.38 → nxs_analysis_tools-0.0.39}/tests/test_pairdistribution.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: nxs-analysis-tools
3
- Version: 0.0.38
3
+ Version: 0.0.39
4
4
  Summary: Reduce and transform nexus format (.nxs) scattering data.
5
5
  Author-email: "Steven J. Gomez Alvarado" <stevenjgomez@ucsb.edu>
6
6
  License: MIT License
@@ -6,7 +6,7 @@ build-backend = 'setuptools.build_meta'
6
6
 
7
7
  [project]
8
8
  name = 'nxs-analysis-tools'
9
- version = '0.0.38'
9
+ version = '0.0.39'
10
10
  description = 'Reduce and transform nexus format (.nxs) scattering data.'
11
11
  readme = 'README.md'
12
12
  requires-python = '>=3.7'
@@ -6,5 +6,5 @@ __author__ = 'Steven J. Gomez Alvarado'
6
6
  __email__ = 'stevenjgomez@ucsb.edu'
7
7
  __copyright__ = f"2023, {__author__}"
8
8
  __license__ = 'MIT'
9
- __version__ = '0.0.38'
9
+ __version__ = '0.0.39'
10
10
  __repo_url__ = 'https://github.com/stevenjgomez/nxs_analysis_tools'
@@ -433,30 +433,33 @@ class Symmetrizer3D:
433
433
  q1, q2, q3 = self.q1, self.q2, self.q3
434
434
  out_array = np.zeros(data[data.signal].shape)
435
435
 
436
- print('Symmetrizing ' + self.plane1 + ' planes...')
437
- for k, value in enumerate(q3):
438
- print(f'Symmetrizing {q3.nxname}={value:.02f}...', end='\r')
439
- data_symmetrized = self.plane1symmetrizer.symmetrize_2d(data[:, :, k])
440
- out_array[:, :, k] = data_symmetrized[data.signal].nxdata
441
- print('\nSymmetrized ' + self.plane1 + ' planes.')
442
-
443
- print('Symmetrizing ' + self.plane2 + ' planes...')
444
- for j, value in enumerate(q2):
445
- print(f'Symmetrizing {q2.nxname}={value:.02f}...', end='\r')
446
- data_symmetrized = self.plane2symmetrizer.symmetrize_2d(
447
- NXdata(NXfield(out_array[:, j, :], name=data.signal), (q1, q3))
448
- )
449
- out_array[:, j, :] = data_symmetrized[data.signal].nxdata
450
- print('\nSymmetrized ' + self.plane2 + ' planes.')
451
-
452
- print('Symmetrizing ' + self.plane3 + ' planes...')
453
- for i, value in enumerate(q1):
454
- print(f'Symmetrizing {q1.nxname}={value:.02f}...', end='\r')
455
- data_symmetrized = self.plane3symmetrizer.symmetrize_2d(
456
- NXdata(NXfield(out_array[i, :, :], name=data.signal), (q2, q3))
457
- )
458
- out_array[i, :, :] = data_symmetrized[data.signal].nxdata
459
- print('\nSymmetrized ' + self.plane3 + ' planes.')
436
+ if self.plane1symmetrizer.theta_max:
437
+ print('Symmetrizing ' + self.plane1 + ' planes...')
438
+ for k, value in enumerate(q3):
439
+ print(f'Symmetrizing {q3.nxname}={value:.02f}...', end='\r')
440
+ data_symmetrized = self.plane1symmetrizer.symmetrize_2d(data[:, :, k])
441
+ out_array[:, :, k] = data_symmetrized[data.signal].nxdata
442
+ print('\nSymmetrized ' + self.plane1 + ' planes.')
443
+
444
+ if self.plane2symmetrizer.theta_max:
445
+ print('Symmetrizing ' + self.plane2 + ' planes...')
446
+ for j, value in enumerate(q2):
447
+ print(f'Symmetrizing {q2.nxname}={value:.02f}...', end='\r')
448
+ data_symmetrized = self.plane2symmetrizer.symmetrize_2d(
449
+ NXdata(NXfield(out_array[:, j, :], name=data.signal), (q1, q3))
450
+ )
451
+ out_array[:, j, :] = data_symmetrized[data.signal].nxdata
452
+ print('\nSymmetrized ' + self.plane2 + ' planes.')
453
+
454
+ if self.plane3symmetrizer.theta_max:
455
+ print('Symmetrizing ' + self.plane3 + ' planes...')
456
+ for i, value in enumerate(q1):
457
+ print(f'Symmetrizing {q1.nxname}={value:.02f}...', end='\r')
458
+ data_symmetrized = self.plane3symmetrizer.symmetrize_2d(
459
+ NXdata(NXfield(out_array[i, :, :], name=data.signal), (q2, q3))
460
+ )
461
+ out_array[i, :, :] = data_symmetrized[data.signal].nxdata
462
+ print('\nSymmetrized ' + self.plane3 + ' planes.')
460
463
 
461
464
  out_array[out_array < 0] = 0
462
465
 
@@ -1210,7 +1213,7 @@ def fourier_transform_nxdata(data):
1210
1213
  fft = NXdata(NXfield(fft_array, name='dPDF'),
1211
1214
  (NXfield(np.linspace(-0.5 / H_step, 0.5 / H_step, padded.shape[0]), name='x'),
1212
1215
  NXfield(np.linspace(-0.5 / K_step, 0.5 / K_step, padded.shape[1]), name='y'),
1213
- NXfield(np.linspace(-0.5 / L_step, 0.5 / L_step, padded.shape[1]), name='z'),
1216
+ NXfield(np.linspace(-0.5 / L_step, 0.5 / L_step, padded.shape[2]), name='z'),
1214
1217
  )
1215
1218
  )
1216
1219
  return fft
@@ -1289,6 +1292,10 @@ class DeltaPDF:
1289
1292
  self.data = data
1290
1293
  self.puncher.set_data(data)
1291
1294
  self.interpolator.set_data(data)
1295
+ self.tapered = data
1296
+ self.padded = data
1297
+ self.interpolated = data
1298
+ self.punched = data
1292
1299
 
1293
1300
  def set_lattice_params(self, lattice_params):
1294
1301
  """
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: nxs-analysis-tools
3
- Version: 0.0.38
3
+ Version: 0.0.39
4
4
  Summary: Reduce and transform nexus format (.nxs) scattering data.
5
5
  Author-email: "Steven J. Gomez Alvarado" <stevenjgomez@ucsb.edu>
6
6
  License: MIT License