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

Timestamp:

Jul 19, 2011 11:16:04 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:

b5a0509

Parents:

458c930

Message:

updated and fixed utest 2d

File:

• sansmodels/src/sans/models/test/validate_2D_model.py (modified) (4 diffs)

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

@@ -77 +77 @@
             
         for i_q in range(1, 30):
-            q = 0.025*i_q
+            q = 0.025 *i_q
             sum = 0.0
             for i_theta in range(npts):
-                theta = 180.0/npts*i_theta
+                theta = 180.0 / npts * i_theta
                 
                 model.setParam(theta_label, theta)
@@ -91 +91 @@
                     #sum += model.run([q, 0])
             
-            value = sum/npts/npts*180.0/2.0
+            value = sum/npts/npts*math.pi/2.0
             ana = model.run(q)
-            if q<0.3 and (value-ana)/ana>0.05:
+            if q<0.25 and (value-ana)/ana>0.05:
                 passed = False
             output_f.write("%10g %10g %10g\n" % (q, value, ana))
@@ -142 +142 @@
             value = sum/npts
             ana = model.run(q)
-            if q<0.3 and (value-ana)/ana>0.05:
+            if q<0.25 and (value-ana)/ana>0.05:
                 passed = False
             output_f.write("%10g %10g %10g\n" % (q, value, ana))
@@ -177 +177 @@
                     sum += math.sin(theta*math.pi/180.0)*model.run([q, 0])
             
-            value = sum/npts/npts*180.0/2.0
+            value = sum/npts/npts*math.pi/2.0
             ana = model.run(q)
-            if q<0.3 and (value-ana)/ana>0.05:
+            if q<0.25 and (value-ana)/ana>0.05:
                 passed = False
             output_f.write("%10g %10g %10g\n" % (q, value, ana))