Changeset 8a48713 in sasview for sansmodels/src

Timestamp:

Jun 23, 2009 2:19:50 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

f41b4c3

Parents:

3b9e023

Message:

implement 1D for parallelepiped model

Location:

sansmodels/src/sans/models

Files:

• ParallelepipedModel.py (added)
• c_extensions/CParallelepipedModel.c (added)
• c_extensions/c_models.c (modified) (1 diff)
• c_extensions/parallelepiped.c (added)
• c_extensions/parallelepiped.h (added)
• c_models/CParallelepipedModel.cpp (added)
• c_models/c_models.cpp (modified) (2 diffs)
• c_models/models.hh (modified) (2 diffs)
• c_models/parallelepiped.cpp (added)

sansmodels/src/sans/models/c_extensions/c_models.c

@@ -27 +27 @@
 
         addCCylinderModel(m);
+        addCParallelepipedModel(m);
         addCCoreShellCylinderModel(m);
         addCCoreShellModel(m);

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

@@ -9 +9 @@
 
 void addCCylinderModel(PyObject *module);
+void addCParallelepipedModel(PyObject *module);
 void addCSphereModel(PyObject *module);
 void addCHardsphereStructure(PyObject *module);
@@ -148 +149 @@
 
         addCCylinderModel(m);
+        addCParallelepipedModel(m);
         addCCoreShellCylinderModel(m);
         addCCoreShellModel(m);

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

@@ -19 +19 @@
 extern "C" {
         #include "cylinder.h"
+        #include "parallelepiped.h"
 }
 
@@ -42 +43 @@
         double evaluate_rphi(double q, double phi);
 };
+
+class ParallelepipedModel{
+public:
+        // TODO: add 2D 
+        // Model parameters
+        Parameter scale;
+        Parameter short_edgeA;
+        Parameter longer_edgeB;
+        Parameter longuest_edgeC;
+        Parameter contrast;
+        Parameter background;
+        Parameter parallel_theta;
+        Parameter parallel_phi;
+
+        // Constructor
+        ParallelepipedModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
 
 class SphereModel{