Changeset e2afadf in sasview for sansmodels/src/sans/models/c_extensions/hollow_cylinder.c

Timestamp:

Aug 25, 2009 1:31:36 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:

ff85cc5

Parents:

c8727c5

Message:

fixed a mistake and changed a para_name

File:

• sansmodels/src/sans/models/c_extensions/hollow_cylinder.c (modified) (5 diffs)

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

@@ -18 +18 @@
 double hollow_cylinder_analytical_1D(HollowCylinderParameters *pars, double q) {
         double dp[6];
-        
+
         dp[0] = pars->scale;
         dp[1] = pars->core_radius;
-        dp[2] = pars->shell_radius;
+        dp[2] = pars->radius;
         dp[3] = pars->length;
         dp[4] = pars->contrast;
         dp[5] = pars->background;
-        
+
         return HollowCylinder(dp, q);
 }
-    
+
 /**
  * Function to evaluate 2D scattering function
@@ -39 +39 @@
         q = sqrt(qx*qx+qy*qy);
     return hollow_cylinder_analytical_2D_scaled(pars, q, qx/q, qy/q);
-} 
+}
 
 /**
@@ -50 +50 @@
 double hollow_cylinder_analytical_2D(HollowCylinderParameters *pars, double q, double phi) {
     return hollow_cylinder_analytical_2D_scaled(pars, q, cos(phi), sin(phi));
-} 
+}
 
 /**
@@ -65 +65 @@
         double  alpha,vol, cos_val;
         double answer;
-        
+
     // Cylinder 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) {
@@ -83 +83 @@
         return 0;
     }
-    
+
         alpha = acos( cos_val );
-        
+
         // Call the IGOR library function to get the kernel
-        answer = HolCylKernel(q, pars->core_radius, pars->shell_radius, pars->length, cos_val);
-        
+        answer = HolCylKernel(q, pars->core_radius, pars->radius, pars->length, cos_val);
+
         //normalize by cylinder volume
-        vol=acos(-1.0)*((pars->core_radius *pars->core_radius)-(pars->shell_radius*pars->shell_radius))
+        vol=acos(-1.0)*((pars->core_radius *pars->core_radius)-(pars->radius*pars->radius))
                         *(pars->length);
         answer /= vol;
-        
+
         //convert to [cm-1]
         answer *= 1.0e8;
-        
+
         //Scale
         answer *= pars->scale;
-        
+
         // add in the background
         answer += pars->background;
-        
+
         return answer;
 }