Changeset 5068697 in sasview for sansmodels/src/sans

Timestamp:

Jun 26, 2009 5:49:03 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:

27a0771

Parents:

f41b4c3

Message:

add 1d models

Location:

sansmodels/src/sans/models

Files:

• FlexibleCylinderModel.py (added)
• ParallelepipedModel.py (modified) (1 diff)
• StackedDisksModel.py (added)
• StakedDisksModel.py (added)
• TriaxialEllipsoidModel.py (added)
• c_extensions/c_models.c (modified) (1 diff)
• c_extensions/flexible_cylinder.c (added)
• c_extensions/flexible_cylinder.h (added)
• c_extensions/parallelepiped.c (modified) (2 diffs)
• c_extensions/parallelepiped.h (modified) (1 diff)
• c_extensions/stacked_disks.c (added)
• c_extensions/stacked_disks.h (added)
• c_extensions/stakeddisks.c (added)
• c_extensions/triaxial_ellipsoid.c (added)
• c_extensions/triaxial_ellipsoid.h (added)
• c_models/CFlexibleCylinderModel.cpp (added)
• c_models/CStackedDisksModel.cpp (added)
• c_models/CStakedDisksModel.cpp (added)
• c_models/CTriaxialEllipsoidModel.cpp (added)
• c_models/c_models.cpp (modified) (2 diffs)
• c_models/flexiblecylinder.cpp (added)
• c_models/models.hh (modified) (1 diff)
• c_models/stackeddisks.cpp (added)
• c_models/triaxialellipsoid.cpp (added)

sansmodels/src/sans/models/ParallelepipedModel.py

@@ -74 +74 @@
 
                 ## fittable parameters
-        self.fixed=['short_edgeA.width', 'longer_edgeB.width', 'longuest_edgeC.width']
+        self.fixed=['short_edgeA.width', 'longer_edgeB.width', 'longuest_edgeC.width', 'parallel_phi.width', 'parallel_theta.width']
         
         ## parameters with orientation

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

@@ -39 +39 @@
         addCDiamCylFunc(m);
         addCEllipticalCylinderModel(m);
+        addCTriaxialEllipsoidModel(m);
+        addCFlexibleCylinderModel(m);
+        addCStackedDisksModel(m);
         addDisperser(m);
         addCGaussian(m);

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

@@ -13 +13 @@
 /**
  * Function to evaluate 1D scattering function
- * @param pars: parameters of the cylinder
+ * @param pars: parameters of the parallelepiped
  * @param q: q-value
  * @return: function value
@@ -33 +33 @@
 /**
  * Function to evaluate 2D scattering function
- * @param pars: parameters of the cylinder
+ * @param pars: parameters of the parallelepiped
  * @param q: q-value
  * @return: function value

sansmodels/src/sans/models/c_extensions/parallelepiped.h

@@ -17 +17 @@
                 background:Incoherent Background [1/cm] 
                 </text>
-        [FIXED]= <text>short_edgeA.width; longer_edgeB.width; longuest_edgeC.width</text>
+        [FIXED]= <text>short_edgeA.width; longer_edgeB.width; longuest_edgeC.width;parallel_phi.width; parallel_theta.width</text>
         [ORIENTATION_PARAMS]= <text>parallel_phi; parallel_theta; parallel_phi.width; parallel_theta.width</text>
 

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

@@ -21 +21 @@
 void addCEllipsoidModel(PyObject *module);
 void addCEllipticalCylinderModel(PyObject *module);
+void addCTriaxialEllipsoidModel(PyObject *module);
+void addCFlexibleCylinderModel(PyObject *module);
+void addCStackedDisksModel(PyObject *module);
 
 extern "C" {
@@ -161 +164 @@
         addCDiamCylFunc(m);
         addCEllipticalCylinderModel(m);
+        addCTriaxialEllipsoidModel(m);
+        addCFlexibleCylinderModel(m);
+        addCStackedDisksModel(m);
         addDisperser(m);
         addCGaussian(m);

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

@@ -267 +267 @@
 };
 
+class TriaxialEllipsoidModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter semi_axisA;
+        Parameter semi_axisB;
+        Parameter semi_axisC;
+        Parameter contrast;
+        Parameter background;
+        Parameter axis_theta;
+        Parameter axis_phi;
+        
+        // Constructor
+        TriaxialEllipsoidModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class FlexibleCylinderModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter length;
+        Parameter kuhn_length;
+        Parameter radius;
+        Parameter contrast;
+        Parameter background;
+        Parameter axis_theta;
+        Parameter axis_phi;
+        
+        // Constructor
+        FlexibleCylinderModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class StackedDisksModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter length;
+        Parameter radius;
+        Parameter thickness;
+        Parameter core_sld;
+        Parameter layer_sld;
+        Parameter solvent_sld;
+        Parameter nlayers;
+        Parameter spacing;
+        Parameter background;
+        Parameter axis_theta;
+        Parameter axis_phi;
+        
+        // Constructor
+        StackedDisksModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
 #endif