Changeset fd5ac0d in sasview for src/sas/perspectives/fitting/fitting.py

Timestamp:

Feb 13, 2015 5: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/perspectives/fitting/fitting.py (modified) (5 diffs)

src/sas/perspectives/fitting/fitting.py

@@ -51 +51 @@
 
 MAX_NBR_DATA = 4
-SANS_F_TOL = 5e-05
+SAS_F_TOL = 5e-05
 
 (PageInfoEvent, EVT_PAGE_INFO) = wx.lib.newevent.NewEvent()
@@ -94 +94 @@
         self._gui_engine = None
         ## Relative error desired in the sum of squares (float); scipy only
-        self.ftol = SANS_F_TOL
+        self.ftol = SAS_F_TOL
         self.batch_reset_flag = True
         #List of selected data
@@ -291 +291 @@
                 msg += "Please manually remove the files (.py, .pyc) "
                 msg += "in the 'plugin_models' folder \n"
-                msg += "inside of the SansView application, "
+                msg += "inside of the SasView application, "
                 msg += "and try it again."
                 wx.MessageBox(msg, 'Info')
@@ -817 +817 @@
         except:
             # default
-            f_tol = SANS_F_TOL
+            f_tol = SAS_F_TOL
             
         self.ftol = f_tol
@@ -1373 +1373 @@
                 if model is not None and hasattr(model, "model"):
                     model = model.model
-                if data is not None and hasattr(data, "sans_data"):
-                    data = data.sans_data
+                if data is not None and hasattr(data, "sas_data"):
+                    data = data.sas_data
                 
                 is_data2d = issubclass(data.__class__, Data2D)