Changeset 44aa1ed in sasview

Timestamp:

Aug 21, 2009 4:14:53 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:

2339ff1e

Parents:

14c3887

Message:

corrected axis input mistake

File:

• sansmodels/src/sans/models/c_extensions/ellipsoid.c (modified) (8 diffs)

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

@@ -11 +11 @@
 /**
  * Test kernel for validation
- * 
+ *
  * @param q: q-value
  * @param r_small: small axis length
@@ -23 +23 @@
         double cos_alpha;
         double sph_func;
-        
+
         sin_alpha = sin(angle);
         cos_alpha = cos(angle);
-        
+
         // Modified length for phase
-        length = r_small*sqrt(sin_alpha*sin_alpha + 
+        length = r_small*sqrt(sin_alpha*sin_alpha +
                         r_long*r_long/(r_small*r_small)*cos_alpha*cos_alpha);
-        
+
         // Spherical scattering ampliture, with modified length for ellipsoid
         sph_func = 3*( sin(q*length) - q*length*cos(q*length) ) / (q*q*q*length*length*length);
-        
+
         return sph_func*sph_func;
 }
@@ -45 +45 @@
 double ellipsoid_analytical_1D(EllipsoidParameters *pars, double q) {
         double dp[5];
-        
+
         dp[0] = pars->scale;
         dp[1] = pars->radius_a;
@@ -51 +51 @@
         dp[3] = pars->contrast;
         dp[4] = pars->background;
-        
+
         return EllipsoidForm(dp, q);
 }
-    
+
 /**
  * Function to evaluate 2D scattering function
@@ -65 +65 @@
         q = sqrt(qx*qx+qy*qy);
     return ellipsoid_analytical_2D_scaled(pars, q, qx/q, qy/q);
-} 
+}
 
 /**
@@ -76 +76 @@
 double ellipsoid_analytical_2D(EllipsoidParameters *pars, double q, double phi) {
     return ellipsoid_analytical_2D_scaled(pars, q, cos(phi), sin(phi));
-} 
+}
 
 /**
@@ -91 +91 @@
         double theta, alpha, f, vol, sin_val, cos_val;
         double answer;
-        
+
     // Ellipsoid orientation
     cyl_x = sin(pars->axis_theta) * cos(pars->axis_phi);
     cyl_y = sin(pars->axis_theta) * sin(pars->axis_phi);
     cyl_z = cos(pars->axis_theta);
-     
+
     // q vector
     q_z = 0;
-        
+
     // Compute the angle btw vector q and the
     // axis of the cylinder
     cos_val = cyl_x*q_x + cyl_y*q_y + cyl_z*q_z;
-    
+
     // The following test should always pass
     if (fabs(cos_val)>1.0) {
@@ -109 +109 @@
         return 0;
     }
-    
+
     // Angle between rotation axis and q vector
         alpha = acos( cos_val );
-        
+
         // Call the IGOR library function to get the kernel
-        answer = EllipsoidKernel(q, pars->radius_b, pars->radius_a, cos_val);
-        
+        answer = EllipsoidKernel(q, pars->radius_a, pars->radius_b, cos_val);
+
         // Multiply by contrast^2
         answer *= pars->contrast*pars->contrast;
-        
+
         //normalize by cylinder volume
     vol = 4.0/3.0 * acos(-1.0) * pars->radius_b * pars->radius_b * pars->radius_a;
         answer *= vol;
-        
+
         //convert to [cm-1]
         answer *= 1.0e8;
-        
+
         //Scale
         answer *= pars->scale;
-        
+
         // add in the background
         answer += pars->background;
-        
+
         return answer;
 }