Changeset 8f83c90d in sasview

Timestamp:

Feb 24, 2009 2:59: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:

08895c5

Parents:

949c7b2

Message:

fixed bug on fitting for data with dy=0

File:

• sansview/perspectives/fitting/fitting.py (modified) (5 diffs)

sansview/perspectives/fitting/fitting.py

@@ -9 +9 @@
 from sans.guicomm.events import EVT_SLICER_PANEL,EVT_MODEL2D_PANEL,ERR_DATA
 
-from sans.fit.AbstractFitEngine import Model,Data,FitData1D,FitData2D
+from sans.fit.AbstractFitEngine import Model,FitData1D,FitData2D#,Data,
 from fitproblem import FitProblem
 from fitpanel import FitPanel
@@ -349 +349 @@
                     break
             i = 0
-            print "single-->result",pars,cpage,str(result),result.parameters,result.fitness,result.stderr
-            #print "fitting: single fit pars ", pars
+          
             for name in pars:
                 if result.pvec.__class__==numpy.float64:
@@ -361 +360 @@
             print "fitting result : pvec",result.pvec
             print "fitting result : stderr",result.stderr
-            print "qmin qmax xmin xmax ymin , ymax",qmin, qmax,xmin, xmax ,ymin, ymax
-            
+           
             cpage.onsetValues(result.fitness, result.pvec,result.stderr)
             #title="Fitted model 2D "
@@ -454 +452 @@
             model = list[0]
             smearer= value.get_smearer()
-            print "single fit", model, smearer
+           
+    
             #Create list of parameters for fitting used
             
@@ -464 +463 @@
                     pars.append(str(element[0].GetLabelText()))
                 pars.sort()
-                print "single fit start pars:", pars
                 #Do the single fit
                 self.fitter.set_model(Model(model), self.fit_id, pars) 
                 #print "args...:",metadata,self.fit_id,smearer,qmin,qmax,ymin,ymax
-              
+                dy=[]
+                x=[]
+                y=[]
+                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,