Changeset c1c29b6 in sasview for sansmodels/src/sans/models/c_extensions/lamellarPS.h

Timestamp:

Aug 21, 2009 12:34:33 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

14c3887

Parents:

bda194e3

Message:

some corrections and removed polydispersity from inside of function and set dQ =0

File:

• sansmodels/src/sans/models/c_extensions/lamellarPS.h (modified) (5 diffs)

sansmodels/src/sans/models/c_extensions/lamellarPS.h

@@ -7 +7 @@
 /** Structure definition for concentrated lamellar form factor parameters
  * [PYTHONCLASS] = LamellarPSModel
- * [DISP_PARAMS] = spacing
+ * [DISP_PARAMS] = delta, spacing
    [DESCRIPTION] = <text>[Concentrated Lamellar Form Factor] Calculates the scattered
            intensity from a lyotropic lamellar phase.
@@ -21 +21 @@
                 *Parameters: spacing = repeat spacing,
                 delta = bilayer thickness,
-                sigma = variation in bilayer thickness
                 contrast = SLD_solvent - SLD_bilayer
                 n_plate = # of Lamellar plates
@@ -28 +27 @@
                 scale = scale factor
 </text>
-   [FIXED]= spacing.width
+   [FIXED]= <text>delta.width; spacing.width</text>
    [ORIENTATION_PARAMS]=
 
@@ -42 +41 @@
     //  [DEFAULT]=delta=30 [A]
     double delta;
-        /// polydispersity of the bilayer thickness  [A]
-    //  [DEFAULT]=sigma=0.15
-    double sigma;
     /// Contrast [1/A²]
     //  [DEFAULT]=contrast=5.3e-6 [1/A²]
@@ -60 +56 @@
 } LamellarPSParameters;
 
-
-
+/// kernel
+double LamellarPS_kernel(double dp[], double q);
 /// 1D scattering function
 double lamellarPS_analytical_1D(LamellarPSParameters *pars, double q);