Changeset 8dc0b746 in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

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

9188cc1

Parents:

96b59384

Message:

added 2D and corrected polydisp. parameters…

Location:

sansmodels/src/sans/models/c_extensions

Files:

• prolate.c (modified) (5 diffs)
• prolate.h (modified) (3 diffs)

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

@@ -18 +18 @@
  */
 double prolate_analytical_1D(ProlateParameters *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 ProlateForm(dp, q);      
+        return ProlateForm(dp, q);
 }
 
@@ -45 +43 @@
         double q;
         q = sqrt(qx*qx+qy*qy);
-    return prolate_analytical_2D_scaled(pars, q, qx/q, qy/q);
-} 
+    return prolate_analytical_1D(pars, q);
+}
 
 
@@ -57 +55 @@
  */
 double prolate_analytical_2D(ProlateParameters *pars, double q, double phi) {
-    return prolate_analytical_2D_scaled(pars, q, cos(phi), sin(phi));
-} 
-        
+    return prolate_analytical_1D(pars, q);
+}
+
 /**
  * Function to evaluate 2D scattering function
@@ -68 +66 @@
  * @return: function value
  */
-double prolate_analytical_2D_scaled(ProlateParameters *pars, double q, double q_x, double q_y) {
-        
-        return 1.0;
-}
-    
+//double prolate_analytical_2D_scaled(ProlateParameters *pars, double q, double q_x, double q_y) {
+//
+//      return 1.0;
+//}
+

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

@@ -3 +3 @@
 /** Structure definition for prolate parameters
  * [PYTHONCLASS] = ProlateModel
- * [DISP_PARAMS] = major_core, minor_core, major_shell,minor_shell, axis_theta, axis_phi
-   [DESCRIPTION] = <text> Calculates the form factor for a monodisperse prolate ellipsoid particle with a
-                                                core/shell structure
-                                                Note:It is the users' responsibility to ensure that shell radii are larger than core radii, and
-                                        that major radii are larger than minor radii.</text>
-
-   [FIXED] = <text>axis_phi.width; axis_theta.width; major_core.width;minor_core.width; major_shell; minor_shell</text>
-   [ORIENTATION_PARAMS] = <text>axis_phi; axis_theta; axis_phi.width; axis_theta.width</text>
+ * [DISP_PARAMS] = major_core, minor_core, major_shell,minor_shell
+   [DESCRIPTION] = <text>[ProlateCoreShellModel] Calculates the form factor for a prolate
+                        ellipsoid particle with a core_shell structure.
+                        The form factor is averaged over all possible
+                        orientations of the ellipsoid such that P(q)
+                        = scale*<f^2>/Vol + bkg, where f is the
+                        single particle scattering amplitude.
+                        [Parameters]:
+                        major_core = radius of major_core,
+                        minor_core = radius of minor_core,
+                        major_shell = radius of major_shell,
+                        minor_shell = radius of minor_shell,
+                        contrast = SLD_core - SLD_shell
+                        sld_solvent = SLD_solvent
+                        background = Incoherent bkg
+                        scale = scale
+                        Note:It is the users' responsibility to ensure
+                        that shell radii are larger than core radii.
+                        </text>
+   [FIXED] = <text>major_core.width;minor_core.width; major_shell.width; minor_shell.width</text>
+   [ORIENTATION_PARAMS] =
 
  **/
@@ -38 +51 @@
         //  [DEFAULT]=background=0.001 [1/cm]
         double background;
-    /// Orientation of the prolate axis w/respect incoming beam [rad]
-    //  [DEFAULT]=axis_theta=1.0 [rad]
-    double axis_theta;
-    /// Orientation of the prolate in the plane of the detector [rad]
-    //  [DEFAULT]=axis_phi=1.0 [rad]
-    double axis_phi;
 
 } ProlateParameters;
@@ -55 +62 @@
 double prolate_analytical_2D(ProlateParameters *pars, double q, double phi);
 double prolate_analytical_2DXY(ProlateParameters *pars, double qx, double qy);
-double prolate_analytical_2D_scaled(ProlateParameters *pars, double q, double q_x, double q_y);
+//double prolate_analytical_2D_scaled(ProlateParameters *pars, double q, double q_x, double q_y);
 
 #endif