Changeset fb7180c in sasview for src/sans/fit/AbstractFitEngine.py

Timestamp:

May 7, 2014 6:50:18 PM (10 years ago)

Author:

pkienzle

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:

e544c84

Parents:

f121904

Message:

enable park constrained fit test

File:

• src/sans/fit/AbstractFitEngine.py (modified) (3 diffs)

src/sans/fit/AbstractFitEngine.py

@@ -428 +428 @@
 
         sasmodel = model.model
-        if len(constraints) > 0:
-            for constraint in constraints:
-                name, value = constraint
-                try:
-                    model.parameterset[str(name)].set(str(value))
-                except:
-                    msg = "Fit Engine: Error occurs when setting the constraint"
-                    msg += " %s for parameter %s " % (value, name)
-                    raise ValueError, msg
-                
+        model.constraints = constraints
+
         if len(pars) > 0:
             temp = []
@@ -610 +602 @@
     def __init__(self, model=None, param_list=None, data=None):
         self.calls = None
-        self.pars = []
         self.fitness = None
         self.chisqr = None
@@ -621 +612 @@
         self.residuals = []
         self.index = []
-        self.parameters = None
         self.model = model
         self.data = data