Changeset 34c3020 in sasview for sansmodels

Timestamp:

Jul 1, 2009 10:53:38 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:

e65050e

Parents:

72a90bd

Message:

add model1D

Location:

sansmodels/src

Files:

• libigor/libCylinder.c (modified) (1 diff)
• sans/models/LamellarFFHGModel.py (added)
• sans/models/LamellarModel.py (added)
• sans/models/c_extensions/Copy of lamellar_HG.c (added)
• sans/models/c_extensions/c_models.c (modified) (1 diff)
• sans/models/c_extensions/lamellar.c (added)
• sans/models/c_extensions/lamellar.h (added)
• sans/models/c_extensions/lamellarFF_HG.c (added)
• sans/models/c_extensions/lamellarFF_HG.h (added)
• sans/models/c_extensions/triaxial_ellipsoid.c (modified) (1 diff)
• sans/models/c_models/CLamellarFFHGModel.cpp (added)
• sans/models/c_models/CLamellarModel.cpp (added)
• sans/models/c_models/c_models.cpp (modified) (2 diffs)
• sans/models/c_models/lamellar.cpp (added)
• sans/models/c_models/lamellarFF_HG.cpp (added)
• sans/models/c_models/models.hh (modified) (1 diff)
• setup.py (modified) (3 diffs)

sansmodels/src/libigor/libCylinder.c

@@ -881 +881 @@
         contr = dp[3];
         bkg = dp[4];
-        
+        qval = q;
         
         Pq = 2.0*contr*contr/qval/qval*(1.0-cos(qval*del)*exp(-0.5*qval*qval*sig*sig));

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

@@ -46 +46 @@
         addCProlateModel(m);
         addCOblateModel(m);
+        addCLamellarModel(m);
+        addCLamellarFFHGModel(m);
         addDisperser(m);
         addCGaussian(m);

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

@@ -18 +18 @@
  */
 double triaxial_ellipsoid_analytical_1D(TriaxialEllipsoidParameters *pars, double q) {
-        double dp[5];
+        double dp[6];
         
         // Fill paramater array

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

@@ -29 +29 @@
 void addCOblateModel(PyObject *module);
 void addCProlateModel(PyObject *module);
+void addCLamellarModel(PyObject *module);
+void addCLamellarFFHGModel(PyObject *module);
 
 
@@ -177 +179 @@
         addCOblateModel(m);
         addCProlateModel(m);
-
+        addCLamellarModel(m);
+        addCLamellarFFHGModel(m);
         addDisperser(m);
         addCGaussian(m);

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

@@ -332 +332 @@
         double evaluate_rphi(double q, double phi);
 };
+
+class LamellarModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter delta;
+        Parameter sigma;
+        Parameter contrast;
+        Parameter background;
+        
+        // Constructor
+        LamellarModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+
+};
+
+class LamellarFFHGModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter t_length;
+        Parameter h_thickness;
+        Parameter sld_tail;
+        Parameter sld_head;
+        Parameter sld_solvent;
+        Parameter background;
+        
+        // Constructor
+        LamellarFFHGModel();
+
+        // Operators to get I(Q)
+        double operator()(double q);
+        double operator()(double qx, double qy);
+        double evaluate_rphi(double q, double phi);
+
+};
+
+
 
 class LamellarPSModel{

sansmodels/src/setup.py

@@ -15 +15 @@
 
 
+if len(sys.argv) == 1:
+    sys.argv.append('install')
 
 
@@ -146 +148 @@
         "sans/models/c_models/ellipticalcylinder.cpp",                
         srcdir+"/elliptical_cylinder.c",
-         #srcdir+"/CTriaxialEllipsoidModel.c",
+        #srcdir+"/CTriaxialEllipsoidModel.c",
         "sans/models/c_models/CTriaxialEllipsoidModel.cpp",
         "sans/models/c_models/triaxialellipsoid.cpp",                
@@ -158 +160 @@
         "sans/models/c_models/stackeddisks.cpp",                
         srcdir+"/stacked_disks.c",
+        #srcdir+"/CLamellarModel.c",
+        "sans/models/c_models/CLamellarModel.cpp",
+        "sans/models/c_models/lamellar.cpp",                
+        srcdir+"/lamellar.c",
+        #srcdir+"/CLamellarFFHGModel.c",
+        "sans/models/c_models/CLamellarFFHGModel.cpp",
+        "sans/models/c_models/lamellarFF_HG.cpp",                
+        srcdir+"/lamellarFF_HG.c",
         #srcdir+"/CLamellarPSModel.c",
         "sans/models/c_models/CLamellarPSModel.cpp",