Changeset b30f001 in sasview for sansview/plugins

Timestamp:

Sep 10, 2008 1:49:53 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

49b7efa

Parents:

aa92772

Message:

working on model menu

File:

• sansview/plugins/testmodel.py (modified) (2 diffs)

sansview/plugins/testmodel.py

@@ -2 +2 @@
     Test plug-in model
 """
-try:
-    from DataPlugin import *
-except:
-    import sys, os
-    print os.path.abspath('..')
-    sys.path.insert(1,os.path.abspath('..'))
-    from DataPlugin import *
-    print "Running independently"
+#try:
+#    from DataPlugin import *
+#except:
+#    import sys, os
+#    print os.path.abspath('..')
+#    sys.path.insert(1,os.path.abspath('..'))
+#    from DataPlugin import *
+#    print "Running independently"
+#
+import math
+from sans.models.BaseComponent import BaseComponent
+import math
+class Model1DPlugin(BaseComponent):
+    ## Name of the model
+    name = "Plugin Model"
 
-import math
+    def __init__(self):
+        """ Initialization """
+        self.details = {}
+        self.params  = {}
+        
+    def function(self, x):
+        """
+            Function to be implemented by the plug-in writer
+        """
+        return x
+        
+    def run(self, x = 0.0):
+        """ Evaluate the model
+            @param x: input x, or [x, phi] [radian]
+            @return: function value
+        """
+        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)*self.function(y_val)
+        elif x.__class__.__name__ == 'tuple':
+            raise ValueError, "Tuples are not allowed as input to BaseComponent models"
+        else:
+            return self.function(x)
+   
+    def runXY(self, x = 0.0):
+        """ Evaluate the model
+            @param x: input x, or [x, y] 
+            @return: function value
+        """
+        if x.__class__.__name__ == 'list':
+            return self.function(x[0])*self.function(x[1])
+        elif x.__class__.__name__ == 'tuple':
+            raise ValueError, "Tuples are not allowed as input to BaseComponent models"
+        else:
+            return self.function(x)
 
 # Your model HAS to be called Model
@@ -23 +65 @@
     def __init__(self):
         """ Initialization """
-        
-        Model1DPlugin.__init__(self)
+      
         
         ## Parameters definition and defaults