Changeset 2c4b289 in sasview

Timestamp:

Jul 13, 2009 9:17:07 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:

770e4c9

Parents:

e4193d9

Message:

 

Location:

sansmodels/src/sans/models

Files:

• BinaryHSModel.py (added)
• BinaryHSPSF11Model.py (added)
• MultiShellModel.py (added)
• VesicleModel.py (added)
• c_extensions/binaryHS_PSF11.c (added)
• c_extensions/binaryHS_PSF11.h (added)
• c_extensions/c_models.c (modified) (1 diff)
• c_models/CBinaryHSPSF11Model.cpp (added)
• c_models/binaryHS_PSF11.cpp (added)
• c_models/c_models.cpp (modified) (2 diffs)
• c_models/models.hh (modified) (1 diff)

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

@@ -55 +55 @@
         addCVesicleModel(m);
         addCBinaryHSModel(m);
+        addCBinaryHSPSF11Model(m);
 
 }

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

@@ -35 +35 @@
 void addCVesicleModel(PyObject *module);
 void addCBinaryHSModel(PyObject *module);
+void addCBinaryHSPSF11Model(PyObject *module);
 
 
@@ -188 +189 @@
         addCMultiShellModel(m);
         addCBinaryHSModel(m);
+        addCBinaryHSPSF11Model(m);
         addDisperser(m);
         addCGaussian(m);

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

@@ -545 +545 @@
 };
 
+class BinaryHSPSF11Model{
+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
+        BinaryHSPSF11Model();
+        
+        //Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx , double qy);
+        double evaluate_rphi(double q, double phi);
+};
+
 #endif