Changeset 8e36cdd in sasview for sansmodels/src/sans/models/test

Timestamp:

Aug 20, 2009 11:24:23 AM (15 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:

1d67243

Parents:

191b369

Message:

fixed and tested ppmodel 2d and cleaned it up.

Location:

sansmodels/src/sans/models/test

Files:

• EllipticalCylinderModel_avg.txt (added)
• ParallelepipedModel_avg.txt (added)
• TriaxialEllipsoidModel_avg.txt (added)
• validate_2D_3axes_shape_model.py (modified) (4 diffs)

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

@@ -25 +25 @@
         Averaging the 3-axes 2D scattering intensity give a slightly
         different output than the 1D function  
-        at hight Q (Q>~0.1). This is due(?) to the way the IGOR library 
+        at hight Q (Q>~0.2). This is due(?) to the way the IGOR library 
         averages, taking only 76 points in alpha, the angle between
         the axis of the ellipsoid and the q vector.
@@ -81 +81 @@
             psi_label = 'axis_psi'
             
-        output_f = open("%s_avg1.txt" % model.__class__.__name__,'w')
+        output_f = open("%s_avg.txt" % model.__class__.__name__,'w')
         output_f.write("<q_average> <2d_average> <1d_average>\n")
             
-        for i_q in range(1, 30):
+        for i_q in range(1, 40):
             q = 0.01*i_q
             sum = 0.0
@@ -114 +114 @@
 if __name__ == '__main__':
     validator = Validate2D()
-
+    
+    #te was not passed.
     te_passed =validator(TriaxialEllipsoidModel, points=76)
     pp_passed = validator(ParallelepipedModel, points=76)
@@ -122 +123 @@
     print "Model             Passed"
     print "TriaxialEllipsoid         %s" % te_passed
+    print "ParallelepipedModel    %s" % pp_passed
     print "EllipticalCylinder        %s" % ell_passed
-    print "ParallelepipedModel    %s" % pp_passed