Changeset 7988501 in sasview for src/sas/sascalc

Timestamp:

Oct 8, 2016 2:34:03 PM (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:

51a4d78

Parents:

6df015de

Message:

Data1D class changed to include SESANS Data format

Location:

src/sas/sascalc

Files:

• dataloader/data_info.py (modified) (1 diff)
• fit/AbstractFitEngine.py (modified) (2 diffs)
• fit/BumpsFitting.py (modified) (1 diff)

src/sas/sascalc/dataloader/data_info.py

@@ -705 +705 @@
         raise(TypeError,'This is neither SANS nor SESANS data, what the hell are you doing??')
 
-    def __init__(self, x=None, y=None, lam=None, dx=None, dy=None, dlam=None):
+    def __init__(self, x=None, y=None, dx=None, dy=None, lam=None, dlam=None):
         DataInfo.__init__(self)
-        plottable_1D.__init__(self, x, y, lam, dx, dy, dlam)
+        plottable_1D.__init__(self, x, y, dx, dy,None, None, lam, dlam)
+        if self.lam is None: # This means the lam param was not detected in the data: it's SANS data!
+            x_unit = '1/A'
+            y_unit = '1/cm'
+        elif self.lam is not None: # This means lam was detected (should be an empty ndarray): it's SESANS data!
+            x_unit = 'A'
+            y_unit = 'pol'
+        else: # and if it's neither, you get punished!
+            raise(TypeError,'This is neither SANS nor SESANS data, what the hell are you doing??')
 
     def __str__(self):

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -131 +131 @@
         a way to get residuals from data.
     """
-    def __init__(self, x, y, dx=None, dy=None, smearer=None, data=None):
+    def __init__(self, x, y, dx=None, dy=None, smearer=None, data=None, lam=None, dlam=None):
         """
             :param smearer: is an object of class QSmearer or SlitSmearer
@@ -152 +152 @@
                 
         """
-        Data1D.__init__(self, x=x, y=y, dx=dx, dy=dy)
+        Data1D.__init__(self, x=x, y=y, dx=dx, dy=dy, lam=lam,dlam=dlam)
         self.num_points = len(x)
         self.sas_data = data

src/sas/sascalc/fit/BumpsFitting.py

@@ -26 +26 @@
 from bumps import parameter
 from bumps.fitproblem import FitProblem
-
 
 from sas.sascalc.fit.AbstractFitEngine import FitEngine