Changeset d83549c in sasview

Timestamp:

Jan 17, 2012 8:05:37 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:

530cc84

Parents:

a8db60c

Message:

added reasonable custom 2d

Files:

• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (7 diffs)
• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (1 diff)

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

@@ -221 +221 @@
         self.name = 'untitled'
         self.overwrite_name = True
+        self.is_2d = False
         self.fname = None
         self.param_strings = ''
@@ -472 +473 @@
         lines = CUSTOM_TEMPLATE.split('\n')
         has_scipy = func_str.count("scipy.")
+        self.is_2d = func_str.count("#self.ndim = 2")
+        line_2d = ''
+        if self.is_2d:
+            line_2d = CUSTOM_2D_TEMP.split('\n')
+        line_test = TEST_TEMPLATE.split('\n')
         local_params = ''
         spaces = '        '#8spaces
+        # write function here
         for line in lines:
             # The location where to put the strings is 
@@ -492 +499 @@
                     desc= self.name
                 out_f.write(line% desc + "\n")
+            elif line.count("def function(self, x=0.0%s):"):
+                if self.is_2d:
+                    y_str = ', y=0.0'
+                    out_f.write(line% y_str + "\n")
+                else:
+                    out_f.write(line% '' + "\n")
             elif line.count("#function here"):
                 for func_line in func_str.split('\n'):
@@ -498 +511 @@
                         out_f.write(spaces + f_line + "\n")
                 if not func_str:
-                    out_f.write(spaces + 'return y' + "\n")
+                    dep_var = 'y'
+                    if self.is_2d:
+                        dep_var = 'z'
+                    out_f.write(spaces + 'return %s'% dep_var + "\n")
             elif line.count("#import scipy?"):
                 if has_scipy:
@@ -506 +522 @@
             elif line:
                 out_f.write(line + "\n")
+        # run string for 2d
+        if line_2d:
+            for line in line_2d:
+                out_f.write(line + "\n")
+        # Test strins
+        for line in line_test:
+            out_f.write(line + "\n")
+   
         out_f.close() 
     
@@ -590 +614 @@
         self.description = "%s"
         self.set_details()
-    def function(self, x = 0.0):
+    def function(self, x=0.0%s):
         #local params here
-        #function here  
+        #function here
+"""
+TEST_TEMPLATE = """
 ######################################################################
 ## THIS IS FOR TEST. DO NOT MODIFY THE FOLLOWING LINES!!!!!!!!!!!!!!!!       
@@ -609 +635 @@
     else:
         print "===> Simple Test: Failed!"
-"""        
-        
+"""    
+CUSTOM_2D_TEMP = """
+    def run(self, x=0.0):
+        if x.__class__.__name__ == 'list':
+            x_val = x[0]*math.cos(x[1])
+            y_val = x[0]*math.sin(x[1])
+            return self.function(x_val, y_val)
+        elif x.__class__.__name__ == 'tuple':
+            msg = "Tuples are not allowed as input to BaseComponent models"
+            raise ValueError, msg
+        else:
+            return self.function(x, x)
+    def runXY(self, x=0.0, y=0.0):
+        if x.__class__.__name__ == 'list':
+            return self.function(x, y)
+        elif x.__class__.__name__ == 'tuple':
+            msg = "Tuples are not allowed as input to BaseComponent models"
+            raise ValueError, msg
+        else:
+            return self.function(x, y)
+    def evalDistribution(self, qdist):
+        if qdist.__class__.__name__ == 'list':
+            msg = "evalDistribution expects a list of 2 ndarrays"
+            if len(qdist)!=2:
+                raise RuntimeError, msg
+            if qdist[0].__class__.__name__ != 'ndarray':
+                raise RuntimeError, msg
+            if qdist[1].__class__.__name__ != 'ndarray':
+                raise RuntimeError, msg
+            v_model = numpy.vectorize(self.runXY, otypes=[float])
+            iq_array = v_model(qdist[0], qdist[1])
+            return iq_array
+        elif qdist.__class__.__name__ == 'ndarray':
+            v_model = numpy.vectorize(self.runXY, otypes=[float])
+            iq_array = v_model(qdist)
+            return iq_array
+"""
 SUM_TEMPLATE = """
 # A sample of an experimental model function for Sum(Pmodel1,Pmodel2)

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -369 +369 @@
         self.set_edit_menu_helper(owner, self.delete_custom_model)
     
-    def set_edit_menu_helper(self, owner, menu):
+    def set_edit_menu_helper(self, owner=None, menu=None):
         """
         help for setting list of the edit model menu labels
         """
+        if menu == None:
+            menu = self.edit_custom_model
         list_fnames = os.listdir(models.find_plugins_dir())
         for item in list_fnames: