Changeset 03cac08 in sasmodels for doc

Timestamp:

Mar 20, 2016 9:44:11 PM (9 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:

303d8d6

Parents:

d5ac45f

Message:

new generator produces code that compiles

File:

• doc/developer/calculator.rst (modified) (6 diffs)

doc/developer/calculator.rst

@@ -7 +7 @@
 - KERNEL declares a function to be available externally
 - KERNEL_NAME is the name of the function being declared
+- MAX_PD is the maximum depth of the polydispersity loop
 - NPARS is the number of parameters in the kernel
 - PARAMETER_TABLE is the declaration of the parameters to the kernel::
@@ -29 +30 @@
         double sld_solvent
 
-- CALL_IQ(q, nq, i, pars) is the declaration of a call to the kernel::
+- CALL_IQ(q, i, pars) is the declaration of a call to the kernel::
 
     Cylinder:
 
-        #define CALL_IQ(q, nq, i, var) \
-        Iq(q[i], \
+        #define CALL_IQ(q, i, var) Iq(q[i], \
         var.length, \
         var.radius, \
@@ -42 +42 @@
     Multi-shell cylinder:
 
-        #define CALL_IQ(q, nq, i, var) \
-        Iq(q[i], \
+        #define CALL_IQ(q, i, var) Iq(q[i], \
         var.num_shells, \
         var.length, \
@@ -50 +49 @@
         var.sld_solvent)
 
+    Cylinder2D:
+
+        #define CALL_IQ(q, i, var) Iqxy(q[2*i], q[2*i+1], \
+        var.length, \
+        var.radius, \
+        var.sld, \
+        var.sld_solvent, \
+        var.theta, \
+        var.phi)
+
 - CALL_VOLUME(var) is similar, but for calling the form volume::
 
@@ -69 +78 @@
         inline bool constrained(p1, p2, p3) { return expression; }
         #define INVALID(var) constrained(var.p1, var.p2, var.p3)
-
-- IQ_FUNC could be Iq or Iqxy
-- IQ_PARS could be q[i] or q[2*i],q[2*i+1]
 
 Our design supports a limited number of polydispersity loops, wherein
@@ -200 +206 @@
 
 TODO: cutoff
+
+For accuracy we may want to introduce Kahan summation into the integration::
+
+
+    double accumulated_error = 0.0;
+    ...
+    #if USE_KAHAN_SUMMATION
+        const double y = next - accumulated_error;
+        const double t = ret + y;
+        accumulated_error = (t - ret) - y;
+        ret = t;
+    #else
+        ret += next;
+    #endif