Changeset 011e0e4 in sasview for sansmodels/src/c_extensions/corefourshell.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/corefourshell.h (modified) (1 diff)

sansmodels/src/c_extensions/corefourshell.h

@@ -1 +1 @@
 #if !defined(corefourshell_h)
 #define corefourshell_h
+#include "parameters.hh"
 
 /**
  * Structure definition for sphere parameters
  */
- //[PYTHONCLASS] = CoreFourShellModel
- //[DISP_PARAMS] = rad_core0, thick_shell1,thick_shell2,thick_shell3,thick_shell4
- //[DESCRIPTION] =<text> Calculates the scattering intensity from a core-4 shell structure.
- //                     scale = scale factor * volume fraction
- //                             rad_core0: the radius of the core
- //                             sld_core0: the SLD of the core
- //                             thick_shelli: the thickness of the i'th shell from the core
- //                             sld_shelli: the SLD of the i'th shell from the core
- //                             sld_solv: the SLD of the solvent
- //                             background: incoherent background
- //             </text>
- //[FIXED]=<text>  thick_shell4.width; thick_shell1.width;thick_shell2.width;thick_shell3.width;rad_core0.width </text>
- //[ORIENTATION_PARAMS]= <text> </text>
+//[PYTHONCLASS] = CoreFourShellModel
+//[DISP_PARAMS] = rad_core0, thick_shell1,thick_shell2,thick_shell3,thick_shell4
+//[DESCRIPTION] =<text> Calculates the scattering intensity from a core-4 shell structure.
+//                      scale = scale factor * volume fraction
+//                              rad_core0: the radius of the core
+//                              sld_core0: the SLD of the core
+//                              thick_shelli: the thickness of the i'th shell from the core
+//                              sld_shelli: the SLD of the i'th shell from the core
+//                              sld_solv: the SLD of the solvent
+//                              background: incoherent background
+//              </text>
+//[FIXED]=<text>  thick_shell4.width; thick_shell1.width;thick_shell2.width;thick_shell3.width;rad_core0.width </text>
+//[ORIENTATION_PARAMS]= <text> </text>
 
-typedef struct {
-    /// Scale factor
-    //  [DEFAULT]=scale= 1.0
-    double scale;
+class CoreFourShellModel{
+public:
+  // Model parameters
+  /// Scale factor
+  //  [DEFAULT]=scale= 1.0
+  Parameter scale;
 
-    /// Radius of the core0 [A]
-    //  [DEFAULT]=rad_core0=60. [A]
-    double rad_core0;
+  /// Radius of the core0 [A]
+  //  [DEFAULT]=rad_core0=60. [A]
+  Parameter rad_core0;
 
-    /// sld of core0 [1/A^(2)]
-    //  [DEFAULT]=sld_core0= 6.4e-6 [1/A^(2)]
-    double sld_core0;
+  /// sld of core0 [1/A^(2)]
+  //  [DEFAULT]=sld_core0= 6.4e-6 [1/A^(2)]
+  Parameter sld_core0;
 
-    /// thickness of the shell1 [A]
-     //  [DEFAULT]=thick_shell1=10.0 [A]
-    double thick_shell1;
+  /// thickness of the shell1 [A]
+  //  [DEFAULT]=thick_shell1=10.0 [A]
+  Parameter thick_shell1;
 
-     ///        sld of shell1 [1/A^(2)]
-     //  [DEFAULT]=sld_shell1= 1.0e-6 [1/A^(2)]
-     double sld_shell1;
+  ///  sld of shell1 [1/A^(2)]
+  //  [DEFAULT]=sld_shell1= 1.0e-6 [1/A^(2)]
+  Parameter sld_shell1;
 
-     ///        thickness of the shell2 [A]
-      //  [DEFAULT]=thick_shell2=10.0 [A]
-     double thick_shell2;
+  ///  thickness of the shell2 [A]
+  //  [DEFAULT]=thick_shell2=10.0 [A]
+  Parameter thick_shell2;
 
-      ///       sld of shell2 [1/A^(2)]
-      //  [DEFAULT]=sld_shell2= 2.0e-6 [1/A^(2)]
-      double sld_shell2;
+  /// sld of shell2 [1/A^(2)]
+  //  [DEFAULT]=sld_shell2= 2.0e-6 [1/A^(2)]
+  Parameter sld_shell2;
 
-      ///       thickness of the shell3 [A]
-       //  [DEFAULT]=thick_shell3=10.0 [A]
-      double thick_shell3;
+  /// thickness of the shell3 [A]
+  //  [DEFAULT]=thick_shell3=10.0 [A]
+  Parameter thick_shell3;
 
-       ///      sld of shell3 [1/A^(2)]
-       //  [DEFAULT]=sld_shell3= 3.0e-6 [1/A^(2)]
-       double sld_shell3;
+  ///  sld of shell3 [1/A^(2)]
+  //  [DEFAULT]=sld_shell3= 3.0e-6 [1/A^(2)]
+  Parameter sld_shell3;
 
-       ///      thickness of the shell4 [A]
-        //  [DEFAULT]=thick_shell4=10.0 [A]
-       double thick_shell4;
+  ///  thickness of the shell4 [A]
+  //  [DEFAULT]=thick_shell4=10.0 [A]
+  Parameter thick_shell4;
 
-        ///     sld of shell4 [1/A^(2)]
-        //  [DEFAULT]=sld_shell4= 4.0e-6 [1/A^(2)]
-        double sld_shell4;
+  /// sld of shell4 [1/A^(2)]
+  //  [DEFAULT]=sld_shell4= 4.0e-6 [1/A^(2)]
+  Parameter sld_shell4;
 
-    /// sld_solv[1/A^(2)]
-    //  [DEFAULT]=sld_solv= 6.4e-6 [1/A^(2)]
-    double sld_solv;
+  /// sld_solv[1/A^(2)]
+  //  [DEFAULT]=sld_solv= 6.4e-6 [1/A^(2)]
+  Parameter sld_solv;
 
-        /// Incoherent Background [1/cm]
-        //  [DEFAULT]=background=0.001 [1/cm]
-        double background;
-} CoreFourShellParameters;
+  /// Incoherent Background [1/cm]
+  //  [DEFAULT]=background=0.001 [1/cm]
+  Parameter background;
 
+  // Constructor
+  CoreFourShellModel();
 
-
-/// 1D scattering function
-//double corefourshell_analytical_1D(CoreFourShellParameters *pars, double q);
-
-/// 2D scattering function
-//double corefourshell_analytical_2D(CoreFourShellParameters *pars, double q, double phi);
-//double corefourshell_analytical_2DXY(CoreFourShellParameters *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