Changeset 20522e1 in sasview for src

Timestamp:

Jan 20, 2017 5:45:03 AM (8 years ago)

Author:

jhbakker

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

18501795

Parents:

b5db35d

Message:

Fixes based on Jeff's comments (20170119). Tested with 1D SESANS data on
Windows 10 machine. Needs to be tested with 1D and 2D SANS data.

Location:

src/sas

Files:

• sascalc/dataloader/data_info.py (modified) (4 diffs)
• sasgui/guiframe/data_manager.py (modified) (1 diff)
• sasgui/perspectives/fitting/basepage.py (modified) (1 diff)

src/sas/sascalc/dataloader/data_info.py

@@ -489 +489 @@
     ## Loading errors
     errors = None
+    ## SESANS data check
+    isSesans = None
+
 
     def __init__(self):
@@ -521 +524 @@
         ## Loading errors
         self.errors = []
+        ## SESANS data check
+        self.isSesans = False
 
     def append_empty_process(self):
@@ -694 +699 @@
     1D data class
     """
-    def __init__(self, x=None, y=None, dx=None, dy=None, lam=None, dlam=None, isSesans=False):
-        self.isSesans = isSesans
+    def __init__(self, x=None, y=None, dx=None, dy=None, lam=None, dlam=None, isSesans=None):
         DataInfo.__init__(self)
         plottable_1D.__init__(self, x, y, dx, dy,None, None, lam, dlam)
-        if self.isSesans:
-            x_unit = 'A'
-            y_unit = 'pol'
-        elif not self.isSesans: # it's SANS data! (Could also be simple else statement, but i prefer exhaustive conditionals...-JHB)
-            x_unit = '1/A'
-            y_unit = '1/cm'
-        else: # and if it's neither, you get punished!
-            raise(TypeError,'This is neither SANS nor SESANS data, what the hell are you doing??')
+        self.isSesans = isSesans
+        try:
+            if self.isSesans: # the data is SESANS
+                x_unit = 'A'
+                y_unit = 'pol'
+            elif not self.isSesans: # the data is SANS
+                x_unit = '1/A'
+                y_unit = '1/cm'
+        except: # the data is not recognized/supported, and the user is notified
+            raise(TypeError, 'data not recognized, check documentation for supported 1D data formats')
 
     def __str__(self):
@@ -927 +933 @@
     def __init__(self, data=None, err_data=None, qx_data=None,
                  qy_data=None, q_data=None, mask=None,
-                 dqx_data=None, dqy_data=None):
-        self.y_bins = []
-        self.x_bins = []
+                 dqx_data=None, dqy_data=None, isSesans=None):
         DataInfo.__init__(self)
         plottable_2D.__init__(self, data, err_data, qx_data,
                               qy_data, q_data, mask, dqx_data, dqy_data)
+        self.y_bins = []
+        self.x_bins = []
+        self.isSesans=isSesans
+
         if len(self.detector) > 0:
             raise RuntimeError, "Data2D: Detector bank already filled at init"

src/sas/sasgui/guiframe/data_manager.py

@@ -61 +61 @@
         
         if issubclass(Data2D, data.__class__):
-            new_plot = Data2D(image=None, err_image=None) 
-        elif data.meta_data['loader'] == 'SESANS':
-            new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None, isSesans=True)
+            new_plot = Data2D(image=None, err_image=None, isSesans=data.isSesans) # For now, isSesans for 2D data is always false
         else:
-            new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None) #SESANS check???
+            new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None, isSesans=data.isSesans)
+
+
+        #elif data.meta_data['loader'] == 'SESANS':
+        #    new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None, isSesans=True)
+        #else:
+        #    new_plot = Data1D(x=[], y=[], dx=None, dy=None, lam=None, dlam=None) #SESANS check???
 
         new_plot.copy_from_datainfo(data)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -142 +142 @@
         self.theory_qmin_x = None
         self.theory_qmax_x = None
-        self.cb1 = None # TODO: remove?
         self.btEditMask = None
         self.btFit = None