Changeset 1374fbe4 in sasview for sansview

Timestamp:

Feb 2, 2009 10:59:43 AM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

00d083c

Parents:

c80c06f

Message:

Fixed mis-representation of 2d fit-model image after loading 2d data.

File:

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

sansview/perspectives/fitting/fitting.py

@@ -320 +320 @@
                         if model.name == model_name:
                             small_out.append(p.value )
-                            small_cov.append(p.stderr)
+                            if p.stderr ==None:
+                                small_cov.append(0)
+                            else:
+                                small_cov.append(p.stderr)
                             model.setParam(param_name,p.value)  
                     # Display result on each page 
@@ -635 +638 @@
                     
                 theory.data = numpy.zeros((len(data.y_bins),len(data.x_bins)))
-                for i in range(len(data.y_bins)):
-                    if data.y_bins[i]>= ymin and data.y_bins[i]<= ymax:
-                        for j in range(len(data.x_bins)):
-                            if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
-                                theory.data[j][i]=model.runXY([data.x_bins[j],data.y_bins[i]])
-               
+                for i in range(len(data.x_bins)):
+                    if data.x_bins[i]>= qmin and data.x_bins[i]<= qmax:
+                        for j in range(len(data.y_bins)):
+                            if data.y_bins[j]>= ymin and data.y_bins[j]<= ymax:
+                                theory.data[j][i]=model.runXY([data.x_bins[i],data.y_bins[j]])
+
                 #print "fitting : plot_helper:", theory.image
                 #print data.image
@@ -738 +741 @@
     
     def complete(self, output, elapsed, model, qmin, qmax,qstep=DEFAULT_NPTS):
-       
+  
         wx.PostEvent(self.parent, StatusEvent(status="Calc \
         complete in %g sec" % elapsed))