Changeset dfb58f8 in sasview for prview/perspectives/pr/pr.py

Timestamp:

May 23, 2008 10:56:21 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

f24b8f4

Parents:

43c0a8e

Message:

Add a couple of figures of merit (GUI)

File:

• prview/perspectives/pr/pr.py (modified) (5 diffs)

prview/perspectives/pr/pr.py

@@ -218 +218 @@
 
         sum = 0.0
+        cov2 = numpy.ascontiguousarray(cov)
+        
         for i in range(len(x)):
-            if cov==None:
+            if cov2==None:
                 value = pr.pr(out, x[i])
             else:
-                (value, dy[i]) = pr.pr_err(out, cov, x[i])
+                (value, dy[i]) = pr.pr_err(out, cov2, x[i])
             sum += value
             y[i] = value
@@ -229 +231 @@
         dy = dy/sum*pr.d_max/len(x)
         
-        if cov==None:
+        if cov2==None:
             new_plot = Theory1D(x, y)
         else:
@@ -337 +339 @@
             @param elapsed: time spent computing
         """
+        from copy import deepcopy
         # Save useful info
         self.elapsed = elapsed
         message = "Computation completed in %g seconds [chi2=%g]" % (elapsed, pr.chi2)
         wx.PostEvent(self.parent, StatusEvent(status=message))
+
+        cov = numpy.ascontiguousarray(cov)
 
         # Show result on control panel
@@ -347 +352 @@
         self.control_panel.oscillation = pr.oscillations(out)
         #print "OSCILL", pr.oscillations(out)
-        print "PEAKS:", pr.get_peaks(out)
+        print "PEAKS:", pr.get_peaks(out) 
+        self.control_panel.positive = pr.get_positive(out)
+        self.control_panel.pos_err  = pr.get_pos_err(out, cov)
         
         for i in range(len(out)):
@@ -367 +374 @@
         
         # Show P(r) fit
-        x_values, x_range = self.show_pr(out, self.pr)  
+        x_values, x_range = self.show_pr(out, self.pr, cov)  
         
         # Popup result panel