Changeset 69e1afc in sasmodels

Timestamp:

Apr 10, 2017 12:56:27 PM (7 years ago)

Author:

richardh

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

e645373

Parents:

9802ab3

Message:

2d units tests for threee paracrystal models, will need opencl test

Location:

sasmodels/models

Files:

• bcc_paracrystal.py (modified) (1 diff)
• fcc_paracrystal.py (modified) (1 diff)
• sc_paracrystal.py (modified) (1 diff)

sasmodels/models/bcc_paracrystal.py

@@ -148 +148 @@
     [{ },
      [0.001, q, 0.215268], [1.46601394721, 2.85851284174, 0.00866710287078]],
-]
+    [{'theta':20.0,'phi':30,'psi':40.0},(-0.017,0.035),2082.20264399 ],
+    [{'theta':20.0,'phi':30,'psi':40.0},(-0.081,0.011),0.436323144781 ]
+    ]

sasmodels/models/fcc_paracrystal.py

@@ -129 +129 @@
             psi_pd=15, psi_pd_n=0,
            )
-# april 6 2017, rkh add unit tests, NOT compared with any other calc method, assume correct!
-# add 2d test later
+# april 10 2017, rkh add unit tests, NOT compared with any other calc method, assume correct!
 q =4.*pi/220.
 tests = [
     [{ },
      [0.001, q, 0.215268], [0.275164706668, 5.7776842567, 0.00958167119232]],
+     [{}, (-0.047,-0.007), 238.103096286],
+     [{}, (0.053,0.063), 0.863609587796 ],
 ]

sasmodels/models/sc_paracrystal.py

@@ -149 +149 @@
 
 tests = [
-    # Accuracy tests based on content in test/utest_extra_models.py
+    # Accuracy tests based on content in test/utest_extra_models.py, 2d tests added April 10, 2017
     [{}, 0.001, 10.3048],
     [{}, 0.215268, 0.00814889],
-    [{}, (0.414467), 0.001313289]
+    [{}, (0.414467), 0.001313289],
+    [{'theta':10.0,'phi':20,'psi':30.0},(0.045,-0.035),18.0397138402 ],
+    [{'theta':10.0,'phi':20,'psi':30.0},(0.023,0.045),0.0177333171285 ]
     ]