Changeset 2ffe241 in sasview for src/sas

Timestamp:

Feb 14, 2017 2:28:07 PM (8 years ago)

Author:

krzywon

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:

7caf3e5

Parents:

b5e9ce26

Message:

Fix issues with loading 2D data in the SESANS branch and always set isSesans to False when working with 2D.

Location:

src/sas

Files:

• sascalc/data_util/qsmearing.py (modified) (1 diff)
• sascalc/dataloader/data_info.py (modified) (2 diffs)
• sasgui/guiframe/data_manager.py (modified) (1 diff)

src/sas/sascalc/data_util/qsmearing.py

@@ -45 +45 @@
         elif data.dqx_data == None or data.dqy_data == None:
             return None
-        return Pinhole2D(data)
+        return PySmear2D(data)
     # This checks for 1D data with smearing info in the data itself (again, fail is likely; no exceptions)
     if  not hasattr(data, "dx") and not hasattr(data, "dxl")\

src/sas/sascalc/dataloader/data_info.py

@@ -933 +933 @@
     ## Vector of Q-values at the center of each bin in y
     y_bins = None
+    ## No 2D SESANS data as of yet. Always set it to False
+    isSesans = False
 
     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, isSesans=None):
+                 dqx_data=None, dqy_data=None):
         DataInfo.__init__(self)
         plottable_2D.__init__(self, data, err_data, qx_data,
@@ -942 +944 @@
         self.y_bins = []
         self.x_bins = []
-        self.isSesans=isSesans
 
         if len(self.detector) > 0:

src/sas/sasgui/guiframe/data_manager.py

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