Changes in / [316b9c1:1270e3c] in sasview

Files:

• src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (10 diffs)
• src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) (2 diffs)
• test/corfunc/test/utest_corfunc.py (modified) (1 diff)

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -663 +663 @@
         Do the layout for parameter related widgets
         """
-        param_txt = wx.StaticText(self, -1, 'Fit Parameters: ')
-
-        param_tip = "#Set the parameters and their initial values.\n"
+        param_txt = wx.StaticText(self, -1, 'Fit Parameters NOT requiring' + \
+                                  ' polydispersity (if any): ')
+
+        param_tip = "#Set the parameters NOT requiring polydispersity " + \
+        "and their initial values.\n"
         param_tip += "#Example:\n"
         param_tip += "A = 1\nB = 1"
@@ -679 +681 @@
                                   (self.param_tcl, 1, wx.EXPAND | wx.ALL, 10)])
 
+        # Parameters with polydispersity
+        pd_param_txt = wx.StaticText(self, -1, 'Fit Parameters requiring ' + \
+                                     'polydispersity (if any): ')
+
+        pd_param_tip = "#Set the parameters requiring polydispersity and " + \
+        "their initial values.\n"
+        pd_param_tip += "#Example:\n"
+        pd_param_tip += "C = 2\nD = 2"
+        newid = wx.NewId()
+        self.pd_param_tcl = EditWindow(self, newid, wx.DefaultPosition,
+                                    wx.DefaultSize,
+                                    wx.CLIP_CHILDREN | wx.SUNKEN_BORDER)
+        self.pd_param_tcl.setDisplayLineNumbers(True)
+        self.pd_param_tcl.SetToolTipString(pd_param_tip)
+
+        self.param_sizer.AddMany([(pd_param_txt, 0, wx.LEFT, 10),
+                                  (self.pd_param_tcl, 1, wx.EXPAND | wx.ALL, 10)])
 
     def _layout_function(self):
@@ -880 +899 @@
             description = self.desc_tcl.GetValue()
             param_str = self.param_tcl.GetText()
+            pd_param_str = self.pd_param_tcl.GetText()
             func_str = self.function_tcl.GetText()
             # No input for the model function
@@ -885 +905 @@
                 if func_str.count('return') > 0:
                     self.write_file(self.fname, name, description, param_str,
-                                    func_str)
+                                    pd_param_str, func_str)
                     try:
                         result, msg = check_model(self.fname), None
@@ -925 +945 @@
         self.warning = msg
 
-    def write_file(self, fname, name, desc_str, param_str, func_str):
+    def write_file(self, fname, name, desc_str, param_str, pd_param_str, func_str):
         """
         Write content in file
@@ -932 +952 @@
         :param desc_str: content of the description strings
         :param param_str: content of params; Strings
+        :param pd_param_str: content of params requiring polydispersity; Strings
         :param func_str: content of func; Strings
         """
@@ -945 +966 @@
         # Write out parameters
         param_names = []    # to store parameter names
+        pd_params = []
         out_f.write('parameters = [ \n')
         out_f.write('#   ["name", "units", default, [lower, upper], "type", "description"],\n')
@@ -951 +973 @@
             out_f.write("    ['%s', '', %s, [-inf, inf], '', '%s'],\n"
                         % (pname, pvalue, desc))
+        for pname, pvalue, desc in self.get_param_helper(pd_param_str):
+            param_names.append(pname)
+            pd_params.append(pname)
+            out_f.write("    ['%s', '', %s, [-inf, inf], 'volume', '%s'],\n"
+                        % (pname, pvalue, desc))
         out_f.write('    ]\n')
 
         # Write out function definition
-        out_f.write('\n')
         out_f.write('def Iq(%s):\n' % ', '.join(['x'] + param_names))
         out_f.write('    """Absolute scattering"""\n')
@@ -964 +990 @@
             out_f.write('    import numpy as np')
         for func_line in func_str.split('\n'):
-            out_f.write('%s%s\n' % ('    ', func_line))
+            out_f.write('%s%s\n' % (spaces4, func_line))
         out_f.write('## uncomment the following if Iq works for vector x\n')
         out_f.write('#Iq.vectorized = True\n')
+
+        # If polydisperse, create place holders for form_volume, ER and VR
+        if pd_params:
+            out_f.write('\n')
+            out_f.write(CUSTOM_TEMPLATE_PD % {'args': ', '.join(pd_params)})
 
         # Create place holder for Iqxy
@@ -1097 +1128 @@
 description = """%(description)s"""
 
+'''
+
+CUSTOM_TEMPLATE_PD = '''\
+def form_volume(%(args)s):
+    """
+    Volume of the particles used to compute absolute scattering intensity
+    and to weight polydisperse parameter contributions.
+    """
+    return 0.0
+
+def ER(%(args)s):
+    """
+    Effective radius of particles to be used when computing structure factors.
+
+    Input parameters are vectors ranging over the mesh of polydispersity values.
+    """
+    return 0.0
+
+def VR(%(args)s):
+    """
+    Volume ratio of particles to be used when computing structure factors.
+
+    Input parameters are vectors ranging over the mesh of polydispersity values.
+    """
+    return 1.0
 '''
 

src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

@@ -180 +180 @@
 *checked*\ .
 
+Also note that the 'Fit Parameters' have been split into two sections: those
+which can be polydisperse (shape and orientation parameters) and those which are
+not (eg, scattering length densities).
+
 A model file generated by this option can be viewed and further modified using
 the :ref:`Advanced_Plugin_Editor` .
 
-Note that the New Plugin Model Feature currently does not allow for parameters
-to be polydisperse.  However they can be edited in the Advanced Editor.
-
-
-**SasView version 4.2** made it possible to specify whether a plugin created
-with the *New Plugin Model* dialog is actually a form factor P(Q) or a structure
-factor S(Q). To do this, simply add one or other of the following lines under
-the *import* statements.
+**SasView version 4.2** made it possible to specify whether a plugin created with
+the *New Plugin Model* dialog is actually a form factor P(Q) or a structure factor
+S(Q). To do this, simply add one or other of the following lines under the *import*
+statements.
 
 For a form factor::
@@ -200 +200 @@
      structure_factor = True
 
-If the plugin is a structure factor it is *also* necessary to add two variables
-to the parameter list::
+If the plugin is a structure factor it is *also* necessary to add two variables to
+the parameter list::
 
      parameters = [

test/corfunc/test/utest_corfunc.py

@@ -74 +74 @@
         while True:
             time.sleep(0.001)
-            if (not self.calculator.transform_isrunning() and
-                self.transformation is not None):
+            if not self.calculator.transform_isrunning():
                 break
 
-        transform1, transform3, idf = self.transformation
+    def transform_callback(self, transforms):
+        transform1, transform3, idf = transforms
         self.assertIsNotNone(transform1)
         self.assertAlmostEqual(transform1.y[0], 1)
         self.assertAlmostEqual(transform1.y[-1], 0, 5)
-
-    def transform_callback(self, transforms):
         self.transformation = transforms