Changeset 0f5bc9f in sasview for sansmodels/src/sans/models/c_models/models.hh

Timestamp:

Aug 19, 2008 2:42:22 PM (16 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:

d30fdde

Parents:

a86bbe9

Message:

Update of all C models to the new style of C++ models

File:

• sansmodels/src/sans/models/c_models/models.hh (modified) (3 diffs)

sansmodels/src/sans/models/c_models/models.hh

@@ -24 +24 @@
 
 class CylinderModel{
-
 public:
         // Model parameters
@@ -34 +33 @@
         Parameter cyl_theta;
         Parameter cyl_phi;
-        // TODO: replace this by an array of parameters
 
         // Constructor
@@ -45 +43 @@
 };
 
+class SphereModel{
+public:
+        // Model parameters
+        Parameter radius;
+        Parameter scale;
+        Parameter contrast;
+        Parameter background;
+
+        // Constructor
+        SphereModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class CoreShellModel{
+public:
+        // Model parameters
+        Parameter radius;
+        Parameter scale;
+        Parameter thickness;
+        Parameter core_sld;
+        Parameter shell_sld;
+        Parameter solvent_sld;
+        Parameter background;
+
+        // Constructor
+        CoreShellModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class CoreShellCylinderModel{
+public:
+        // Model parameters
+        Parameter radius;
+        Parameter scale;
+        Parameter thickness;
+        Parameter length;
+        Parameter core_sld;
+        Parameter shell_sld;
+        Parameter solvent_sld;
+        Parameter background;
+        Parameter axis_theta;
+        Parameter axis_phi;
+
+        // Constructor
+        CoreShellCylinderModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class EllipsoidModel{
+public:
+        // Model parameters
+        Parameter radius_a;
+        Parameter scale;
+        Parameter radius_b;
+        Parameter contrast;
+        Parameter background;
+        Parameter axis_theta;
+        Parameter axis_phi;
+
+        // Constructor
+        EllipsoidModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class EllipticalCylinderModel{
+public:
+        // Model parameters
+        Parameter r_minor;
+        Parameter scale;
+        Parameter r_ratio;
+        Parameter length;
+        Parameter contrast;
+        Parameter background;
+        Parameter cyl_theta;
+        Parameter cyl_phi;
+        Parameter cyl_psi;
+
+        // Constructor
+        EllipticalCylinderModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
 #endif