Changeset 0008f54 in sasview

Timestamp:

Jun 14, 2012 4:22:57 PM (13 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:

fdef956

Parents:

72538fc

Message:

trying to fix test problem

Files:

• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (15 diffs)
• sansdataloader/src/sans/dataloader/data_info.py (modified) (1 diff)
• sansguiframe/src/sans/guiframe/dataFitting.py (modified) (1 diff)

calculatorview/src/sans/perspectives/calculator/model_editor.py

@@ -59 +59 @@
     def __init__(self, parent=None, base=None, id=None, title='', model_list=[], plugin_dir=None):
         """
-        Dialog window popup when selecting 'Easy Custom Sum' on the menu
+        Dialog window popup when selecting 'Easy Custom Sum/Multiply' on the menu
         """
         wx.Dialog.__init__(self, parent=parent, id=id, 
@@ -75 +75 @@
         self.model2_string = "CylinderModel"
         self._notes = ''
+        self.operator = '+'
         self._msg_box = None
         self.msg_sizer = None
@@ -89 +90 @@
         self.name_hsizer = wx.BoxSizer(wx.HORIZONTAL)
         #title name [string]
-        name_txt = wx.StaticText(self, -1, 'SumFunction Name : ')  
+        name_txt = wx.StaticText(self, -1, 'Function Name : ')  
         self.name_tcl = wx.TextCtrl(self, -1, size=(PANEL_WIDTH*3/5, -1)) 
         self.name_tcl.Bind(wx.EVT_TEXT_ENTER, self.on_change_name)
         self.name_tcl.SetValue('')
         self.name_tcl.SetFont(self.font)
-        hint_name = "Unique Sum Model Function Name."
+        hint_name = "Unique Sum/Multiply Model Function Name."
         self.name_tcl.SetToolTipString(hint_name)
         self.name_hsizer.AddMany([(name_txt, 0, wx.LEFT|wx.TOP, 10),
@@ -152 +153 @@
                                      size=(_BOX_WIDTH/2, 25))
         # Intro
-        explanation  = "  custom model = scale_factor * (model1 + model2)\n"
+        explanation  = "  custom model = scale_factor * (model1 %s model2)\n"\
+                            % self.operator
         #explanation  += "  Note: This will overwrite the previous sum model.\n"
         model_string = " Model%s (p%s):"
@@ -231 +233 @@
         if len(title) > 20:
             s_title = title[0:19] + '...'
-        self._notes = "SumModel function (%s) has been set! \n" % str(s_title)
+        self._notes = "Model function (%s) has been set! \n" % str(s_title)
         self.good_name = True
         self.on_apply(self.fname)
@@ -249 +251 @@
             self.parent.update_custom_combo()
             msg = self._notes
-            info = 'Infor'
+            info = 'Info'
             color = 'blue'
         except:
@@ -307 +309 @@
         description = self.desc_tcl.GetValue().lstrip().rstrip()
         if description == '':
-            description = name1 + "+" + name2
+            description = name1 + self.operator + name2
         name = self.name_tcl.GetValue().lstrip().rstrip()
         if name == '':
@@ -324 +326 @@
             elif line.count("self.description = '%s'"):
                 out_f.write(line % description + "\n")
-            #elif line.count("self.name = '%s'"):
-            #    out_f.write(line % name + "\n")
+            elif line.count("run") and line.count("%s"):
+                out_f.write(line % self.operator)
+            elif line.count("evalDistribution") and line.count("%s"):
+                out_f.write(line % self.operator)
             else:
                 out_f.write(line + "\n")
@@ -854 +858 @@
 """
 SUM_TEMPLATE = """
-# A sample of an experimental model function for Sum(Pmodel1,Pmodel2)
+# A sample of an experimental model function for Sum/Multiply(Pmodel1,Pmodel2)
 import copy
 from sans.models.pluginmodel import Model1DPlugin
@@ -951 +955 @@
             p1_name = name1
         name = p1_name
-        name += "+"
+        name += "%s"% (self.operator)
         p2_name = self._get_upper_name(name2)
         if not p2_name:
@@ -1024 +1028 @@
                 
     def setParam(self, name, value):
-        # set param to p1+p2 model
+        # set param to this (p1, p2) model
         self._setParamHelper(name, value)
         
@@ -1093 +1097 @@
         self._set_scale_factor()
         return self.params['scale_factor'] * \
-(self.p_model1.run(x) + self.p_model2.run(x))
+(self.p_model1.run(x) %s self.p_model2.run(x))
     
     def runXY(self, x = 0.0):
         self._set_scale_factor()
         return self.params['scale_factor'] * \
-(self.p_model1.runXY(x) + self.p_model2.runXY(x))
+(self.p_model1.runXY(x) %s self.p_model2.runXY(x))
     
     ## Now (May27,10) directly uses the model eval function 
@@ -1105 +1109 @@
         self._set_scale_factor()
         return self.params['scale_factor'] * \
-(self.p_model1.evalDistribution(x) + \
+(self.p_model1.evalDistribution(x) %s \
 self.p_model2.evalDistribution(x))
 
@@ -1126 +1130 @@
     def fill_description(self, p_model1, p_model2):
         description = ""
-        description +="This model gives the summation of  %s and %s. "% \
-( p_model1.name, p_model2.name )
+        description += "This model gives the summation or multiplication of"
+        description += "%s and %s. "% ( p_model1.name, p_model2.name )
         self.description += description
           
@@ -1149 +1153 @@
     #m2.p_model2.setParam("scale", 100)
     #m2.p_model2.setParam("rg", 100)
-    out2 = m2.p_model1.runXY(0.01) + m2.p_model2.runXY(0.01)
+    out2 = m2.p_model1.runXY(0.01) %s m2.p_model2.runXY(0.01)\n
     print out1, " = ", out2
     if out1 == out2:

sansdataloader/src/sans/dataloader/data_info.py

@@ -959 +959 @@
             dqx_data = None
             dqy_data = None
-            clone = Data2D(data, err_data, qx_data, qy_data, q_data, mask)
+            clone = Data2D(data=data, err_data=err_data, 
+                           qx_data=qx_data, qy_data=qy_data, 
+                           q_data=q_data, mask=mask)
 
         clone.title       = self.title

sansguiframe/src/sans/guiframe/dataFitting.py

@@ -304 +304 @@
     """
     def __init__(self, image=None, err_image=None,
+                 qx_data=None, qy_data=None, q_data=None, 
+                 mask=None, dqx_data=None, dqy_data=None, 
                  xmin=None, xmax=None, ymin=None, ymax=None,
-                 zmin=None, zmax=None, qx_data=None, qy_data=None,
-                 q_data=None, mask=None, dqx_data=None, dqy_data=None):
+                 zmin=None, zmax=None):
         """
         """