Changeset 1353f60 in sasmodels for sasmodels/models/stickyhardsphere.py

Timestamp:

Mar 3, 2015 4:47:06 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c

Parents:

7e224c2 (diff), bfb195e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

File:

• sasmodels/models/stickyhardsphere.py (modified) (1 diff)

sasmodels/models/stickyhardsphere.py

@@ -163 +163 @@
         return(sq);
 """
+
 Iqxy = """
-    // never called since no orientation or magnetic parameters.
-    return -1.0;
+    return Iq(sqrt(qx*qx+qy*qy), IQ_PARAMETERS);
     """