Changeset dfb58f8 in sasview

Timestamp:

May 23, 2008 8:56:21 AM (17 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)

Location:

prview/perspectives/pr

Files:

• inversion_panel.py (modified) (7 diffs)
• pr.py (modified) (5 diffs)
• requirements.txt (modified) (1 diff)

prview/perspectives/pr/inversion_panel.py

@@ -105 +105 @@
     
     # Figure of merit parameters [default]
+    
+    ## Oscillation parameters (sin function = 1.1)
     oscillation_max = 1.5
+    
+    ## Fraction of P(r) that is positive 
+    positive = 1.0
+    
+    ## Fraction of P(r) that is greater than zero by more than 1 sigma
+    pos_err  = 1.0
     
     def __init__(self, parent, id = -1, plots = None, **kwargs):
@@ -127 +135 @@
         self.qmin_ctl = None
         self.qmax_ctl = None
+        
+        # TextCtrl for fraction of positive P(r)
+        self.pos_ctl = None
+        
+        # TextCtrl for fraction of 1 sigma positive P(r)
+        self.pos_err_ctl = None 
         
         ## Estimates
@@ -156 +170 @@
         elif name=='oscillation':
             self.osc_ctl.SetValue("%-5.2g" % value)
+        elif name=='positive':
+            self.pos_ctl.SetValue("%-5.2g" % value)
+        elif name=='pos_err':
+            self.pos_err_ctl.SetValue("%-5.2g" % value)
         elif name=='alpha_estimate':
             self.alpha_estimate_ctl.SetToolTipString("Click to accept value.")
@@ -189 +207 @@
         elif name=='oscillation':
             self.osc_ctl.GetValue()
+        elif name=='pos':
+            self.pos_ctl.GetValue()
+        elif name=='pos_err':
+            self.pos_err_ctl.GetValue()
         elif name=='alpha_estimate':
             self.alpha_estimate_ctl.GetValue()
@@ -330 +352 @@
         label_chi2 = wx.StaticText(self, -1, "Chi2/dof")
         label_osc = wx.StaticText(self, -1, "Oscillations")
+        label_pos = wx.StaticText(self, -1, "Positive fraction")
+        label_pos_err = wx.StaticText(self, -1, "1-sigma positive fraction")
         
         self.time_ctl = wx.TextCtrl(self, -1, size=(60,20))
@@ -339 +363 @@
         self.chi2_ctl.SetToolTipString("Chi^2 over degrees of freedom.")
         
+        # Oscillation parameter
         self.osc_ctl = wx.TextCtrl(self, -1, size=(60,20))
         self.osc_ctl.SetEditable(False)
         self.osc_ctl.SetToolTipString("Oscillation parameter. P(r) for a sphere has an oscillation parameter of 1.1.")
+        
+        # Positive fraction figure of merit
+        self.pos_ctl = wx.TextCtrl(self, -1, size=(60,20))
+        self.pos_ctl.SetEditable(False)
+        self.pos_ctl.SetToolTipString("Fraction of P(r) that is positive. Theoretically, P(r) is defined positive.")
+        
+        # 1-simga positive fraction figure of merit
+        self.pos_err_ctl = wx.TextCtrl(self, -1, size=(60,20))
+        self.pos_err_ctl.SetEditable(False)
+        message  = "Fraction of P(r) that is at least 1 standard deviation greater than zero.\n"
+        message += "This figure of merit tells you about the size of the P(r) errors.\n"
+        message += "If it is close to 1 and the other figures of merit are bad, consider changing "
+        message += "the maximum distance."
+        self.pos_err_ctl.SetToolTipString(message)
         
         sizer_res = wx.GridBagSizer(5,5)
@@ -355 +394 @@
         sizer_res.Add(label_osc, (iy,0), (1,1), wx.LEFT|wx.EXPAND, 15)
         sizer_res.Add(self.osc_ctl,   (iy,1), (1,1), wx.RIGHT|wx.EXPAND, 15)
+
+        iy += 1
+        sizer_res.Add(label_pos, (iy,0), (1,1), wx.LEFT|wx.EXPAND, 15)
+        sizer_res.Add(self.pos_ctl,   (iy,1), (1,1), wx.RIGHT|wx.EXPAND, 15)
+
+        iy += 1
+        sizer_res.Add(label_pos_err, (iy,0), (1,1), wx.LEFT|wx.EXPAND, 15)
+        sizer_res.Add(self.pos_err_ctl,   (iy,1), (1,1), wx.RIGHT|wx.EXPAND, 15)
 
         ressizer.Add(sizer_res, 0)

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

prview/perspectives/pr/requirements.txt

@@ -22 +22 @@
 18. Clean up
 19. Replace help dialog text with a nice image. Mention how to choose alpha and what the suggested alpha means.
+20. If a figure of merit is clearly bad, put its background red