Changeset b4679de in sasview for sansmodels/src/sans/models/c_extensions/lamellarPS.c

Timestamp:

Aug 4, 2009 3:32:38 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:

fbe5d3e

Parents:

8e91f01

Message:

added 2d and model descpt + correction on polydisp. para.

File:

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

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

@@ -19 +19 @@
 double lamellarPS_analytical_1D(LamellarPSParameters *pars, double q) {
         double dp[8];
-        
+
         // Fill paramater array
         dp[0] = pars->scale;
@@ -31 +31 @@
 
         // Call library function to evaluate model
-        return LamellarPS(dp, q);       
+        return LamellarPS(dp, q);
 }
 /**
@@ -42 +42 @@
         double q;
         q = sqrt(qx*qx+qy*qy);
-    return lamellarPS_analytical_2D_scaled(pars, q, qx/q, qy/q);
-} 
+    return lamellarPS_analytical_1D(pars, q);
+}
 
 
@@ -54 +54 @@
  */
 double lamellarPS_analytical_2D(LamellarPSParameters *pars, double q, double phi) {
-    return lamellarPS_analytical_2D_scaled(pars, q, cos(phi), sin(phi));
-} 
-        
+    return lamellarPS_analytical_1D(pars,q);
+}
+
 /**
  * Function to evaluate 2D scattering function
@@ -65 +65 @@
  * @return: function value
  */
-double lamellarPS_analytical_2D_scaled(LamellarPSParameters *pars, double q, double q_x, double q_y) {
-        
-        return 1.0;
-}
-    
 
+