Changeset 0c2389e in sasview for sansmodels/src/c_extensions

Timestamp:

Jan 4, 2012 6:00:52 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

8343e18

Parents:

dbddbf5

Message:

refactored capped cylinder

Location:

sansmodels/src/c_extensions

Files:

• capcyl.c (deleted)
• capcyl.h (modified) (2 diffs)

sansmodels/src/c_extensions/capcyl.h

@@ -1 +1 @@
 #if !defined(capcyl_h)
 #define capcyl_h
+#include "parameters.hh"
 
 /**
@@ -27 +28 @@
  //[ORIENTATION_PARAMS]= <text> phi; theta; phi.width; theta.width</text>
 
-typedef struct {
-    /// Scale factor
-    //  [DEFAULT]=scale= 1.0
-    double scale;
+class CappedCylinderModel{
+public:
+  // Model parameters
+  /// Scale factor
+  //  [DEFAULT]=scale= 1.0
+  Parameter scale;
 
-    /// rad_cyl [A]
-    //  [DEFAULT]=rad_cyl=20.0 [A]
-    double rad_cyl;
+  /// rad_cyl [A]
+  //  [DEFAULT]=rad_cyl=20.0 [A]
+  Parameter rad_cyl;
 
-    /// length of the cylinder
-    //  [DEFAULT]=len_cyl=400.0 [A]
-    double len_cyl;
+  /// length of the cylinder
+  //  [DEFAULT]=len_cyl=400.0 [A]
+  Parameter len_cyl;
 
-    /// Radius of sphere [A]
-    //  [DEFAULT]=rad_cap=40.0 [A]
-    double rad_cap;
+  /// Radius of sphere [A]
+  //  [DEFAULT]=rad_cap=40.0 [A]
+  Parameter rad_cap;
 
-    /// sld_capcyl [1/A^(2)]
-    //  [DEFAULT]=sld_capcyl= 1.0e-6 [1/A^(2)]
-    double sld_capcyl;
+  /// sld_capcyl [1/A^(2)]
+  //  [DEFAULT]=sld_capcyl= 1.0e-6 [1/A^(2)]
+  Parameter sld_capcyl;
 
-    /// sld_solv [1/A^(2)]
-    //  [DEFAULT]=sld_solv= 6.3e-6 [1/A^(2)]
-    double sld_solv;
+  /// sld_solv [1/A^(2)]
+  //  [DEFAULT]=sld_solv= 6.3e-6 [1/A^(2)]
+  Parameter sld_solv;
 
-        /// Incoherent Background [1/cm]
-        //  [DEFAULT]=background=0.0 [1/cm]
-        double background;
+  /// Incoherent Background [1/cm]
+  //  [DEFAULT]=background=0.0 [1/cm]
+  Parameter background;
 
-    /// Angle of the main axis against z-axis in detector plane [deg]
-    //  [DEFAULT]=theta=0.0 [deg]
-    double theta;
-    /// Azimuthal angle around z-axis in detector plane [deg]
-    //  [DEFAULT]=phi=0.0 [deg]
-    double phi;
+  /// Angle of the main axis against z-axis in detector plane [deg]
+  //  [DEFAULT]=theta=0.0 [deg]
+  Parameter theta;
 
-} CapCylParameters;
+  /// Azimuthal angle around z-axis in detector plane [deg]
+  //  [DEFAULT]=phi=0.0 [deg]
+  Parameter phi;
 
+  // Constructor
+  CappedCylinderModel();
 
-
-/// 1D scattering function
-double capcyl_analytical_1D(CapCylParameters *pars, double q);
-
-/// 2D scattering function
-double capcyl_analytical_2D(CapCylParameters *pars, double q, double phi);
-double capcyl_analytical_2DXY(CapCylParameters *pars, double qx, double qy);
-double capcyl_analytical_2D_scaled(CapCylParameters *pars, double q, double q_x, double q_y);
+  // Operators to get I(Q)
+  double operator()(double q);
+  double operator()(double qx, double qy);
+  double calculate_ER();
+  double evaluate_rphi(double q, double phi);
+};
 
 #endif