Changeset a8eab1c in sasview for sansmodels/src/c_models

Timestamp:

Jan 5, 2012 11:05:33 AM (12 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:

37805e9

Parents:

dd60b45

Message:

refactor sphere model

Location:

sansmodels/src/c_models

Files:

• models.hh (modified) (1 diff)
• sphere.cpp (modified) (1 diff)

sansmodels/src/c_models/models.hh

@@ -29 +29 @@
 
 
-
-class SphereModel{
-public:
-        // Model parameters
-        Parameter radius;
-        Parameter scale;
-        Parameter sldSph;
-        Parameter sldSolv;
-        Parameter background;
-
-        // Constructor
-        SphereModel();
-
-        // 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);
-};
 
 

sansmodels/src/c_models/sphere.cpp

@@ -25 +25 @@
 #include <stdio.h>
 using namespace std;
+#include "sphere.h"
 
 extern "C" {
         #include "libSphere.h"
-        #include "sphere.h"
 }