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

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.

File:

• sansmodels/src/sans/models/c_extensions/parallelepiped.c (modified) (4 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;