Changeset 876192b2 in sasview for sansmodels/src/sans/models

Timestamp:

Jul 18, 2011 5:09:02 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:

d9341f2

Parents:

a07161b

Message:

updated utest due to the disp. func. corrections

File:

• sansmodels/src/sans/models/test/utest_other_dispersity.py (modified) (6 diffs)

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

@@ -32 +32 @@
         self.model.setParam('scale', 10.0)
         self.model.set_dispersion('radius', disp)
-        self.model.dispersion['radius']['width'] = 5.0
+        self.model.dispersion['radius']['width'] = 5.0/20.0
         self.model.dispersion['radius']['npts'] = 100
-        self.model.dispersion['radius']['nsigmas'] = 2.5
+        self.model.dispersion['radius']['nsigmas'] = 2.0
         print "constant",self.model.run(0.001), self.model.dispersion
         self.assertAlmostEqual(self.model.run(0.001), 1.021051*4527.47250339, 3)
@@ -43 +43 @@
         disp = GaussianDispersion()
         self.model.set_dispersion('radius', disp)
-        self.model.dispersion['radius']['width'] = 5.0
+        self.model.dispersion['radius']['width'] = 5.0/20.0
         self.model.dispersion['radius']['npts'] = 100
-        self.model.dispersion['radius']['nsigmas'] = 2.5
+        self.model.dispersion['radius']['nsigmas'] = 2.0
         self.model.setParam('scale', 10.0)
         
@@ -55 +55 @@
         disp = GaussianDispersion()
         self.model.set_dispersion('radius', disp)
-        self.model.dispersion['radius']['width'] = 5.0
+        self.model.dispersion['radius']['width'] = 5.0/20.0
         self.model.dispersion['radius']['npts'] = 100
-        self.model.dispersion['radius']['nsigmas'] = 2.5
+        self.model.dispersion['radius']['nsigmas'] = 2.0
         self.model.setParam('scale', 10.0)
         
@@ -69 +69 @@
         disp = SchulzDispersion()
         self.model.set_dispersion('radius', disp)
-        self.model.dispersion['radius']['width'] = 5.0
+        self.model.dispersion['radius']['width'] = 5.0/20.0
         #self.model.dispersion['radius']['width'] = 0.0
         self.model.dispersion['radius']['npts'] = 100
-        self.model.dispersion['radius']['nsigmas'] = 2.5
-        #self.model.setParam('scale', 1.0)
-        self.model.setParam('scale', 10.0)
+        self.model.dispersion['radius']['nsigmas'] = 2.0
+        self.model.setParam('scale', 1.0)
+        #self.model.setParam('scale', 10.0)
         print "schulz",self.model.run(0.001), self.model.dispersion
-        self.assertAlmostEqual(self.model.run(0.001), 450.355, 3)
-        self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 452.299, 3)
+        self.assertAlmostEqual(self.model.run(0.001), 542.23568, 3)
+        self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 544.54864, 3)
         
     def test_lognormal_zero(self):
@@ -83 +83 @@
         disp = LogNormalDispersion()
         self.model.set_dispersion('radius', disp)
-        self.model.dispersion['radius']['width'] = 5.0
+        self.model.dispersion['radius']['width'] = 5.0/20.0
         #self.model.dispersion['radius']['width'] = 0.0
         self.model.dispersion['radius']['npts'] = 100
-        self.model.dispersion['radius']['nsigmas'] = 2.5
-        #self.model.setParam('scale', 1.0)
-        self.model.setParam('scale', 10.0)
+        self.model.dispersion['radius']['nsigmas'] = 2.0
+        self.model.setParam('scale', 1.0)
+        #self.model.setParam('scale', 10.0)
         print "model dispersion",self.model.dispersion
         print "lognormal",self.model.run(0.001)
-        self.assertAlmostEqual(self.model.run(0.001), 450.355, 3)
-        self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 452.299, 3)
+        self.assertAlmostEqual(self.model.run(0.001), 450.64237, 3)
+        self.assertAlmostEqual(self.model.runXY([0.001,0.001]), 452.58733, 3)
         
     def test_gaussian_zero(self):
@@ -100 +100 @@
         self.model.dispersion['radius']['width'] = 0.0
         self.model.dispersion['radius']['npts'] = 100
-        self.model.dispersion['radius']['nsigmas'] = 2.5
+        self.model.dispersion['radius']['nsigmas'] = 2.0
         self.model.setParam('scale', 1.0)