Changeset 345e7e4 in sasview for src/sas/sascalc/fit

Timestamp:

Dec 19, 2016 7:23:36 AM (8 years ago)

Author:

GitHub <noreply@…>

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:

b61bd57

Parents:

f2724b6

git-author:

jhbakker <j.h.bakker@…> (12/19/16 07:23:36)

git-committer:

GitHub <noreply@…> (12/19/16 07:23:36)

Message:

Revert "Jurtest2"

Location:

src/sas/sascalc/fit

Files:

• AbstractFitEngine.py (modified) (2 diffs)
• BumpsFitting.py (modified) (1 diff)

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, lam=None, dlam=None):
+    def __init__(self, x, y, dx=None, dy=None, smearer=None, data=None):
         """
             :param smearer: is an object of class QSmearer or SlitSmearer
@@ -152 +152 @@
                 
         """
-        Data1D.__init__(self, x=x, y=y, dx=dx, dy=dy, lam=lam,dlam=dlam)
+        Data1D.__init__(self, x=x, y=y, dx=dx, dy=dy)
         self.num_points = len(x)
         self.sas_data = data

src/sas/sascalc/fit/BumpsFitting.py

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