Changeset 27a0771 in sasview for sansmodels/src/sans/models/c_models

Timestamp:

Jul 1, 2009 12:56:57 AM (15 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:

72a90bd

Parents:

5068697

Message:

add more models

Location:

sansmodels/src/sans/models/c_models

Files:

• CLamellarPSHGModel.cpp (added)
• CLamellarPSModel.cpp (added)
• COblateModel.cpp (added)
• c_models.cpp (modified) (3 diffs)
• lamellarPS.cpp (added)
• lamellarPS_HG.cpp (added)
• lineparser.py (modified) (2 diffs)
• models.hh (modified) (2 diffs)
• oblate.cpp (added)
• prolate.cpp (added)

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

@@ -9 +9 @@
 
 void addCCylinderModel(PyObject *module);
+void addCTriaxialEllipsoidModel(PyObject *module);
 void addCParallelepipedModel(PyObject *module);
 void addCSphereModel(PyObject *module);
@@ -24 +25 @@
 void addCFlexibleCylinderModel(PyObject *module);
 void addCStackedDisksModel(PyObject *module);
+void addCLamellarPSModel(PyObject *module);
+void addCLamellarPSHGModel(PyObject *module);
+void addCOblateModel(PyObject *module);
+void addCProlateModel(PyObject *module);
+
 
 extern "C" {
@@ -167 +173 @@
         addCFlexibleCylinderModel(m);
         addCStackedDisksModel(m);
+        addCLamellarPSModel(m);
+        addCLamellarPSHGModel(m);
+        addCOblateModel(m);
+        addCProlateModel(m);
+
         addDisperser(m);
         addCGaussian(m);

sansmodels/src/sans/models/c_models/lineparser.py

@@ -125 +125 @@
                     if len(temp3+ temp4)==0:
                         ## [FIXED]=  only one param
-                        listtofill= [temp.lstrip().rstrip()]
+                        if temp.lstrip().rstrip()!="":
+                            listtofill= [temp.lstrip().rstrip()]
                         
                     listtofill += temp3+temp4
@@ -180 +181 @@
                         temp4=split_list(separator=';', mylist=temp3)
                 if len(temp3+ temp4)==0:# [FIXED]=  only one param
-                    listtofill= [line.lstrip().rstrip()]
+                    if line.lstrip().rstrip()!="":
+                        listtofill= [line.lstrip().rstrip()]
                 listtofill+=temp3+temp4 #
                 break

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

@@ -266 +266 @@
         double evaluate_rphi(double q, double phi);
 };
-
 class TriaxialEllipsoidModel{
 public:
@@ -333 +332 @@
         double evaluate_rphi(double q, double phi);
 };
+
+class LamellarPSModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter spacing;
+        Parameter delta;
+        Parameter sigma;
+        Parameter contrast;
+        Parameter n_plates;
+        Parameter caille;
+        Parameter background;
+        
+        // Constructor
+        LamellarPSModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class LamellarPSHGModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter spacing;
+        Parameter deltaT;
+        Parameter deltaH;
+        Parameter sld_tail;
+        Parameter sld_head;
+        Parameter sld_solvent;
+        Parameter n_plates;
+        Parameter caille;
+        Parameter background;
+        
+        // Constructor
+        LamellarPSHGModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class OblateModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter major_core;
+        Parameter minor_core;
+        Parameter major_shell;
+        Parameter minor_shell;
+        Parameter contrast;
+        Parameter sld_solvent;
+        Parameter background;
+        Parameter axis_theta;
+        Parameter axis_phi;
+        
+        // Constructor
+        OblateModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+class ProlateModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter major_core;
+        Parameter minor_core;
+        Parameter major_shell;
+        Parameter minor_shell;
+        Parameter contrast;
+        Parameter sld_solvent;
+        Parameter background;
+        Parameter axis_theta;
+        Parameter axis_phi;
+        
+        // Constructor
+        ProlateModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
 #endif