Changeset 2c74c11 in sasmodels for sasmodels/models/stacked_disks.c

Timestamp:

Jul 24, 2016 10:56:45 PM (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:

a4280bd

Parents:

f1765a2

Message:

implicit Iqxy; fix divide by 0 for q=0

File:

• sasmodels/models/stacked_disks.c (modified) (3 diffs)

sasmodels/models/stacked_disks.c

@@ -13 +13 @@
           double layer_sld,
           double solvent_sld);
-
-double Iqxy(double qx, double qy,
-            double core_thick,
-            double layer_thick,
-            double radius,
-            double n_stacking,
-            double sigma_d,
-            double core_sld,
-            double layer_sld,
-            double solvent_sld,
-            double theta,
-            double phi);
 
 static
@@ -52 +40 @@
         const double sinarg2 = qq*(halfheight+layer_thick)*cos(zi);
 
-    const double be1 = sas_J1c(besarg1);
+        const double be1 = sas_J1c(besarg1);
         const double be2 = sas_J1c(besarg2);
         const double si1 = sin(sinarg1)/sinarg1;
@@ -215 +203 @@
                     solvent_sld);
 }
-
-// Iqxy is never called since no orientation or magnetic parameters.
-double Iqxy(double qx, double qy,
-            double core_thick,
-            double layer_thick,
-            double radius,
-            double n_stacking,
-            double sigma_d,
-            double core_sld,
-            double layer_sld,
-            double solvent_sld,
-            double theta,
-            double phi)
-{
-    double q = sqrt(qx*qx + qy*qy);
-    return stacked_disks_kernel_2d(q, qx/q, qy/q,
-                    core_thick,
-                    layer_thick,
-                    radius,
-                    n_stacking,
-                    sigma_d,
-                    core_sld,
-                    layer_sld,
-                    solvent_sld,
-                    theta,
-                    phi);
-}
-