Changeset c5cfb20 in sasview for src/sas/sascalc

Timestamp:

Sep 18, 2017 2:19:13 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1e6d9340

Parents:

1659f54 (diff), cfd27dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-639-katex

Location:

src/sas/sascalc

Files:

• dataloader/data_info.py (modified) (1 diff)
• dataloader/file_reader_base_class.py (modified) (4 diffs)
• dataloader/readers/cansas_reader.py (modified) (1 diff)
• dataloader/readers/danse_reader.py (modified) (1 diff)
• calculator/sas_gen.py (modified) (1 diff)
• realspace/__init__.py (modified) (3 diffs)

src/sas/sascalc/dataloader/data_info.py

@@ -1161 +1161 @@
     final_dataset = None
     if isinstance(data, plottable_1D):
-        final_dataset = Data1D(data.x, data.y)
+        final_dataset = Data1D(data.x, data.y, isSesans=datainfo.isSesans)
         final_dataset.dx = data.dx
         final_dataset.dy = data.dy
         final_dataset.dxl = data.dxl
         final_dataset.dxw = data.dxw
+        final_dataset.x_unit = data._xunit
+        final_dataset.y_unit = data._yunit
         final_dataset.xaxis(data._xaxis, data._xunit)
         final_dataset.yaxis(data._yaxis, data._yunit)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -6 +6 @@
 
 import os
+import re
 import logging
 import numpy as np
@@ -106 +107 @@
         for data in self.output:
             if isinstance(data, Data1D):
+                # Normalize the units for
+                data.x_unit = self.format_unit(data.x_unit)
+                data.y_unit = self.format_unit(data.y_unit)
                 # Sort data by increasing x and remove 1st point
                 ind = np.lexsort((data.y, data.x))
@@ -131 +135 @@
         for dataset in self.output:
             if isinstance(dataset, Data2D):
+                # Normalize the units for
+                dataset.x_unit = self.format_unit(dataset.Q_unit)
+                dataset.y_unit = self.format_unit(dataset.I_unit)
                 dataset.data = dataset.data.astype(np.float64)
                 dataset.qx_data = dataset.qx_data.astype(np.float64)
@@ -155 +162 @@
                 dataset.data = dataset.data.flatten()
 
+    def format_unit(self, unit=None):
+        """
+        Format units a common way
+        :param unit:
+        :return:
+        """
+        if unit:
+            split = unit.split("/")
+            if len(split) == 1:
+                return unit
+            elif split[0] == '1':
+                return "{0}^".format(split[1]) + "{-1}"
+            else:
+                return "{0}*{1}^".format(split[0], split[1]) + "{-1}"
+
     def set_all_to_none(self):
         """

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -299 +299 @@
                     self.current_dataset.dx = np.append(self.current_dataset.dx, data_point)
                 elif tagname == 'dQw':
-                    if self.current_dataset.dqw is None: self.current_dataset.dqw = np.empty(0)
+                    if self.current_dataset.dxw is None:
+                        self.current_dataset.dxw = np.empty(0)
                     self.current_dataset.dxw = np.append(self.current_dataset.dxw, data_point)
                 elif tagname == 'dQl':
-                    if self.current_dataset.dxl is None: self.current_dataset.dxl = np.empty(0)
+                    if self.current_dataset.dxl is None:
+                        self.current_dataset.dxl = np.empty(0)
                     self.current_dataset.dxl = np.append(self.current_dataset.dxl, data_point)
                 elif tagname == 'Qmean':

src/sas/sascalc/dataloader/readers/danse_reader.py

@@ -189 +189 @@
         x_vals = np.tile(x_vals, (size_y, 1)).flatten()
         y_vals = np.tile(y_vals, (size_x, 1)).T.flatten()
-        if self.current_dataset.err_data == np.all(np.array(None)) or np.any(self.current_dataset.err_data <= 0):
+        if (np.all(self.current_dataset.err_data == None)
+                or np.any(self.current_dataset.err_data <= 0)):
             new_err_data = np.sqrt(np.abs(self.current_dataset.data))
         else:

src/sas/sascalc/calculator/sas_gen.py

@@ -913 +913 @@
     def set_sldms(self, sld_mx, sld_my, sld_mz):
         r"""
-        Sets (\|m\|, m_theta, m_phi)
-        """
+        Sets mx, my, mz and abs(m).
+        """ # Note: escaping
         if sld_mx.__class__.__name__ == 'float':
             self.sld_mx = np.ones(len(self.pos_x)) * sld_mx

src/sas/sascalc/realspace/__init__.py

@@ -1 +1 @@
 """
     Real-Space Modeling for SAS
-""" 
+"""
 ## \mainpage Real-Space Modeling for SAS
 #
 # \section intro_sec Introduction
-# This module provides SAS scattering intensity simulation 
+# This module provides SAS scattering intensity simulation
 # based on real-space modeling.
 #
-# Documentation can be found here: 
+# Documentation can be found here:
 #    http://danse.us/trac/sas/wiki/RealSpaceModeling
 #
@@ -37 +37 @@
 #
 # \section overview_sec Package Overview
-# 
+#
 # \subsection class Class Diagram:
 # \image html real-space-class-diagram.png
 #
 # \subsection behav Behavior Enumeration:
-# \image html enum.gif
+# \image html enum.png
 #
 # \subsection Tutorial
@@ -78 +78 @@
 # \section help_sec Contact Info
 # Code and Documentation by Jing Zhou as part of the DANSE project.
-