Changeset c3ccaec in sasmodels for sasmodels/models/raspberry.py

Timestamp:

Feb 7, 2017 12:10:50 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a90aa1c

Parents:

aa107ef (diff), fe8ff99 (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.

git-author:

Paul Kienzle <pkienzle@…> (02/07/17 12:10:50)

git-committer:

GitHub <noreply@…> (02/07/17 12:10:50)

Message:

Merge branch 'master' into ticket-815

File:

• sasmodels/models/raspberry.py (modified) (2 diffs)

sasmodels/models/raspberry.py

@@ -129 +129 @@
             Ref: J. coll. inter. sci. (2010) vol. 343 (1) pp. 36-41."""
 category = "shape:sphere"
-#single = False
+
 
 #             [ "name", "units", default, [lower, upper], "type", "description"],
@@ -152 +152 @@
              ]
 
-source = ["lib/sph_j1c.c", "raspberry.c"]
+source = ["lib/sas_3j1x_x.c", "raspberry.c"]
 
 # parameters for demo