Changeset eddff027 in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Aug 18, 2009 12:39:37 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

7df26c3

Parents:

3c102d4

Message:

added coreshellellipsoidmodel

Location:

sansmodels/src/sans/models/c_models

Files:

• CCoreShellEllipsoidModel.cpp (added)
• c_models.cpp (modified) (2 diffs)
• models.hh (modified) (2 diffs)
• spheroid.cpp (modified) (3 diffs)

sansmodels/src/sans/models/c_models/c_models.cpp

@@ -30 +30 @@
 void addCLamellarPSModel(PyObject *module);
 void addCLamellarPSHGModel(PyObject *module);
-void addCCoreShellSpheroidModel(PyObject *module);
+void addCCoreShellEllipsoidModel(PyObject *module);
 void addCOblateModel(PyObject *module);
 void addCProlateModel(PyObject *module);
@@ -226 +226 @@
         addCLamellarPSModel(m);
         addCLamellarPSHGModel(m);
-        addCCoreShellSpheroidModel(m);
+        addCCoreShellEllipsoidModel(m);
         addCOblateModel(m);
         addCProlateModel(m);

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

@@ -421 +421 @@
 };
 
-class CoreShellSpheroidModel{
+class CoreShellEllipsoidModel{
 public:
         // Model parameters
@@ -436 +436 @@
 
         // Constructor
-        CoreShellSpheroidModel();
+        CoreShellEllipsoidModel();
 
         // Operators to get I(Q)

sansmodels/src/sans/models/c_models/spheroid.cpp

@@ -32 +32 @@
 }
 
-CoreShellSpheroidModel :: CoreShellSpheroidModel() {
+CoreShellEllipsoidModel :: CoreShellEllipsoidModel() {
         scale      = Parameter(1.0);
         equat_core     = Parameter(200.0, true);
@@ -56 +56 @@
  * @return: function value
  */
-double CoreShellSpheroidModel :: operator()(double q) {
+double CoreShellEllipsoidModel :: operator()(double q) {
         double dp[8];
 
@@ -139 +139 @@
  * @return: function value
  */
-double CoreShellSpheroidModel :: evaluate_rphi(double q, double phi) {
+double CoreShellEllipsoidModel :: evaluate_rphi(double q, double phi) {
         return (*this).operator()(q);
 }
 
 
-double CoreShellSpheroidModel :: operator()(double qx, double qy) {
+double CoreShellEllipsoidModel :: operator()(double qx, double qy) {
         SpheroidParameters dp;
         // Fill parameter array