Changeset 0ba3b08 in sasview for sansmodels/src/c_extensions/SquareWell.h

Timestamp:

Jan 5, 2012 12:16:29 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:

011e0e4

Parents:

bbbed8c

Message:

refactored bunch of models

File:

• sansmodels/src/c_extensions/SquareWell.h (modified) (2 diffs)

sansmodels/src/c_extensions/SquareWell.h

@@ -1 +1 @@
 #if !defined(SquareWell_h)
 #define SquareWell_h
+#include "parameters.hh"
 
 /**Structure definition for SquareWell parameters
-*/
+ */
 //   [PYTHONCLASS] = SquareWellStructure
 //   [DISP_PARAMS] = effect_radius
@@ -26 +27 @@
 //[ORIENTATION_PARAMS]= <text> </text>
 
+class SquareWellStructure{
+public:
+  // Model parameters
+  /// effective radius of particle [A]
+  //  [DEFAULT]=effect_radius=50.0 [A]
+  Parameter effect_radius;
 
-typedef struct {
-    /// effective radius of particle [A]
-    //  [DEFAULT]=effect_radius=50.0 [A]
-    double effect_radius;
+  /// Volume fraction
+  //  [DEFAULT]=volfraction= 0.040
+  Parameter volfraction;
 
-    /// Volume fraction
-    //  [DEFAULT]=volfraction= 0.040
-    double volfraction;
+  /// Well depth [kT]
+  //  [DEFAULT]=welldepth= 1.50 [kT]
+  Parameter welldepth;
 
-    /// Well depth [kT]
-    //  [DEFAULT]=welldepth= 1.50 [kT]
-    double welldepth;
+  /// Well width
+  //  [DEFAULT]=wellwidth= 1.20
+  Parameter wellwidth;
 
-    /// Well width
-    //  [DEFAULT]=wellwidth= 1.20
-    double wellwidth;
+  // Constructor
+  SquareWellStructure();
 
-} SquareWellParameters;
-
-
-
-/// 1D scattering function
-//double SquareWell_analytical_1D(SquareWellParameters *pars, double q);
-
-/// 2D scattering function
-//double SquareWell_analytical_2D(SquareWellParameters *pars, double q, double phi);
-//double SquareWell_analytical_2DXY(SquareWellParameters *pars, double qx, double qy);
+  // 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