Changeset 96d19c6 in sasview

Timestamp:

Nov 1, 2010 2:31:12 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:

1a395a6

Parents:

4b3d25b

Message:

added models and unit tests

Location:

sansmodels/src

Files:

• sans/models/c_models/CSLDCalFunc.cpp (added)
• sans/models/c_models/c_models.cpp (modified) (4 diffs)
• sans/models/c_models/models.hh (modified) (5 diffs)
• sans/models/test/utest_model_onionexpshell.py (added)
• sans/models/test/utest_model_sphericalsldmodel.py (added)
• setup.py (modified) (2 diffs)

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

@@ -18 +18 @@
 void addCCSParallelepipedModel(PyObject *module);
 void addCSphereModel(PyObject *module);
+void addCSphereSLDModel(PyObject *module);
 void addCOnionModel(PyObject *module);
 void addCReflModel(PyObject *module);
@@ -43 +44 @@
 void addCDiamEllipFunc(PyObject *module);
 void addCDiamCylFunc(PyObject *module);
+void addCSLDCalFunc(PyObject *module);
 
 //void addCOblateModel(PyObject *module);
@@ -234 +236 @@
         addCEllipsoidModel(m);
         addCSphereModel(m);
+        addCSphereSLDModel(m);
         addCOnionModel(m);
         addCReflModel(m);
@@ -255 +258 @@
         addCDiamEllipFunc(m);
         addCDiamCylFunc(m);
+        addCSLDCalFunc(m);
 
 //      addCOblateModel(m);

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

@@ -284 +284 @@
         Parameter thick_inter0;
         Parameter func_inter0;
-        Parameter sld_sub0;
+        Parameter sld_bottom0;
         Parameter sld_medium;
         Parameter background;
@@ -332 +332 @@
         Parameter func_inter10;
 
-        Parameter sldIM_flat1;
-        Parameter sldIM_flat2;
-        Parameter sldIM_flat3;
-        Parameter sldIM_flat4;
-        Parameter sldIM_flat5;
-        Parameter sldIM_flat6;
-        Parameter sldIM_flat7;
-        Parameter sldIM_flat8;
-        Parameter sldIM_flat9;
-        Parameter sldIM_flat10;
-
-        Parameter sldIM_sub0;
-        Parameter sldIM_medium;
-
         // Constructor
         ReflModel();
@@ -357 +343 @@
 
 
+
 class SphereModel{
 public:
@@ -368 +355 @@
         // 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 SphereSLDModel{
+public:
+        // Model parameters
+        Parameter n_shells;
+        Parameter scale;
+        Parameter thick_inter0;
+        Parameter func_inter0;
+        Parameter sld_core0;
+        Parameter sld_solv;
+        Parameter background;
+
+        Parameter sld_flat1;
+        Parameter sld_flat2;
+        Parameter sld_flat3;
+        Parameter sld_flat4;
+        Parameter sld_flat5;
+        Parameter sld_flat6;
+        Parameter sld_flat7;
+        Parameter sld_flat8;
+        Parameter sld_flat9;
+        Parameter sld_flat10;
+
+        Parameter thick_inter1;
+        Parameter thick_inter2;
+        Parameter thick_inter3;
+        Parameter thick_inter4;
+        Parameter thick_inter5;
+        Parameter thick_inter6;
+        Parameter thick_inter7;
+        Parameter thick_inter8;
+        Parameter thick_inter9;
+        Parameter thick_inter10;
+
+        Parameter thick_flat1;
+        Parameter thick_flat2;
+        Parameter thick_flat3;
+        Parameter thick_flat4;
+        Parameter thick_flat5;
+        Parameter thick_flat6;
+        Parameter thick_flat7;
+        Parameter thick_flat8;
+        Parameter thick_flat9;
+        Parameter thick_flat10;
+
+        Parameter func_inter1;
+        Parameter func_inter2;
+        Parameter func_inter3;
+        Parameter func_inter4;
+        Parameter func_inter5;
+        Parameter func_inter6;
+        Parameter func_inter7;
+        Parameter func_inter8;
+        Parameter func_inter9;
+        Parameter func_inter10;
+
+        Parameter nu_inter1;
+        Parameter nu_inter2;
+        Parameter nu_inter3;
+        Parameter nu_inter4;
+        Parameter nu_inter5;
+        Parameter nu_inter6;
+        Parameter nu_inter7;
+        Parameter nu_inter8;
+        Parameter nu_inter9;
+        Parameter nu_inter10;
+
+        Parameter npts_inter;
+        Parameter nu_inter0;
+        Parameter rad_core0;
+
+        // Constructor
+        SphereSLDModel();
 
         // Operators to get I(Q)
@@ -575 +643 @@
         double evaluate_rphi(double q, double phi);
 };
+
+
+class SLDCalFunc{
+public:
+        // Model parameters
+        Parameter fun_type;
+        Parameter npts_inter;
+        Parameter shell_num;
+        Parameter nu_inter;
+        Parameter sld_left;
+        Parameter sld_right;
+
+        // Constructor
+        SLDCalFunc();
+
+        // Operators to get SLD
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double calculate_ER();
+        double evaluate_rphi(double q, double phi);
+};
+
 
 class CoreShellModel{

sansmodels/src/setup.py

@@ -229 +229 @@
         "sans/models/c_models/multishell.cpp",                
         srcdir+"/multishell.c",
+        "sans/models/c_models/CSphereSLDModel.cpp",
+        "sans/models/c_models/spheresld.cpp",                
+        srcdir+"/spheresld.c",
         #srcdir+"/CVesicleModel.c",
         "sans/models/c_models/CVesicleModel.cpp",
@@ -244 +247 @@
         "sans/models/c_models/CFractalModel.cpp",
         "sans/models/c_models/fractal.cpp", 
-        
+        srcdir+"/sld_cal.c",         
+        "sans/models/c_models/CSLDCalFunc.cpp", 
+        "sans/models/c_models/sld_cal.cpp",  
         #gammainc function need to imported from somewhere  
         #srcdir+"/polyexclvol.c",             
         #"sans/models/c_models/CPolymerExclVolModel.cpp",
         #"sans/models/c_models/polyexclvol.cpp",  
-         
+        srcdir+"/libmultifunc/librefl.c",
         srcdir+"/polygausscoil.c",             
         srcdir+"/binaryHS.c",