Changeset ea07075 in sasview for sansmodels/src/sans/models/c_extensions/flexible_cylinder.h

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

File:

• sansmodels/src/sans/models/c_extensions/flexible_cylinder.h (modified) (3 diffs)

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