Changeset 3d25331f in sasview for sansmodels

Timestamp:

Jul 9, 2009 12:51:02 PM (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:

cee6867

Parents:

793c988

Message:

add more model 1d and 2 D

Location:

sansmodels/src

Files:

• sans/models/c_extensions/binaryHS.c (added)
• sans/models/c_extensions/binaryHs.h (added)
• sans/models/c_extensions/c_models.c (modified) (1 diff)
• sans/models/c_extensions/multishell.c (added)
• sans/models/c_extensions/multishell.h (added)
• sans/models/c_extensions/vesicle.c (added)
• sans/models/c_extensions/vesicle.h (added)
• sans/models/c_models/CBinaryHSModel.cpp (added)
• sans/models/c_models/CMultiShellModel.cpp (added)
• sans/models/c_models/CVesicleModel.cpp (added)
• sans/models/c_models/binaryHS.cpp (added)
• sans/models/c_models/c_models.cpp (modified) (2 diffs)
• sans/models/c_models/models.hh (modified) (1 diff)
• sans/models/c_models/multishell.cpp (added)
• sans/models/c_models/vesicle.cpp (added)
• setup.py (modified) (2 diffs)

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

@@ -52 +52 @@
         addCLorentzian(m);
         addCHollowCylinderModel(m);
+        addCMultiShellModel(m);
+        addCVesicleModel(m);
+        addCBinaryHSModel(m);
 
 }

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

@@ -32 +32 @@
 void addCLamellarFFHGModel(PyObject *module);
 void addCHollowCylinderModel(PyObject *module);
+void addCMultiShellModel(PyObject *module);
+void addCVesicleModel(PyObject *module);
+void addCBinaryHSModel(PyObject *module);
 
 
@@ -183 +186 @@
         addCLamellarFFHGModel(m);
         addCHollowCylinderModel(m);
+        addCMultiShellModel(m);
+        addCBinaryHSModel(m);
         addDisperser(m);
         addCGaussian(m);
         addCLorentzian(m);
+        addCVesicleModel(m);
 
 

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

@@ -483 +483 @@
         double evaluate_rphi(double q, double phi);
 };
+
+class MultiShellModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter core_radius;
+        Parameter s_thickness;
+        Parameter w_thickness;
+        Parameter core_sld;
+        Parameter shell_sld;
+        Parameter n_pairs;
+        Parameter background;
+        
+        //Constructor
+        MultiShellModel();
+        
+        //Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx , double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class VesicleModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter core_radius;
+        Parameter thickness;
+        Parameter core_sld;
+        Parameter shell_sld;
+        Parameter background;
+        
+        //Constructor
+        VesicleModel();
+        
+        //Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx , double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
+class BinaryHSModel{
+public:
+        // Model parameters
+        Parameter l_radius;
+        Parameter s_radius;
+        Parameter vol_frac_ls;
+        Parameter vol_frac_ss;
+        Parameter ls_sld;
+        Parameter ss_sld;
+        Parameter solvent_sld;
+        Parameter background;
+        
+        //Constructor
+        BinaryHSModel();
+        
+        //Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx , double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
 #endif

sansmodels/src/setup.py

@@ -11 +11 @@
 """
 import sys
-
 
 
@@ -185 +184 @@
         "sans/models/c_models/prolate.cpp",                
         srcdir+"/prolate.c",
+        #srcdir+"/CMultishellModel.c",
+        "sans/models/c_models/CMultishellModel.cpp",
+        "sans/models/c_models/multishell.cpp",                
+        srcdir+"/multishell.c",
+        #srcdir+"/CVesicleModel.c",
+        "sans/models/c_models/CVesicleModel.cpp",
+        "sans/models/c_models/vesicle.cpp",                
+        srcdir+"/vesicle.c",
+        #srcdir+"/CBinaryHSModel.c",
+        "sans/models/c_models/CBinaryHSModel.cpp",
+        "sans/models/c_models/binaryHS.cpp",                
+        srcdir+"/binaryHS.c",
         srcdir+"/disperser.c",
         igordir+"/libCylinder.c",