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

Timestamp:

Oct 8, 2010 2:42:07 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:

d2d815d

Parents:

94a3f8f

Message:

new models

Location:

sansmodels/src/sans/models/c_models

Files:

• CBCCrystalModel.cpp (added)
• CFCCrystalModel.cpp (added)
• CLamellarPCrystalModel.cpp (added)
• CSCCrystalModel.cpp (added)
• bcc.cpp (added)
• c_models.cpp (modified) (4 diffs)
• fcc.cpp (added)
• models.hh (modified) (2 diffs)

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

@@ -21 +21 @@
 void addCStickyHSStructure(PyObject *module);
 void addCSCCrystalModel(PyObject *module);
+void addCFCCrystalModel(PyObject *module);
+void addCBCCrystalModel(PyObject *module);
 void addCSquareWellStructure(PyObject *module);
 void addCHayterMSAStructure(PyObject *module);
@@ -34 +36 @@
 void addCLamellarPSModel(PyObject *module);
 void addCLamellarPSHGModel(PyObject *module);
+void addCLamellarPCrystalModel(PyObject *module);
 void addCCoreShellEllipsoidModel(PyObject *module);
 void addCDiamEllipFunc(PyObject *module);
@@ -231 +234 @@
         addCStickyHSStructure(m);
         addCSCCrystalModel(m);
+        addCFCCrystalModel(m);
+        addCBCCrystalModel(m);
         addCSquareWellStructure(m);
         addCHayterMSAStructure(m);
@@ -240 +245 @@
         addCLamellarPSModel(m);
         addCLamellarPSHGModel(m);
+        addCLamellarPCrystalModel(m);
         addCCoreShellEllipsoidModel(m);
         addCDiamEllipFunc(m);

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

@@ -303 +303 @@
         // Constructor
         SCCrystalModel();
+
+        // 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:
+        // Model parameters
+        Parameter scale;
+        Parameter dnn;
+        Parameter d_factor;
+        Parameter radius;
+        Parameter sldSph;
+        Parameter sldSolv;
+        Parameter background;
+        Parameter theta;
+        Parameter phi;
+        Parameter psi;
+
+        // Constructor
+        FCCrystalModel();
+
+        // 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 BCCrystalModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter dnn;
+        Parameter d_factor;
+        Parameter radius;
+        Parameter sldSph;
+        Parameter sldSolv;
+        Parameter background;
+        Parameter theta;
+        Parameter phi;
+        Parameter psi;
+
+        // Constructor
+        BCCrystalModel();
 
         // Operators to get I(Q)
@@ -736 +786 @@
 };
 
+
+class LamellarPCrystalModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter thickness;
+        Parameter Nlayers;
+        Parameter spacing;
+        Parameter pd_spacing;
+        Parameter sld_layer;
+        Parameter sld_solvent;
+        Parameter background;
+
+        // Constructor
+        LamellarPCrystalModel();
+
+        // 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 CoreShellEllipsoidModel{
 public: