Changeset aed7c57 in sasview

Timestamp:

Mar 26, 2009 5:51:22 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

24cab5d

Parents:

1f57dfd

Message:

change parameter status on parkFit park_integration

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (4 diffs)
• ParkFitting.py (modified) (2 diffs)

park_integration/AbstractFitEngine.py

@@ -248 +248 @@
         
         # Smear theory data
+     
         if self.smearer is not None:
             fx = self.smearer(fx)
@@ -446 +447 @@
                 raise ValueError, "AbstractFitEngine: Specify parameters to fit"
             else:
+                temp=[]
                 for item in pars:
                     if item in model.model.getParamList():
+                        temp.append(item)
                         self.paramList.append(item)
                     else:
@@ -456 +459 @@
             if self.fitArrangeDict.has_key(Uid):
                 self.fitArrangeDict[Uid].set_model(model)
+                self.fitArrangeDict[Uid].pars= pars
             else:
             #no fitArrange object has been create with this Uid
                 fitproblem = FitArrange()
                 fitproblem.set_model(model)
+                fitproblem.pars= pars
                 self.fitArrangeDict[Uid] = fitproblem
+                
         else:
             raise ValueError, "park_integration:missing parameters"
@@ -530 +536 @@
         self.model = None
         self.dList =[]
+        self.pars=[]
         #self.selected  is zero when this fit problem is not schedule to fit 
         #self.selected is 1 when schedule to fit 

park_integration/ParkFitting.py

@@ -69 +69 @@
             parkmodel = item.get_model()
             for p in parkmodel.parameterset:
-                if p._getname()in self.paramList and not p.iscomputed():
-                    p.status = 'fitted' # make it a fitted parameter
-                            #iscomputed  paramter with string inside
-               
+                
+                if p.status!= 'computed':
+                    if p._getname()in item.pars:
+                        
+                        p.status = 'fitted' # make it a fitted parameter
+                                #iscomputed  paramter with string inside
+                    else:
+                        p.status= 'fixed'
+             
             i+=1
             Ldata=item.get_data()
@@ -107 +112 @@
         fitter = FitMC(localfit=localfit, start_points=1)
         if handler == None:
-            #print "no handler"
             handler= fitresult.ConsoleUpdate(improvement_delta=0.1)
-        #print "park handler", handler
-       
+      
             
         result = fit.fit(self.problem,