Changeset ae60f86 in sasview for sansmodels/src/sans/models/test/utest_dispersity.py

Timestamp:

Oct 14, 2008 8:13:28 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

8809e48

Parents:

4fe4394

Message:

changing base model

File:

• sansmodels/src/sans/models/test/utest_dispersity.py (modified) (2 diffs)

sansmodels/src/sans/models/test/utest_dispersity.py

@@ -47 +47 @@
         self.assertAlmostEqual(self.model.run(0.001), 4723.32213339, 3)
         self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 4743.56, 2)
+        
+    def test_gaussian_zero(self):
+        from sans.models.dispersion_models import GaussianDispersion
+        disp = GaussianDispersion()
+        self.model.set_dispersion('radius', disp)
+        self.model.dispersion['radius']['width'] = 0.0
+        self.model.dispersion['radius']['npts'] = 100
+        self.model.setParam('scale', 1.0)
+        
+        self.assertAlmostEqual(self.model.run(0.001), 450.355, 3)
+        self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 452.299, 3)
         
     def test_array(self):
@@ -429 +440 @@
         self.assertTrue(math.fabs(val_1d-val_2d)/val_1d < 0.02)
         
+class TestDispModel(unittest.TestCase):
+    def setUp(self):
+        from sans.models.CylinderModel import CylinderModel
+        self.model = CylinderModel()
+        
+        
+    def test_disp_params(self):
+        
+        self.assertEqual(self.model.dispersion['radius']['width'], 0.0)
+        self.model.setParam('radius.width', 5.0)
+        self.assertEqual(self.model.dispersion['radius']['width'], 5.0)
+        self.assertEqual(self.model.getParam('radius.width'), 5.0)
+        self.assertEqual(self.model.dispersion['radius']['type'], 'gaussian')