Changeset 011e0e4 in sasview for sansmodels/src/c_extensions/core_shell.h

Timestamp:

Jan 5, 2012 2:23:15 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:

98fdccd

Parents:

0ba3b08

Message:

core-shell + ellipsoid refactor

File:

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

sansmodels/src/c_extensions/core_shell.h

@@ -1 +1 @@
 #if !defined(core_shell_h)
 #define core_shell_h
+#include "parameters.hh"
 
 /**
@@ -21 +22 @@
 
 
-typedef struct {
-    /// Scale factor
-    //  [DEFAULT]=scale=1.0
-    double scale;
-    /// Core Radius [A] 60.0
-    //  [DEFAULT]=radius=60.0 [A]
-    double radius;
-    /// Shell Thickness [A] 10.0
-    //  [DEFAULT]=thickness=10 [A]
-    double thickness;
-    /// Core SLD [1/A^(2)] 1.0e-6
-    //  [DEFAULT]=core_sld=1.0e-6 [1/A^(2)]
-    double core_sld;
-        /// Shell SLD [1/A^(2)] 2.0e-6
-        //  [DEFAULT]=shell_sld=2.0e-6 [1/A^(2)]
-        double shell_sld;
-        /// Solvent SLD [1/A^(2)] 3.0e-6
-        //  [DEFAULT]=solvent_sld=3.0e-6 [1/A^(2)]
-        double solvent_sld;
-        /// Incoherent Background [1/cm] 0.000
-        //  [DEFAULT]=background=0 [1/cm]
-        double background;
-} CoreShellParameters;
+class CoreShellModel{
+public:
+  // Model parameters
+
+  /// Core Radius [A] 60.0
+  //  [DEFAULT]=radius=60.0 [A]
+  Parameter radius;
+  /// Scale factor
+  //  [DEFAULT]=scale=1.0
+  Parameter scale;
+  /// Shell Thickness [A] 10.0
+  //  [DEFAULT]=thickness=10 [A]
+  Parameter thickness;
+  /// Core SLD [1/A^(2)] 1.0e-6
+  //  [DEFAULT]=core_sld=1.0e-6 [1/A^(2)]
+  Parameter core_sld;
+/// Shell SLD [1/A^(2)] 2.0e-6
+//  [DEFAULT]=shell_sld=2.0e-6 [1/A^(2)]
+  Parameter shell_sld;
+/// Solvent SLD [1/A^(2)] 3.0e-6
+//  [DEFAULT]=solvent_sld=3.0e-6 [1/A^(2)]
+  Parameter solvent_sld;
+/// Incoherent Background [1/cm] 0.000
+//  [DEFAULT]=background=0 [1/cm]
+  Parameter background;
+
+  // Constructor
+  CoreShellModel();
+
+  // 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);
+};
 
 
-
-/// 1D scattering function
-//double core_shell_analytical_1D(CoreShellParameters *pars, double q);
-
-/// 2D scattering function
-//double core_shell_analytical_2D(CoreShellParameters *pars, double q, double phi);
-//double core_shell_analytical_2DXY(CoreShellParameters *pars, double qx, double qy);
-
 #endif