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

Timestamp:

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

8e91f01

Parents:

2cc633b

Message:

some corrections on dips-parameters and adding 2D cal

File:

• sansmodels/src/sans/models/c_extensions/lamellar.c (modified) (3 diffs)

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;
-}
-