Changeset 3540156 in sasview

Timestamp:

Jan 11, 2013 6:06:11 PM (11 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:

3657667

Parents:

440006a

Message:

cleaned up

Files:

• calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (1 diff)
• sanscalculator/src/sans/calculator/sans_gen.py (modified) (1 diff)
• sanscalculator/test/sphere697_r30.sld (added)
• sanscalculator/test/utest_sans_gen.py (modified) (3 diffs)

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

@@ -645 +645 @@
         # Plot All others        
         if numpy.any(other_color):
-            print len(other_color), output.pix_symbol[other_color]
             ax.plot(pos_x[other_color], pos_z[other_color], pos_y[other_color], 
                     marker, c="k", alpha=0.5, markeredgecolor="k", 

sanscalculator/src/sans/calculator/sans_gen.py

@@ -587 +587 @@
                 input_f = numpy.loadtxt(path, dtype='float', skiprows=1, 
                                         ndmin=1, unpack=True)
-                raise
                 pos_x = numpy.array(input_f[0])
                 pos_y = numpy.array(input_f[1])

sanscalculator/test/utest_sans_gen.py

@@ -7 +7 @@
 import unittest
 from sans.calculator import sans_gen
+from sans.models.SphereModel import SphereModel
+
+import numpy
  
 import os.path
@@ -13 +16 @@
     
     def setUp(self):
-        self.model = sans_gen.GenSAS()
         self.sldloader = sans_gen.SLDReader()
         self.pdbloader = sans_gen.PDBReader()
-        self.omfloader = sans_gen.OMFReader()
+        self.omfloader = sans_gen.OMFReader() 
+        self.comp = SphereModel()
         
     def test_sldreader(self):
@@ -41 +44 @@
         """
         f = self.omfloader.read("A_Raw_Example-1.omf")
+        output = sans_gen.OMF2SLD()
+        output.set_data(f)
         self.assertEqual(f.mx[0], 0)
         self.assertEqual(f.my[0], 0)
         self.assertEqual(f.mz[0], 0)
-        
+        self.assertEqual(output.pos_x[0], -390.0)
+        self.assertEqual(output.pos_y[0], -390.0)
+        self.assertEqual(output.pos_z[0], -90.0)
+
+"""      
+    def test_slda_and_run(self): # Works when sld reader uses loadtxt
+        sld_data = self.sldloader.read("sphere697_r30.sld")
+        # Generic computation  
+        model = sans_gen.GenSAS()
+        model.setParam('background', 0.0)
+        model.setParam('scale', 1.0)
+        model.setParam('Up_frac_in', 0.5)
+        model.setParam('Up_frac_out', 0.5)
+        model.setParam('Up_theta', 0.0)
+        x = numpy.array([0.01])
+        y = numpy.array([0.01])
+        model.set_sld_data(sld_data)
+        out_gen = model.runXY([x, y])
+        # Analytic computation
+        analy_model = self.comp
+        analy_model.setParam('background', 0.0)
+        analy_model.setParam('scale', 1.0)
+        analy_model.setParam('radius', 30.0)
+        analy_model.setParam('sldSolv', 0.0)
+        analy_model.setParam('sldSph', 6.97e-06) 
+        out_analy = analy_model.runXY([0.01, 0.01])
+        # Comparison
+        self.assertAlmostEqual(out_gen[0], out_analy, 1)
+"""   
 if __name__ == '__main__':
     unittest.main()