Changeset 96b59384 in sasview for sansmodels/src/sans/models/c_extensions/oblate.c

Timestamp:

Aug 4, 2009 6:02:28 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:

8dc0b746

Parents:

b341b16

Message:

added 2D and model descpt.

File:

• sansmodels/src/sans/models/c_extensions/oblate.c (modified) (6 diffs)

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

@@ -1 +1 @@
 /**
- * Scattering model for a oblate
+ * Scattering model for a oblate core shell
  * @author: Gervaise B Alina/ UTK
  */
@@ -18 +18 @@
  */
 double oblate_analytical_1D(OblateParameters *pars, double q) {
-        double dp[10];
-        
+        double dp[8];
+
         // Fill paramater array
         dp[0] = pars->scale;
@@ -29 +29 @@
         dp[6] = pars->sld_solvent;
         dp[7] = pars->background;
-        dp[8] = pars->axis_theta;
-        dp[9] = pars->axis_phi;
-        
+
         // Call library function to evaluate model
-        return OblateForm(dp, q);       
+        return OblateForm(dp, q);
 }
 
@@ -45 +43 @@
         double q;
         q = sqrt(qx*qx+qy*qy);
-    return oblate_analytical_2D_scaled(pars, q, qx/q, qy/q);
-} 
+    return oblate_analytical_1D(pars, q);
+}
 
 
@@ -57 +55 @@
  */
 double oblate_analytical_2D(OblateParameters *pars, double q, double phi) {
-    return oblate_analytical_2D_scaled(pars, q, cos(phi), sin(phi));
-} 
-        
+    return oblate_analytical_1D(pars, q);
+}
+
 /**
  * Function to evaluate 2D scattering function
@@ -68 +66 @@
  * @return: function value
  */
+/*
 double oblate_analytical_2D_scaled(OblateParameters *pars, double q, double q_x, double q_y) {
-        
+
         return 1.0;
 }
-    
+*/