Changeset 2cb89e7 in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

Aug 16, 2009 10:30:27 AM (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:

7d11b81

Parents:

b0d0723

Message:

Changed the def. of lengths of sides for 2D,thus consistent w/ 1D. And shortened the names.

Location:

sansmodels/src/sans/models/c_extensions

Files:

• parallelepiped.c (modified) (4 diffs)
• parallelepiped.h (modified) (2 diffs)

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

@@ -22 +22 @@
         // Fill paramater array
         dp[0] = pars->scale;
-        dp[1] = pars->short_edgeA;
-        dp[2] = pars->longer_edgeB;
-        dp[3] = pars->longuest_edgeC;
+        dp[1] = pars->short_a;
+        dp[2] = pars->long_b;
+        dp[3] = pars->longer_c;
         dp[4] = pars->contrast;
         dp[5] = pars->background;
@@ -38 +38 @@
 
     //handle arg=0 separately, as sin(t)/t -> 1 as t->0
-    argA = a*ala;
-    argB = b*alb;
-    argC = c*alc;
+    argA = a*ala/2;
+    argB = b*alb/2;
+    argC = c*alc/2;
     if(argA==0.0) {
                 tmp1 = 1.0;
@@ -105 +105 @@
         double pi = 4.0*atan(1.0);
 
-        edgeA = pars->short_edgeA;
-        edgeB = pars->longer_edgeB;
-        edgeC = pars->longuest_edgeC;
+        edgeA = pars->short_a;
+        edgeB = pars->long_b;
+        edgeC = pars->longer_c;
 
 
@@ -152 +152 @@
         //normalize by cylinder volume
         //NOTE that for this (Fournet) definition of the integral, one must MULTIPLY by Vparallel
-    vol = 8*edgeA* edgeB * edgeC;
+    vol = edgeA* edgeB * edgeC;
         answer *= vol;
 

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

@@ -7 +7 @@
 /** Structure definition for Parallelepiped parameters
  * [PYTHONCLASS] = ParallelepipedModel
- * [DISP_PARAMS] = short_edgeA, longer_edgeB, longuest_edgeC,parallel_phi,parallel_psi, parallel_theta
-   [DESCRIPTION] = <text> Calculates the form factor for a rectangular solid with uniform scattering length density.
+ * [DISP_PARAMS] = short_a, long_b, longer_c,parallel_phi,parallel_psi, parallel_theta
+   [DESCRIPTION] = <text> Form factor for a rectangular solid with uniform scattering length density.
 
                 scale:Scale factor
-                short_edgeA: Shortest edge of the parallelepiped [A]
-                longer_edgeB: Longer edge of the parallelepiped [A]
-                longuest_edgeC: Longuest edge of the parallelepiped [A]
-                constrast: particle_sld - solvent_sld
+                short_a: length of short side of the parallelepiped [A]
+                long_b: length of long side of the parallelepiped [A]
+                longer_c: length of longer side of the parallelepiped [A]
+                contrast: particle_sld - solvent_sld
                 background:Incoherent Background [1/cm]
                 </text>
-        [FIXED]= <text>short_edgeA.width; longer_edgeB.width; longuest_edgeC.width;parallel_phi.width;parallel_psi.width; parallel_theta.width</text>
+        [FIXED]= <text>short_a.width; long_b.width; longer_c.width;parallel_phi.width;parallel_psi.width; parallel_theta.width</text>
         [ORIENTATION_PARAMS]= <text>parallel_phi;parallel_psi; parallel_theta; parallel_phi.width;parallel_psi.width; parallel_theta.width</text>
 
@@ -26 +26 @@
     //  [DEFAULT]=scale=1.0
     double scale;
-    /// Shortest edge of the parallelepiped [A]
-    //  [DEFAULT]=short_edgeA=35 [A]
-    double short_edgeA;
-        /// Longer edge of the parallelepiped [A]
-    //  [DEFAULT]=longer_edgeB=75 [A]
-    double longer_edgeB;
-        /// Longuest edge of the parallelepiped [A]
-    //  [DEFAULT]=longuest_edgeC=400 [A]
-    double longuest_edgeC;
+    ///  Length of short side of the parallelepiped [A]
+    //  [DEFAULT]=short_a=35 [A]
+    double short_a;
+        /// Length of long side edge of the parallelepiped [A]
+    //  [DEFAULT]=long_b=75 [A]
+    double long_b;
+        /// Length of longer side of the parallelepiped [A]
+    //  [DEFAULT]=longer_c=400 [A]
+    double longer_c;
     /// Contrast [1/A²]
     //  [DEFAULT]=contrast=5.3e-6 [1/A²]