nxs-analysis-tools 0.0.41__tar.gz → 0.0.42__tar.gz

{nxs_analysis_tools-0.0.41/src/nxs_analysis_tools.egg-info → nxs_analysis_tools-0.0.42}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: nxs-analysis-tools
-Version: 0.0.41
+Version: 0.0.42
 Summary: Reduce and transform nexus format (.nxs) scattering data.
 Author-email: "Steven J. Gomez Alvarado" <stevenjgomez@ucsb.edu>
 License: MIT License

{nxs_analysis_tools-0.0.41 → nxs_analysis_tools-0.0.42}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'nxs-analysis-tools'
-version = '0.0.41'
+version = '0.0.42'
 description = 'Reduce and transform nexus format (.nxs) scattering data.'
 readme = 'README.md'
 requires-python = '>=3.7'

{nxs_analysis_tools-0.0.41 → nxs_analysis_tools-0.0.42}/src/_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.41'
+__version__ = '0.0.42'
 __repo_url__ = 'https://github.com/stevenjgomez/nxs_analysis_tools'

{nxs_analysis_tools-0.0.41 → nxs_analysis_tools-0.0.42}/src/nxs_analysis_tools/chess.py

@@ -8,6 +8,7 @@ import re
 
 import matplotlib.pyplot as plt
 import matplotlib as mpl
+import pandas as pd
 import numpy as np
 from IPython.display import display, Markdown
 from nxs_analysis_tools import load_data, Scissors
@@ -190,8 +191,12 @@ class TempDependence:
 
         # Convert all temperatures to int temporarily to sort temperatures list before loading
         self.temperatures = [int(t) for t in self.temperatures]
-        self.temperatures.sort()
+
+        loading_template = pd.DataFrame({'temperature': self.temperatures, 'filename': items_to_load})
+        loading_template = loading_template.sort_values(by='temperature')
+        self.temperatures = loading_template['temperature']
         self.temperatures = [str(t) for t in self.temperatures]
+        items_to_load = loading_template['filename'].to_list()
 
         for i, item in enumerate(items_to_load):
             path = os.path.join(self.sample_directory, item)

{nxs_analysis_tools-0.0.41 → nxs_analysis_tools-0.0.42}/src/nxs_analysis_tools/datareduction.py

@@ -787,7 +787,8 @@ def rotate_data(data, lattice_angle, rotation_angle, rotation_axis, printout=Fal
 
         p = Padder(sliced_data)
         padding = tuple(len(sliced_data[axis]) for axis in sliced_data.axes)
-        counts = p.pad(padding).counts
+        counts = p.pad(padding)
+        counts = p.padded[p.padded.signal]
 
         counts_skewed = ndimage.affine_transform(counts,
                                                  t.inverted().get_matrix()[:2, :2],
@@ -848,7 +849,7 @@ def rotate_data(data, lattice_angle, rotation_angle, rotation_axis, printout=Fal
         elif rotation_axis == 2:
             output_array[:, :, i] = counts_unpadded
     print('\nDone.')
-    return NXdata(NXfield(output_array, name='counts'),
+    return NXdata(NXfield(output_array, name=p.padded.signal),
                   (data[data.axes[0]], data[data.axes[1]], data[data.axes[2]]))
 
 
@@ -884,7 +885,8 @@ def rotate_data2D(data, lattice_angle, rotation_angle):
 
     p = Padder(data)
     padding = tuple(len(data[axis]) for axis in data.axes)
-    counts = p.pad(padding).counts
+    counts = p.pad(padding)
+    counts = p.padded[p.padded.signal]
 
     counts_skewed = ndimage.affine_transform(counts,
                                              t.inverted().get_matrix()[:2, :2],
@@ -937,7 +939,7 @@ def rotate_data2D(data, lattice_angle, rotation_angle):
     counts_unpadded = p.unpad(counts_unskewed)
 
     print('\nDone.')
-    return NXdata(NXfield(counts_unpadded, name='counts'),
+    return NXdata(NXfield(counts_unpadded, name=p.padded.signal),
                   (data[data.axes[0]], data[data.axes[1]]))
 
 

{nxs_analysis_tools-0.0.41 → nxs_analysis_tools-0.0.42/src/nxs_analysis_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: nxs-analysis-tools
-Version: 0.0.41
+Version: 0.0.42
 Summary: Reduce and transform nexus format (.nxs) scattering data.
 Author-email: "Steven J. Gomez Alvarado" <stevenjgomez@ucsb.edu>
 License: MIT License