Changeset fb7180c in sasview for src/sans

Timestamp:

May 7, 2014 6:50:18 PM (11 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

Location:

src/sans

Files:

• fit/AbstractFitEngine.py (modified) (3 diffs)
• fit/BumpsFitting.py (modified) (1 diff)
• fit/ParkFitting.py (modified) (4 diffs)
• perspectives/fitting/simfitpage.py (modified) (1 diff)

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

src/sans/fit/BumpsFitting.py

@@ -182 +182 @@
         """
         # Note: technically, unbounded fitters and unmonitored fitters are
-        self.setp(x)
+        self.setp(p)
 
         # Compute penalty for being out of bounds which increases the farther

src/sans/fit/ParkFitting.py

@@ -122 +122 @@
         """
         list_params = []
-        self.pars = []
         self.pars = fitparams
         for item in fitparams:
@@ -501 +500 @@
             if fproblem.get_to_fit() == 1:
                 fitproblems.append(fproblem)
-        if len(fitproblems) == 0: 
+        if len(fitproblems) == 0:
             raise RuntimeError, "No Assembly scheduled for Park fitting."
-            return
         for item in fitproblems:
             model = item.get_model()
@@ -512 +510 @@
                     ind = item.pars.index(name)
                     parkmodel.model.setParam(name, item.vals[ind])
+
+            # set the constraints into the model
+            for p,v in model.constraints:
+                parkmodel.parameterset[str(p)].set(str(v))
             
             for p in parkmodel.parameterset:
                 ## does not allow status change for constraint parameters
                 if p.status != 'computed':
-                    if p.get_name()in item.pars:
+                    if p.get_name() in item.pars:
                         ## make parameters selected for 
                         #fit will be between boundaries
@@ -583 +585 @@
             if result is not None:
                 for p in result.parameters:
-                    if p.data.name == small_result.data.name and \
-                            p.model.name == small_result.model.name:
+                    #if p.data.name == small_result.data.name and
+                    if p.model.name == small_result.model.name:
                         small_result.index = m.data.idx
                         small_result.fitness = result.fitness

src/sans/perspectives/fitting/simfitpage.py

@@ -378 +378 @@
         box_description = wx.StaticBox(self, -1,"Easy Setup ")
         boxsizer = wx.StaticBoxSizer(box_description, wx.HORIZONTAL)     
-        sizer_constraint = wx.BoxSizer(wx.HORIZONTAL|wx.LEFT|wx.RIGHT|wx.EXPAND)
+        sizer_constraint = wx.BoxSizer(wx.HORIZONTAL)
         self.model_cbox_left = wx.ComboBox(self, -1, style=wx.CB_READONLY)
         self.model_cbox_left.Clear()