Changeset 1353f60 in sasmodels for sasmodels/models

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

Location:

sasmodels/models

Files:

• barbell.py (modified) (1 diff)
• bcc.py (modified) (1 diff)
• cylinder.py (modified) (1 diff)
• fcc.py (modified) (1 diff)
• lamellar.py (modified) (1 diff)
• lamellarCaille.py (modified) (1 diff)
• lamellarCailleHG.py (modified) (1 diff)
• lamellarFFHG.py (modified) (1 diff)
• stickyhardsphere.py (modified) (1 diff)

sasmodels/models/barbell.py

@@ -127 +127 @@
 source = [ "lib/J1.c", "lib/gauss76.c", "barbell.c" ]
 
-def ER(radius, length):
-    return 1.0
-
 # parameters for demo
 demo = dict(

sasmodels/models/bcc.py

@@ -128 +128 @@
 source = [ "lib/J1.c", "lib/gauss150.c", "bcc.c" ]
 
-def ER(radius, length):
-    return 0
-
 # parameters for demo
 demo = dict(

sasmodels/models/cylinder.py

@@ -172 +172 @@
 
 
-# test values:
-# [
-#   [ {parameters}, q, I(q)],
-#   [ {parameters}, [q], [I(q)] ],
-#   [ {parameters}, [q1, q2, ...], [I(q1), I(q2), ...]],
-
-#   [ {parameters}, (qx, qy), I(qx, Iqy)],
-#   [ {parameters}, [(qx1, qy1), (qx2, qy2), ...], [I(qx1,qy1), I(qx2,qy2), ...],
-#   ...
-# ]
-# Precision defaults to 7 digits (relative) for single, 14 for double
-# May want a limited precision version that checks for 8-n or 15-n digits respectively
 qx,qy = 0.2*np.cos(2.5), 0.2*np.sin(2.5)
 tests = [

sasmodels/models/fcc.py

@@ -103 +103 @@
 source = [ "lib/J1.c", "lib/gauss150.c", "fcc.c" ]
 
-def ER(radius, length):
-    return 0
-
 # parameters for demo
 demo = dict(

sasmodels/models/lamellar.py

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

sasmodels/models/lamellarCaille.py

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

sasmodels/models/lamellarCailleHG.py

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

sasmodels/models/lamellarFFHG.py

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

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);
     """