Changeset 4fc6dbf in sasview for sansview

Timestamp:

Sep 12, 2008 5:16:33 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:

fa5908de

Parents:

e7430b6

Message:

some mofif added

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -169 +169 @@
             selected_page.Destroy()
             self.nb.RemovePage(page_number)
-            self.name=None
-            
+            #self.name=None
+            self.fit_page_name=None
             
     def set_model_list(self,dict):

sansview/perspectives/fitting/fitting.py

@@ -49 +49 @@
         self.standalone=True
         ## Fit engine
-        self._fit_engine = 'scipy'
+        self._fit_engine = 'park'
         # Log startup
         logging.info("Fitting plug-in started")   
@@ -196 +196 @@
         """
         #print "fitting: split :went here" 
-        
         if string.find(item,".")!=-1:
             param_names= re.split("\.",item)
@@ -268 +267 @@
              wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
             
-     
-    def _completed(self,result,pars,current_pg, elapsed):
-        """
-            Method called with the results when the inversion
-            is done
-            
-            @param out: output coefficient for the base functions
-            @param cov: covariance matrix
-            @param pr: Invertor instance
-            @param elapsed: time spent computing
-        """
-       
-        # Save useful info
-        self.elapsed = elapsed
-        # Keep a copy of the last result
-        self._last_out = result.pvec
-        self._last_cov = result.cov
-        self._last_chisqr=result.fitness
-        #print "fitting: initial parameter ",pars
-        #result=self.fitter.fit(qmin,qmax)
-        
-        #print "fitting : result",result,result.pvec,result.cov,result.fitness
-        i = 0
-        for name in pars:
-            if result.pvec.__class__==numpy.float64:
-                model.model.setParam(name,result.pvec)
-            else:
-                model.model.setParam(name,result.pvec[i])
-                #print "fitting: i name out[i]", i,name,float(result.pvec[i])
-                i += 1
-        new_cov=[]
-        if result.cov !=None:
-             for j in range(len(result.cov)):
-                 new_cov.append(result.cov[j][j])  
-        else:
-            new_cov=None
-        current_pg.onsetValues(result.fitness, result.pvec,new_cov)
-        self.plot_helper(currpage=current_pg,qmin=qmin,qmax=qmax)
- 
-        
+    
     def _on_single_fit(self,id=None,qmin=None,qmax=None):
         """