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

Timestamp:

Jul 19, 2011 11:25:29 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:

ff18c58

Parents:

da987e1

Message:

corrected the utest/ellcyl

File:

• sansmodels/src/sans/models/test/validate_2D_elliptical_cyl.py (modified) (3 diffs)

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

@@ -102 +102 @@
         
         cyl = CylinderModel()
-        cyl.setParam("cyl_theta", 1.57)
+        cyl.setParam("cyl_theta", 90)
         cyl.setParam("cyl_phi", 0.0)
         cyl.setParam("radius", 20)
         cyl.setParam("length", 400)
-        cyl.setParam("contrast", 1.0e-6)
+        cyl.setParam("sldCyl", 2.0e-6)
+        cyl.setParam("sldSolv", 1.0e-6)
 
         ell = EllipticalCylinderModel()
         ell.setParam("r_ratio", 1.0)
         ell.setParam("r_minor", 20)
-        ell.setParam("cyl_theta", 1.57)
+        ell.setParam("cyl_theta", 90)
         ell.setParam("cyl_phi", 0.0)
         ell.setParam("length", 400)
-        ell.setParam("contrast", 1.0e-6)
+        ell.setParam("sldCyl", 2.0e-6)
+        ell.setParam("sldSolv", 1.0e-6)
         
         passed = True
@@ -146 +148 @@
         model.setParam('r_ratio', 1.0)
         model.setParam("r_minor", 20)
-        model.setParam("cyl_theta", 1.57)
+        model.setParam("cyl_theta", 90)
         model.setParam("cyl_phi", 0.0)
         model.setParam("length", 400)
-        model.setParam("contrast", 1.0e-6)
+        model.setParam("sldEll", 2.0e-6)
+        model.setParam("sldSolv", 1.0e-6)
         
         cyl = CylinderModel()
-        cyl.setParam("cyl_theta", 1.57)
+        cyl.setParam("cyl_theta", 90)
         cyl.setParam("cyl_phi", 0.0)
         cyl.setParam("radius", 20)
         cyl.setParam("length", 400)
-        cyl.setParam("contrast", 1.0e-6)
+        cyl.setParam("sldCyl", 2.0e-6)
+        cyl.setParam("sldSolv", 1.0e-6)
+
         
         output_f = open("average_func.txt",'w')    
@@ -191 +196 @@
         for i_theta in range(npts):
             theta = math.pi/npts*i_theta            
-            model.setParam('cyl_theta', theta)
+            model.setParam('cyl_theta', theta * 180 / math.pi)
             
             for j in range(npts):
-                model.setParam('cyl_phi', math.pi * 2.0 / npts * j)
+                model.setParam('cyl_phi', 180 * 2.0 / npts * j)
                      
                 if str(model.run([q, 0])).count("IN")>0:                        
                     if self.verbose:
-                        print "ERROR", q, theta, math.pi * 2.0 / npts * j
+                        print "ERROR", q, theta, 180 * 2.0 / npts * j
                 else:
                     sum += math.sin(theta)*model.run([q, 0])