Changeset 8c8cb05 in sasview

Timestamp:

Jul 22, 2011 6:35:48 PM (13 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:

ca153ba

Parents:

204d0fa

Message:

new model pre.

Location:

sansmodels/src/sans/models

Files:

• c_extensions/libmultifunc/libfunc.c (added)
• c_extensions/libmultifunc/libfunc.h (added)
• c_extensions/pearlnecklace.c (added)
• c_extensions/pearlnecklace.h (added)
• c_models/c_models.cpp (modified) (2 diffs)
• c_models/models.hh (modified) (1 diff)
• c_models/pearlnecklace.cpp (added)

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

@@ -20 +20 @@
 void addCSphereSLDModel(PyObject *module);
 void addCOnionModel(PyObject *module);
+void addCPearlNecklaceModel(PyObject *module);
 void addCReflModel(PyObject *module);
 void addCReflAdvModel(PyObject *module);
@@ -282 +283 @@
         addCDiamCylFunc(m);
         addCSLDCalFunc(m);
-
-//      addCOblateModel(m);
-//      addCProlateModel(m);
+        addCPearlNecklaceModel(m);
         addCLamellarModel(m);
         addCLamellarFFHGModel(m);

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

@@ -562 +562 @@
 
 
+class PearlNecklaceModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter radius;
+        Parameter edge_separation;
+        Parameter thick_string;
+        Parameter num_pearls;
+        Parameter sld_pearl;
+        Parameter sld_string;
+        Parameter sld_solv;
+        Parameter background;
+
+        // Constructor
+        PearlNecklaceModel();
+
+        // 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);
+};
+
 class FCCrystalModel{
 public: