Changeset fd5ac0d in sasview for src/sas/fit/AbstractFitEngine.py

Timestamp:

Feb 13, 2015 3:26:52 AM (9 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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7a04dbb

Parents:

b9a5f0e

Message:

I have completed the removal of all SANS references.
I will build, run, and run all unit tests before pushing.

File:

• src/sas/fit/AbstractFitEngine.py (modified) (6 diffs)

src/sas/fit/AbstractFitEngine.py

@@ -65 +65 @@
 class Model:
     """
-    Fit wrapper for SANS models.
-    """
-    def __init__(self, sans_model, sans_data=None, **kw):
-        """
-        :param sans_model: the sas model to wrap using park interface
-
-        """
-        self.model = sans_model
-        self.name = sans_model.name
-        self.data = sans_data
+    Fit wrapper for SAS models.
+    """
+    def __init__(self, sas_model, sas_data=None, **kw):
+        """
+        :param sas_model: the sas model to wrap using park interface
+
+        """
+        self.model = sas_model
+        self.name = sas_model.name
+        self.data = sas_data
 
     def get_params(self, fitparams):
@@ -128 +128 @@
 class FitData1D(Data1D):
     """
-        Wrapper class  for SANS data
+        Wrapper class  for SAS data
         FitData1D inherits from DataLoader.data_info.Data1D. Implements
         a way to get residuals from data.
@@ -155 +155 @@
         Data1D.__init__(self, x=x, y=y, dx=dx, dy=dy)
         self.num_points = len(x)
-        self.sans_data = data
+        self.sas_data = data
         self.smearer = smearer
         self._first_unsmeared_bin = None
@@ -265 +265 @@
 class FitData2D(Data2D):
     """
-        Wrapper class  for SANS data
-    """
-    def __init__(self, sans_data2d, data=None, err_data=None):
+        Wrapper class  for SAS data
+    """
+    def __init__(self, sas_data2d, data=None, err_data=None):
         Data2D.__init__(self, data=data, err_data=err_data)
         # Data can be initialized with a sas plottable or with vectors.
@@ -278 +278 @@
         self.radius = 0
         self.res_err_data = []
-        self.sans_data = sans_data2d
-        self.set_data(sans_data2d)
-
-    def set_data(self, sans_data2d, qmin=None, qmax=None):
+        self.sas_data = sas_data2d
+        self.set_data(sas_data2d)
+
+    def set_data(self, sas_data2d, qmin=None, qmax=None):
         """
             Determine the correct qx_data and qy_data within range to fit
         """
-        self.data = sans_data2d.data
-        self.err_data = sans_data2d.err_data
-        self.qx_data = sans_data2d.qx_data
-        self.qy_data = sans_data2d.qy_data
-        self.mask = sans_data2d.mask
-
-        x_max = max(math.fabs(sans_data2d.xmin), math.fabs(sans_data2d.xmax))
-        y_max = max(math.fabs(sans_data2d.ymin), math.fabs(sans_data2d.ymax))
+        self.data = sas_data2d.data
+        self.err_data = sas_data2d.err_data
+        self.qx_data = sas_data2d.qx_data
+        self.qy_data = sas_data2d.qy_data
+        self.mask = sas_data2d.mask
+
+        x_max = max(math.fabs(sas_data2d.xmin), math.fabs(sas_data2d.xmax))
+        y_max = max(math.fabs(sas_data2d.ymin), math.fabs(sas_data2d.ymax))
         
         ## fitting range
@@ -453 +453 @@
         """
         if data.__class__.__name__ == 'Data2D':
-            fitdata = FitData2D(sans_data2d=data, data=data.data,
+            fitdata = FitData2D(sas_data2d=data, data=data.data,
                                  err_data=data.err_data)
         else:
             fitdata = FitData1D(x=data.x, y=data.y,
                                  dx=data.dx, dy=data.dy, smearer=smearer)
-        fitdata.sans_data = data
+        fitdata.sas_data = data
        
         fitdata.set_fit_range(qmin=qmin, qmax=qmax)