Changeset 2f5c6d4 in sasmodels for sasmodels/models/pearl_necklace.c

Timestamp:

Jul 26, 2016 12:38:21 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

a3a0c5c

Parents:

a4280bd

Message:

move valid parameter test to macro

File:

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

sasmodels/models/pearl_necklace.c

@@ -8 +8 @@
         double string_thickness, double number_of_pearls, double sld, 
         double string_sld, double solvent_sld);
+
+#define INVALID(v) (v.string_thickness >= v.radius || v.number_of_pearls <= 0)
 
 // From Igor library
@@ -126 +128 @@
         double value, tot_vol;
         
-        if (string_thickness >= radius || number_of_pearls <= 0) {
-                return NAN;
-        }
-        
         value = _pearl_necklace_kernel(q, radius, edge_separation, string_thickness,
                 number_of_pearls, sld, string_sld, solvent_sld);