Changeset a9dec92 in sasview

Timestamp:

Aug 6, 2008 2:39:35 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:

6fc9a2a

Parents:

d53bc33

Message:

update to sans model functors

Location:

sansmodels/src/sans/models/c_extensions

Files:

• models.cpp (modified) (2 diffs)
• models.h (modified) (1 diff)

sansmodels/src/sans/models/c_extensions/models.cpp

@@ -10 +10 @@
 extern "C" {
         #include "libCylinder.h"
+        #include "cylinder.h"
 }
 
-Cylindser :: Cylinder() {
-        scale = 1.0;
-        radius = 10.0;
-        length = 400.0;
-        contrast = 1.0;
-        background = 0;
+Cylinder :: Cylinder() {
+        parameters.scale      = 1.0;
+        parameters.radius     = 10.0;
+        parameters.length     = 400.0;
+        parameters.contrast   = 1.0;
+        parameters.background = 0;
+        parameters.cyl_theta  = 0;
+        parameters.cyl_phi    = 0;
 }
 
+/**
+ * Function to evaluate 1D scattering function
+ * @param q: q-value
+ * @return: function value
+ */
 double Cylinder :: operator()(double q) {
-        double dp[5];
-        // Fill paramater array
-        dp[0] = scale;
-        dp[1] = radius;
-        dp[2] = length;
-        dp[3] = contrast;
-        dp[4] = background;
+        return cylinder_analytical_1D(&parameters, q);
+}
 
-        // Call library function to evaluate model
-        return CylinderForm(dp, q);
+/**
+ * Function to evaluate 2D scattering function
+ * @param q_x: value of Q along x
+ * @param q_y: value of Q along y
+ * @return: function value
+ */
+double Cylinder :: operator()(double qx, double qy) {
+        return cylinder_analytical_2DXY(&parameters, qx, qy);
 }
 
@@ -37 +46 @@
         Cylinder c = Cylinder();
         printf("I(Q=%g) = %g\n", 0.001, c(0.001));
+        printf("I(Qx=%g, Qy=%g) = %g\n", 0.001, 0.001, c(0.001, 0.001));
         return 0;
 }

sansmodels/src/sans/models/c_extensions/models.h

@@ -2 +2 @@
 #define MODEL_CLASS_H
 
+extern "C" {
+        #include "cylinder.h"
+}
 
-class Cylinder{
-private:
-        double scale;
-        double radius;
-        double length;
-        double contrast;
-        double background;
+class Cylinder {
+
 public:
+        // Model parameters
+        CylinderParameters parameters;
+
+        // Constructor
         Cylinder();
+
+        // Operators to get I(Q)
         double operator()(double q);
+        double operator()(double qx, double qy);
+
 };