Changeset ca4c150 in sasview for sansmodels/src/sans/models

Timestamp:

Jan 18, 2011 4:43:28 PM (14 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:

f1e06a8e

Parents:

f1abc57

Message:

update nsigmas value due to the default changes from 2.5 to 3.0

File:

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

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

@@ -17 +17 @@
         self.model.setParam('radius', 20.0)
         self.model.setParam('length', 400.0)
-        self.model.setParam('contrast', 3.e-6)
+        self.model.setParam('sldCyl', 4.e-6)
+        self.model.setParam('sldSolv', 1.e-6)
         self.model.setParam('background', 0.0)
         self.model.setParam('cyl_theta', 0.0)
@@ -33 +34 @@
         self.model.dispersion['radius']['width'] = 5.0
         self.model.dispersion['radius']['npts'] = 100
+        self.model.dispersion['radius']['nsigmas'] = 2.5
         print "constant",self.model.run(0.001), self.model.dispersion
         self.assertAlmostEqual(self.model.run(0.001), 1.021051*4527.47250339, 3)
@@ -43 +45 @@
         self.model.dispersion['radius']['width'] = 5.0
         self.model.dispersion['radius']['npts'] = 100
+        self.model.dispersion['radius']['nsigmas'] = 2.5
         self.model.setParam('scale', 10.0)
         
@@ -54 +57 @@
         self.model.dispersion['radius']['width'] = 5.0
         self.model.dispersion['radius']['npts'] = 100
+        self.model.dispersion['radius']['nsigmas'] = 2.5
         self.model.setParam('scale', 10.0)
         
@@ -68 +72 @@
         #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)
@@ -81 +86 @@
         #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)
@@ -94 +100 @@
         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)
         
@@ -112 +119 @@
         weights   = numpy.zeros(100)
         for i in range(100):
-            values_ph[i]=(2.0*math.pi/99.0*i)
-            values_th[i]=(math.pi/99.0*i)
+            values_ph[i]=(360/99.0*i)
+            values_th[i]=(180/99.0*i)
             weights[i]=(1.0)