Changeset 0ba3b08 in sasview for sansmodels/src/c_extensions/Hardsphere.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/Hardsphere.h (modified) (1 diff)

sansmodels/src/c_extensions/Hardsphere.h

@@ -1 +1 @@
 #if !defined(Hardsphere_h)
 #define Hardsphere_h
+#include "parameters.hh"
 
 /**
  * Structure definition for HardsphereStructure (factor) parameters
  */
- //[PYTHONCLASS] = HardsphereStructure
- //[DISP_PARAMS] = effect_radius
- //[DESCRIPTION] =<text>Structure factor for interacting particles:                   .
- //
- //  The interparticle potential is
- //
- //                     U(r)= inf   , r < 2R
- //                         = 0     , r >= 2R
- //
- //                                             R: effective radius of the Hardsphere particle
- //                                             V:The volume fraction
- //
- //    Ref: Percus., J. K.,etc., J. Phy.
- //     Rev. 1958, 110, 1.
- //      </text>
- //[FIXED]= effect_radius.width
+//[PYTHONCLASS] = HardsphereStructure
+//[DISP_PARAMS] = effect_radius
+//[DESCRIPTION] =<text>Structure factor for interacting particles:                   .
+//
+//  The interparticle potential is
+//
+//                     U(r)= inf   , r < 2R
+//                         = 0     , r >= 2R
+//
+//                                              R: effective radius of the Hardsphere particle
+//                                              V:The volume fraction
+//
+//    Ref: Percus., J. K.,etc., J. Phy.
+//     Rev. 1958, 110, 1.
+//       </text>
+//[FIXED]= effect_radius.width
 
+class HardsphereStructure{
+public:
+  // Model parameters
+  /// effect radius of hardsphere [A]
+  //  [DEFAULT]=effect_radius=50.0 [A]
+  Parameter effect_radius;
 
-typedef struct {
-    /// effect radius of hardsphere [A]
-    //  [DEFAULT]=effect_radius=50.0 [A]
-    double effect_radius;
+  /// Volume fraction
+  //  [DEFAULT]=volfraction= 0.2
+  Parameter volfraction;
 
-    /// Volume fraction
-    //  [DEFAULT]=volfraction= 0.2
-    double volfraction;
-} HardsphereParameters;
+  // Constructor
+  HardsphereStructure();
 
-
-
-/// 1D scattering function
-//double Hardsphere_analytical_1D(HardsphereParameters *pars, double q);
-
-/// 2D scattering function
-//double Hardsphere_analytical_2D(HardsphereParameters *pars, double q, double phi);
-//double Hardsphere_analytical_2DXY(HardsphereParameters *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