Changeset 18f2ca1 in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Oct 15, 2010 6:43:06 PM (14 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:

2e862a0

Parents:

495c377

Message:

hope this was the last model left to add

Location:

sansmodels/src/sans/models/c_models

Files:

• CCSParallelepipedModel.cpp (added)
• c_models.cpp (modified) (2 diffs)
• csparallelepiped.cpp (added)
• models.hh (modified) (2 diffs)

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

@@ -16 +16 @@
 void addCTriaxialEllipsoidModel(PyObject *module);
 void addCParallelepipedModel(PyObject *module);
+void addCCSParallelepipedModel(PyObject *module);
 void addCSphereModel(PyObject *module);
 void addCOnionModel(PyObject *module);
@@ -227 +228 @@
         addCCappedCylinderModel(m);
         addCParallelepipedModel(m);
+        addCCSParallelepipedModel(m);
         addCCoreShellCylinderModel(m);
         addCCoreShellModel(m);

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

@@ -98 +98 @@
 class ParallelepipedModel{
 public:
-        // TODO: add 2D
         // Model parameters
         Parameter scale;
@@ -121 +120 @@
 };
 
+
+class CSParallelepipedModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter shortA;
+        Parameter midB;
+        Parameter longC;
+        Parameter rimA;
+        Parameter rimB;
+        Parameter rimC;
+        Parameter sld_rimA;
+        Parameter sld_rimB;
+        Parameter sld_rimC;
+        Parameter sld_pcore;
+        Parameter sld_solv;
+        Parameter background;
+        Parameter parallel_theta;
+        Parameter parallel_phi;
+        Parameter parallel_psi;
+
+        // Constructor
+        CSParallelepipedModel();
+
+        // 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 OnionModel{