Changeset 42f193a in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

Aug 4, 2009 1:20:01 PM (16 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:

8e91f01

Parents:

2cc633b

Message:

some corrections on dips-parameters and adding 2D cal

Location:

sansmodels/src/sans/models/c_extensions

Files:

• lamellar.c (modified) (3 diffs)
• lamellar.h (modified) (3 diffs)
• vesicle.h (modified) (1 diff)

sansmodels/src/sans/models/c_extensions/lamellar.c

@@ -1 +1 @@
 /**
- * Scattering model for lamellar
+ * Scattering model for dilute lamellar model: polydipsersion in thickness (delta) included
  * @author: Gervaise B. Alina / UTK
  */
@@ -19 +19 @@
 double lamellar_analytical_1D(LamellarParameters *pars, double q) {
         double dp[5];
-        
+
         // Fill paramater array
         dp[0] = pars->scale;
@@ -26 +26 @@
         dp[3] = pars->contrast;
         dp[4] = pars->background;
-        
-        
+
+
         // Call library function to evaluate model
-        return LamellarFF(dp, q);       
+        return LamellarFF(dp, q);
+}
+/**
+ * Function to evaluate 2D scattering function
+ * @param pars: parameters of the lamellar
+ * @param q: q-value
+ * @return: function value
+ */
+
+
+double lamellar_analytical_2D(LamellarParameters *pars, double q, double phi){
+        return lamellar_analytical_1D(pars,q);
+}
+double lamellar_analytical_2DXY(LamellarParameters *pars, double qx, double qy){
+        return lamellar_analytical_1D(pars,sqrt(qx*qx+qy*qy));
 }
 
-double lamellar_analytical_2D(LamellarParameters *pars, double q, double phi){
-        return 1.0;
-}
-double lamellar_analytical_2DXY(LamellarParameters *pars, double qx, double qy){
-        return 1.0;
-}
-double lamellar_analytical_2D_scaled(LamellarParameters *pars, double q, double q_x, double q_y){
-        return 1.0;
-}
-

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

@@ -3 +3 @@
 /** Structure definition for lamellar parameters
  * [PYTHONCLASS] = LamellarModel
- * [DISP_PARAMS] =  delta
-   [DESCRIPTION] = <text> I(q)= 2*pi*P(q)/(delta *q^(2))
-                                                where:
-                                                P(q)=2*(contrast/q)^(2)*(1-cos(q*delta)*e^(1/2*(q*sigma)^(2))
-                                   </text>
-        [FIXED]= delta.width 
-        [ORIENTATION_PARAMS]= 
+   [DESCRIPTION] = <text>[Dilute Lamellar Form Factor](from a lyotropic lamellar phase)
+           I(q)= 2*pi*P(q)/(delta *q^(2)), where
+                P(q)=2*(contrast/q)^(2)*(1-cos(q*delta)
+                *e^(1/2*(q*sigma)^(2)).
+                delta = bilayer thickness
+                sigma = variation in bilayer thickness
+                        = delta*polydispersity
+                contrast = SLD_solvent - SLD_bilayer
+        Note: the polydispersity in delta is included.
+ </text>
  **/
 typedef struct {
@@ -18 +21 @@
     //  [DEFAULT]=delta=50.0 [A]
     double delta;
-    /// variation in bilayer thickness 
+    /// variation in bilayer thickness
     //  [DEFAULT]=sigma=0.15
     double sigma;
@@ -27 +30 @@
         //  [DEFAULT]=background=0.0 [1/cm]
         double background;
-   
+
 
 } LamellarParameters;

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

@@ -4 +4 @@
 /**
  * Structure definition for vesicle parameters
-
-        [PYTHONCLASS] = VesicleModel
-        [DISP_PARAMS] = core_radius
-        [DESCRIPTION] =<text>
-                                                Model parameters:
-                                                scale : scale factor
-                                                core_radius : Core radius of the vesicle
-                                                thickness: shell thickness
-                                                core_sld: core scattering length density
-                                                shell_sld: shell scattering length density
-                                                background: incoherent background
-               </text>
-        [FIXED]=  core_radius.width
-        [ORIENTATION_PARAMS]= <text> </text>
+[PYTHONCLASS] = VesicleModel
+[DISP_PARAMS] = core_radius,thickness
+[DESCRIPTION] =<text>Model parameters:  core_radius : Core radius of the vesicle
+                thickness: shell thickness
+                core_sld: core scattering length density
+                shell_sld: shell scattering length density
+                background: incoherent background
+                scale : scale factor
+</text>
+[FIXED]=  core_radius.width; thickness.width
+[ORIENTATION_PARAMS]= <text> </text>
  */
 typedef struct {