Changeset d7b7156 in sasview for theoryview/perspectives/theory

Timestamp:

Oct 22, 2010 5:51:22 PM (14 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:

7406040

Parents:

4628e31

Message:

updated the titles of polydisp. and params due to the changes of unit

File:

• theoryview/perspectives/theory/model_panel.py (modified) (8 diffs)

theoryview/perspectives/theory/model_panel.py

@@ -168 +168 @@
                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
         ix += 1 
-        values = wx.StaticText(self, -1, 'Sigma (STD)')
-        values.SetToolTipString("Polydispersity multiplied by the value of the original parameter.")
-        self.sizer4_4.Add(values,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        values = wx.StaticText(self, -1, 'Sigma [A]')
+        values.SetToolTipString(\
+        "Sigma(STD) in the A unit; the standard deviation from the mean value.")
+
+        self.sizer4_4.Add(values,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 
+                          0)
        
         ix += 1 
         npts = wx.StaticText(self, -1, 'Npts')
-        npts.SetToolTipString("Number of points for weighting.")
+        npts.SetToolTipString("Number of sampling points for the numerical\n\
+        integration over the distribution function.")
         self.sizer4_4.Add(npts,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         ix += 1 
         nsigmas = wx.StaticText(self, -1, 'Nsigmas')
-        nsigmas.SetToolTipString("Number of sigmas between which the range of the distribution function will be used for weighting. The value '3' covers 99.5% for Gaussian distribution function.")
-        self.sizer4_4.Add(nsigmas,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-        
+        nsigmas.SetToolTipString("   Number of sigmas between which the range\n\
+         of the distribution function will be used for weighting. \n\
+        The value '3' covers 99.5% for Gaussian distribution \n\
+        function.")
+        self.sizer4_4.Add(nsigmas,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE,
+                           0)
+         
         for item in self.model.dispersion.keys():
             if not item in self.model.orientation_params:
                 self.disp_cb_dict[item]= None
+                name0="Distribution of " + item
                 name1=item+".width"
                 name2=item+".npts"
@@ -191 +200 @@
                     if p=="width":
                         ix = 0
-                        name = wx.StaticText(self, -1,  name1)
+                        name = wx.StaticText(self, -1,  name0)
                         self.sizer4_4.Add( name,( iy, ix),(1,1),  
                                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
@@ -198 +207 @@
                         ctl1 = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
                                             style=wx.TE_PROCESS_ENTER)
-                        ctl1.SetToolTipString("Polydispersity multiplied by the value of the '%s'."%item)
+                        ctl1.SetToolTipString("Absolute Sigma: \n\
+                        1) It is the STD (ratio*mean) of '%s' distribution.\n \
+                        2) It should not exceed Mean/(2*Nsigmas)." %item)
                         ctl1.SetValue(str (format_number(value)))
                         self.sizer4_4.Add(ctl1, (iy,ix),(1,1), wx.EXPAND)
@@ -228 +239 @@
                             self.fixed_param.append([None,name3, Tctl2,
                                                      None,None, None, None,None])
+        first_orient  = True
         for item in self.model.dispersion.keys():
             if item in self.model.orientation_params:
                 self.disp_cb_dict[item]= None
+                name0="Distribution of " + item
                 name1=item+".width"
                 name2=item+".npts"
@@ -238 +251 @@
                     if p=="width":
                         ix = 0
-                        name = wx.StaticText(self, -1,  name1)
+                        name = wx.StaticText(self, -1,  name0)
                         self.sizer4_4.Add( name,( iy, ix),(1,1),  
                                            wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
@@ -249 +262 @@
                         ctl1 = self.ModelTextCtrl(self, -1, size=(_BOX_WIDTH,20),
                                             style=wx.TE_PROCESS_ENTER)
-                        ctl1.SetToolTipString("Polydispersity multiplied by the value of '%s'."%item)
+                        ctl1.SetToolTipString("Absolute Sigma: \n\
+                        1) It is the STD (ratio*mean) of '%s' distribution."% \
+                        item)
                         ctl1.SetValue(str (format_number(value)))
                         if not self.enable2D:
@@ -255 +270 @@
                             ctl1.Disable()
                         else:
+                            # in the case of 2D and angle parameter
+                            if first_orient:
+                                values.SetLabel('Sigma [A (or deg)]')
+                                values.SetToolTipString(\
+                                "Sigma(STD) in the A or deg(for angles) unit;\n\
+                                the standard deviation from the mean value.")
+                                first_orient = False 
                             ctl1.Show(True)
                             ctl1.Enable()
@@ -303 +325 @@
                             self.orientation_params_disp.append([None,name3, Tctl2,
                                                      None,None, None, None,None])
-            
+          
         msg = " Selected Distribution: Gaussian"        
         wx.PostEvent(self.parent, StatusEvent( status= msg ))