Changeset 94a3f8f in sasview for sansmodels/src/sans

Timestamp:

Oct 7, 2010 4:27:47 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:

d5b6a9d

Parents:

a1ecfc3

Message:

added simple cubic paracrystal 1d and anisotropic model; still needs more test and doc.s

Location:

sansmodels/src/sans/models

Files:

• SCCrystalModel.py (added)
• c_extensions/sc.c (added)
• c_extensions/sc.h (added)
• c_models/c_models.cpp (modified) (2 diffs)
• c_models/models.hh (modified) (1 diff)
• c_models/sc.cpp (added)

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

@@ -20 +20 @@
 void addCHardsphereStructure(PyObject *module);
 void addCStickyHSStructure(PyObject *module);
+void addCSCCrystalModel(PyObject *module);
 void addCSquareWellStructure(PyObject *module);
 void addCHayterMSAStructure(PyObject *module);
@@ -229 +230 @@
         addCHardsphereStructure(m);
         addCStickyHSStructure(m);
+        addCSCCrystalModel(m);
         addCSquareWellStructure(m);
         addCHayterMSAStructure(m);

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

@@ -278 +278 @@
         // 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);
+};
+
+
+class SCCrystalModel{
+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
+        SCCrystalModel();
 
         // Operators to get I(Q)