nxs-analysis-tools 0.0.27__tar.gz → 0.0.29__tar.gz

{nxs-analysis-tools-0.0.27/src/nxs_analysis_tools.egg-info → nxs-analysis-tools-0.0.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxs-analysis-tools
-Version: 0.0.27
+Version: 0.0.29
 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.27 → nxs-analysis-tools-0.0.29}/pyproject.toml

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

{nxs-analysis-tools-0.0.27 → nxs-analysis-tools-0.0.29}/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.27'
+__version__= '0.0.29'
 __repo_url__ = 'https://github.com/stevenjgomez/nxs_analysis_tools'

{nxs-analysis-tools-0.0.27 → nxs-analysis-tools-0.0.29}/src/nxs_analysis_tools/datareduction.py

@@ -695,7 +695,8 @@ def rotate_data(data, lattice_angle, rotation_angle, rotation_axis, printout=Fal
 
     for i in range(len(data[data.axes[rotation_axis]])):
         if printout:
-            print(f'Rotating {data.axes[rotation_axis]}={data[data.axes[rotation_axis]][i]}...')
+            print(f'\rRotating {data.axes[rotation_axis]}={data[data.axes[rotation_axis]][i]}...                      ',
+                  end='', flush=True)
         # Identify current slice
         if rotation_axis == 0:
             sliced_data = data[i, :, :]
@@ -762,7 +763,7 @@ def rotate_data(data, lattice_angle, rotation_angle, rotation_axis, printout=Fal
             output_array[:, i, :] = counts_unpadded
         elif rotation_axis == 2:
             output_array[:, :, i] = counts_unpadded
-    print('Done.')
+    print('\nDone.')
     return NXdata(NXfield(output_array, name='counts'),
                   (data[data.axes[0]], data[data.axes[1]], data[data.axes[2]]))
 

{nxs-analysis-tools-0.0.27 → nxs-analysis-tools-0.0.29}/src/nxs_analysis_tools/fitting.py

@@ -120,7 +120,11 @@ class LinecutModel:
         # Else, combine the components into a composite model and use that as the
         else:
             self.model_components = model_components
-            self.model = CompositeModel(*model_components, operator.add)
+            self.model = model_components[0]
+
+            # Combine remaining components into the composite model
+            for component in model_components[1:]:
+                self.model = CompositeModel(self.model, component, operator.add)
 
     def set_param_hint(self, *args, **kwargs):
         """

{nxs-analysis-tools-0.0.27 → nxs-analysis-tools-0.0.29/src/nxs_analysis_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nxs-analysis-tools
-Version: 0.0.27
+Version: 0.0.29
 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.29/tests/test_chess_fitting.py

@@ -0,0 +1,21 @@
+import sys
+sys.path.append('../src/nxs_analysis_tools/')
+from datareduction import load_data, Scissors
+from chess import *
+from fitting import *
+
+from lmfit.models import GaussianModel, LinearModel, LorentzianModel
+
+sample = TempDependence()
+sample.load_datasets(folder=r'K:\pokharel-3470-a\PrCd3P3\BRO7')
+sample.cut_data(center=(0.5,-3,0), window=(0.1,0.3,0.1))
+
+sample.set_model_components([GaussianModel(prefix='peak'), LorentzianModel(prefix='diffuse'), LinearModel(prefix='background')])
+sample.set_param_hint('peakcenter', min=-0.1, max=0.1)
+sample.make_params()
+sample.guess()
+sample.print_initial_params()
+sample.plot_initial_guess()
+sample.fit()
+sample.plot_fit()
+sample.print_fit_report()

nxs-analysis-tools-0.0.27/tests/test_chess_fitting.py

@@ -1,21 +0,0 @@
-import sys
-sys.path.append('../src/nxs_analysis_tools/')
-from datareduction import load_data, Scissors
-from chess import *
-from fitting import *
-
-from lmfit.models import GaussianModel, LinearModel
-
-sample = TempDependence()
-sample.load_datasets(folder='../docs/source/examples/example_data/sample_name')
-sample.cut_data(center=(0,0,0), window=(0.1,0.75,0.1))
-
-sample.set_model_components([GaussianModel(prefix='peak'), LinearModel(prefix='background')])
-sample.set_param_hint('peakcenter', min=-0.1, max=0.1)
-sample.make_params()
-sample.guess()
-sample.print_initial_params()
-sample.plot_initial_guess()
-sample.fit()
-sample.plot_fit()
-sample.print_fit_report()