Changeset ea07075 in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

Aug 3, 2009 5:41:22 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:

e6fa43e

Parents:

2a1be2d9

Message:

done corrections and 2d extension on this model function

Location:

sansmodels/src/sans/models/c_extensions

Files:

• flexible_cylinder.c (modified) (4 diffs)
• flexible_cylinder.h (modified) (3 diffs)

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

@@ -19 +19 @@
 double flexible_cylinder_analytical_1D(FlexibleCylinderParameters *pars, double q) {
         double dp[6];
-        
+
         // Fill paramater array
         dp[0] = pars->scale;
@@ -29 +29 @@
 
         // Call library function to evaluate model
-        return FlexExclVolCyl(dp, q);   
+        return FlexExclVolCyl(dp, q);
 }
 /**
@@ -40 +40 @@
         double q;
         q = sqrt(qx*qx+qy*qy);
-    return flexible_cylinder_analytical_2D_scaled(pars, q, qx/q, qy/q);
-} 
+    return flexible_cylinder_analytical_1D(pars, q);
+}
 
 
@@ -52 +52 @@
  */
 double flexible_cylinder_analytical_2D(FlexibleCylinderParameters *pars, double q, double phi) {
-    return flexible_cylinder_analytical_2D_scaled(pars, q, cos(phi), sin(phi));
-} 
-        
-/**
- * Function to evaluate 2D scattering function
- * @param pars: parameters of the flexible cylinder
- * @param q: q-value
- * @param q_x: q_x / q
- * @param q_y: q_y / q
- * @return: function value
- */
-double flexible_cylinder_analytical_2D_scaled(FlexibleCylinderParameters *pars, double q, double q_x, double q_y) {
-        double cyl_x, cyl_y, cyl_z;
-        double q_z;
-        double alpha, vol, cos_val;
-        double answer;
-        
-        
+    return flexible_cylinder_analytical_1D(pars, q);
+}
 
-    // parallelepiped 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 parallelepiped
-    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) {
-        printf("parallel_ana_2D: Unexpected error: cos(alpha)>1\n");
-        return 0;
-    }
-    
-    // Note: cos(alpha) = 0 and 1 will get an
-    // undefined value from PPKernel
-        alpha = acos( cos_val );
 
-        // Call the IGOR library function to get the kernel
-        answer = CylKernel(q, pars->radius, pars->length/2.0, alpha) / sin(alpha);
-        
-        // Multiply by contrast^2
-        answer *= pars->contrast*pars->contrast;
-        
-        //normalize by cylinder volume
-        //NOTE that for this (Fournet) definition of the integral, one must MULTIPLY by Vparallel
-    vol = acos(-1.0) * 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;
-}
-    
-

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

@@ -7 +7 @@
 /** Structure definition for Flexible cylinder parameters
  * [PYTHONCLASS] = FlexibleCylinderModel
- * [DISP_PARAMS] = length, radius, axis_theta, axis_phi
-   [DESCRIPTION] = <text> Note : scale and contrast are both multiplicative factors in the model and are perfectly
-                        correlated. One or both of these parameters must be held fixed during model fitting.
+ * [DISP_PARAMS] = length, kuhn_length, radius
+   [DESCRIPTION] = <text> Note : 'scale' and 'contrast' are both multiplicative factors in the
+                model and are perfectly correlated. One or
+                both of these parameters must be held fixed
+                during model fitting.
                 </text>
-        [FIXED]= <text>length.width; radius.width; axis_theta.width; axis_phi.width</text>
-        [ORIENTATION_PARAMS]= <text>axis_phi; axis_theta; axis_phi.width; axis_theta.width</text>
+        [FIXED]= <text>length.width; radius.width; , kuhn_length.width</text>
+        [ORIENTATION_PARAMS]= <text></text>
 
 
@@ -32 +34 @@
     //  [DEFAULT]=contrast=5.3e-6 [1/A²]
     double contrast;
-        /// Incoherent Background [1/cm] 
+        /// Incoherent Background [1/cm]
         //  [DEFAULT]=background=0.0001 [1/cm]
         double background;
-    /// Orientation of the flexible cylinder axis w/respect incoming beam [rad]
-    //  [DEFAULT]=axis_theta=1.0 [rad]
-    double axis_theta;
-    /// Orientation of the flexible cylinder in the plane of the detector [rad]
-    //  [DEFAULT]=axis_phi=1.0 [rad]
-    double axis_phi;
 
 
@@ -53 +49 @@
 double flexible_cylinder_analytical_2D(FlexibleCylinderParameters *pars, double q, double phi);
 double flexible_cylinder_analytical_2DXY(FlexibleCylinderParameters *pars, double qx, double qy);
-double flexible_cylinder_analytical_2D_scaled(FlexibleCylinderParameters *pars, double q, double q_x, double q_y);
 
 #endif