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

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/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.dist-info → nxs_analysis_tools-0.0.29.dist-info}/METADATA

@@ -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.dist-info/RECORD

@@ -0,0 +1,11 @@
+_meta/__init__.py,sha256=jtcXSNzQFbWDoq-6ootCIfg8pBynwgynZP9FHNbtaVc,351
+nxs_analysis_tools/__init__.py,sha256=HAdFMaImTfd2nCP1XzeSwreAv-wK6CeJbTn92aDQ-Bc,490
+nxs_analysis_tools/chess.py,sha256=tNWc5xiwEjdtVPq0FFm2dCP2xvtkuv4IkMLur7Qeqjs,14079
+nxs_analysis_tools/datareduction.py,sha256=Gvx9QyTyhqvu56PgiA9k7PzeGYtq71lTaofNESbg7xA,32616
+nxs_analysis_tools/fitting.py,sha256=FBAlswyh-tASOVUx1HQ4F50NbQcDasc497PBkZ6AStU,9065
+nxs_analysis_tools/pairdistribution.py,sha256=-_ULgC1XA9UKposzk51-64Y3cPWqdnBNAK7sdVTGHXM,20972
+nxs_analysis_tools-0.0.29.dist-info/LICENSE,sha256=tdnoYVH1-ogW_5-gGs9bK-IkCamH1ATJqrdL37kWTHk,1102
+nxs_analysis_tools-0.0.29.dist-info/METADATA,sha256=khCozYcLg4RkY2KWFx_rr8dR46lAx3D37gdAdNUOTGI,3837
+nxs_analysis_tools-0.0.29.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+nxs_analysis_tools-0.0.29.dist-info/top_level.txt,sha256=8U000GNPzo6T6pOMjRdgOSO5heMzLMGjkxa1CDtyMHM,25
+nxs_analysis_tools-0.0.29.dist-info/RECORD,,

nxs_analysis_tools-0.0.27.dist-info/RECORD

@@ -1,11 +0,0 @@
-_meta/__init__.py,sha256=qSCH0zIui0Ez8gddDZVHx4MO1XhOiaEh3ld7HLucMRw,351
-nxs_analysis_tools/__init__.py,sha256=HAdFMaImTfd2nCP1XzeSwreAv-wK6CeJbTn92aDQ-Bc,490
-nxs_analysis_tools/chess.py,sha256=tNWc5xiwEjdtVPq0FFm2dCP2xvtkuv4IkMLur7Qeqjs,14079
-nxs_analysis_tools/datareduction.py,sha256=eqPY8YMpG1g_eS5Dtu7UcIjnBImOjO2JFevWtd33lwQ,32551
-nxs_analysis_tools/fitting.py,sha256=f0wUn2uLwT6a2Yg8QgzzSdR0zgqjjeNMj-H_HJh7D6o,8888
-nxs_analysis_tools/pairdistribution.py,sha256=-_ULgC1XA9UKposzk51-64Y3cPWqdnBNAK7sdVTGHXM,20972
-nxs_analysis_tools-0.0.27.dist-info/LICENSE,sha256=tdnoYVH1-ogW_5-gGs9bK-IkCamH1ATJqrdL37kWTHk,1102
-nxs_analysis_tools-0.0.27.dist-info/METADATA,sha256=S8OvDXNEabKdiCnWd0r4A5g3IqH65EmjtrP3f1itS2U,3837
-nxs_analysis_tools-0.0.27.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-nxs_analysis_tools-0.0.27.dist-info/top_level.txt,sha256=8U000GNPzo6T6pOMjRdgOSO5heMzLMGjkxa1CDtyMHM,25
-nxs_analysis_tools-0.0.27.dist-info/RECORD,,