Changeset 6e659ae8 in sasview

Timestamp:

Feb 25, 2009 8:51:39 AM (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:

1a6ec25

Parents:

2fe03d5

Message:

fix a small bug on fitting with error zero

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (1 diff)
• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -30 +30 @@
     def __init__(self, parent,data, *args, **kwargs):
         wx.ScrolledWindow.__init__(self, parent, *args, **kwargs)
+        
         """ 
             Initialization of the Panel

sansview/perspectives/fitting/fitpanel.py

@@ -104 +104 @@
         except:
             name = 'Fit'
-        flag2=self.draw_model_name !=name
-        flag= ((self.draw_model_name ==name) and (data.__class__.__name__ is "Data2D"))or\
-        (self.draw_model_name !=name)
+        
         #if self.fit_page_name != name and self.draw_model_name !=name:
-        if not name in self.fit_page_name  and flag :
+        if not name in self.fit_page_name :
             #self.about_page.Disable()
             from fitpage1D import FitPage1D

sansview/perspectives/fitting/fitting.py

@@ -469 +469 @@
                 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
+                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,
@@ -573 +574 @@
                     self.fitter.set_model(new_model, self.fit_id, pars) 
                     print "sim-->model",metadata,model,self.fit_id, pars
-                    #self.fitter.set_model(Model(model), self.fit_id, pars) 
+                    dy=[]
+                    x=[]
+                    y=[]
+                    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(metadata,self.fit_id,qmin,qmax,ymin,ymax)
                     print "sim---->value of problem",value.get_scheduled()