Changeset 0da2a01 in sasmodels for sasmodels/models/hollow_cylinder.c

Timestamp:

Jan 21, 2016 4:19:48 PM (8 years ago)

Author:

krzywon

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:

7d256c8

Parents:

0420af7 (diff), 790bcc4c (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 remote-tracking branch 'origin/master'

File:

• sasmodels/models/hollow_cylinder.c (modified) (2 diffs)

sasmodels/models/hollow_cylinder.c

@@ -114 +114 @@
         double norm,volume;     //final calculation variables
         
+        if (core_radius >= radius || radius >= length) {
+                return NAN;
+        }
+        
         delrho = solvent_sld - sld;
         lower = 0.0;
@@ -132 +136 @@
 }
 
-//FIXME: Factor of two difference
 double Iqxy(double qx, double qy, double radius, double core_radius, double length, double sld,
         double solvent_sld, double theta, double phi)