Changeset 24cab5d in sasview for sansview/perspectives

Timestamp:

Mar 26, 2009 7:53:12 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:

8f90cfd

Parents:

aed7c57

Message:

simultaneous fit result parameters change

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• fitting.py (modified) (5 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -420 +420 @@
         
         self.sizer3.Layout()
-        self.sizer4_4.Layout()
+        #self.sizer4_4.Layout()
         self.sizer4.Layout()
         self.SetScrollbars(20,20,200,100)

sansview/perspectives/fitting/fitting.py

@@ -452 +452 @@
                             if param_value !=None and param_name != None:
                                 new_model.parameterset[ param_name].set( param_value )
-                
                     self.fitter.set_model(model= new_model, Uid=self.fit_id, pars=pars) 
                     ## check that non -zero value are send as dy in the fit engine
@@ -564 +563 @@
                            qstep=qstep)
           
-    def _fit_helper(self, page, id ):
+    def _fit_helper(self,current_pg, id ):
         """
             helper for fitting
@@ -574 +573 @@
         self.fit_id = id
         page_fitted = None
-        
-        
+        pars=[]   
+        value = self.page_finder[current_pg]
+        metadata =  value.get_fit_data()
+        model = value.get_model()
+        smearer = value.get_smearer()
+       
+        #Create list of parameters for fitting used
+        templist=[]
+        try:
+            ## get the list of parameter names to fit
+            templist = current_pg.get_param_list()
+        
+            for element in templist:
+                pars.append(str(element[1]))
+
+            pars.sort()
+            ## create a park model and reset parameter value if constraint
+            ## is given
+            new_model = Model(model)
+            param = value.get_model_param()
+            if len(param)>0:
+                for item in param:
+                    param_value = item[1]
+                    param_name = item[0]
+                    ## check if constraint
+                    if param_value !=None and param_name != None:
+                        new_model.parameterset[ param_name].set( param_value )
+        
+            #Do the single fit
+            self.fitter.set_model(new_model, self.fit_id, pars)
+            dy=[]
+            x=[]
+            y=[]
+            ## checking the validity of error
+            if metadata.__class__ in  ["Data1D","Theory1D"]:
+                for i in range(len(metadata.dy)):
+                    if metadata.dy[i] !=0:
+                        dy.append(metadata.dy[i])
+                        x.append(metadata.x[i])
+                        y.append(metadata.y[i])
+                if len(dy)>0:        
+                    metadata.dy=numpy.zeros(len(dy))
+                    metadata.dy=dy
+                    metadata.y=numpy.zeros(len(y))
+                    metadata.y=y
+                    metadata.x=numpy.zeros(len(x))
+                    metadata.x=x
+           
+            self.fitter.set_data(data=metadata,Uid=self.fit_id,
+                                 smearer=smearer,qmin= qmin,qmax=qmax )
+            
+            self.fitter.select_problem_for_fit(Uid= self.fit_id,
+                                               value= value.get_scheduled())
+            page_fitted=current_pg
+           
+        except:
+            msg= "Single Fit error: %s" % sys.exc_value
+            wx.PostEvent(self.parent, StatusEvent(status= msg ))
+            return
        
     def _onSelect(self,event):
@@ -679 +735 @@
             wx.PostEvent(self.parent, StatusEvent(status="Simultaneous fit \
             complete ", type="stop"))
+           
             ## fit more than 1 model at the same time 
             try:
@@ -692 +749 @@
                             model_name,param_name = self.split_string(p.name)  
                             if model.name == model_name:
-                                small_out.append(p.value )
-                                if p.stderr==None:
-                                    p.stderr=numpy.nan
-                                small_cov.append(p.stderr)
-                                model.setParam(param_name,p.value)  
+                                p_name= model.name+"."+param_name
+                                if p.name == p_name:
+                                    small_out.append(p.value )
+                                    model.setParam(param_name,p.value) 
+                                    if p.stderr==None:
+                                        p.stderr=numpy.nan
+                                        small_cov.append(p.stderr)
+                                       
+                                    else:
+                                        small_cov.append(p.stderr)
+                                else:
+                                    value= model.getParam(param_name)
+                                    small_out.append(value )
+                                    small_cov.append(numpy.nan)
                                 
                         # Display result on each page