Changeset 7485cfa in sasview

Timestamp:

Jan 18, 2012 9:51:45 AM (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:

f505470

Parents:

530cc84

Message:

custom run 1d use y=0 if y is supplied

File:

• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (4 diffs)

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

@@ -618 +618 @@
         #function here
 """
-TEST_TEMPLATE = """
-######################################################################
-## THIS IS FOR TEST. DO NOT MODIFY THE FOLLOWING LINES!!!!!!!!!!!!!!!!       
-if __name__ == "__main__": 
-    m= Model() 
-    out1 = m.runXY(0.0)
-    out2 = m.runXY(0.01)
-    isfine1 = numpy.isfinite(out1)
-    isfine2 = numpy.isfinite(out2)
-    print "Testing the value at Q = 0.0:"
-    print out1, " : finite? ", isfine1
-    print "Testing the value at Q = 0.01:"
-    print out2, " : finite? ", isfine2
-    if isfine1 and isfine2:
-        print "===> Simple Test: Passed!"
-    else:
-        print "===> Simple Test: Failed!"
-"""    
 CUSTOM_2D_TEMP = """
     def run(self, x=0.0):
@@ -646 +628 @@
             raise ValueError, msg
         else:
-            return self.function(x, x)
+            return self.function(x, 0.0)
     def runXY(self, x=0.0, y=0.0):
         if x.__class__.__name__ == 'list':
@@ -671 +653 @@
             iq_array = v_model(qdist)
             return iq_array
+"""
+TEST_TEMPLATE = """
+######################################################################
+## THIS IS FOR TEST. DO NOT MODIFY THE FOLLOWING LINES!!!!!!!!!!!!!!!!       
+if __name__ == "__main__": 
+    m= Model() 
+    out1 = m.runXY(0.0)
+    out2 = m.runXY(0.01)
+    isfine1 = numpy.isfinite(out1)
+    isfine2 = numpy.isfinite(out2)
+    print "Testing the value at Q = 0.0:"
+    print out1, " : finite? ", isfine1
+    print "Testing the value at Q = 0.01:"
+    print out2, " : finite? ", isfine2
+    if isfine1 and isfine2:
+        print "===> Simple Test: Passed!"
+    else:
+        print "===> Simple Test: Failed!"
 """
 SUM_TEMPLATE = """
@@ -969 +969 @@
     dir_path = models.find_plugins_dir()
     app  = wx.App()
-    window = EditorWindow(parent=None, base=None, path=dir_path, title="AAA")
+    window = EditorWindow(parent=None, base=None, path=dir_path, title="Editor")
     app.MainLoop()