Changeset 27fea3f in sasview

Timestamp:

Jul 7, 2009 2:45:06 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:

793c988

Parents:

4331b05e

Message:

add a few models 1D

Location:

sansmodels/src

Files:

• sans/models/PeakGaussModel.py (added)
• sans/models/PeakLorentzModel.py (added)
• sans/models/c_extensions/core_shell_cylinder.h (modified) (1 diff)
• sans/models/c_extensions/hollow_cylinder.c (added)
• sans/models/c_extensions/hollow_cylinder.h (added)
• sans/models/c_models/c_models.cpp (modified) (2 diffs)
• sans/models/c_models/hollowcylinder.cpp (added)
• sans/models/c_models/models.hh (modified) (1 diff)
• sans/models/pluginmodel.py (modified) (1 diff)
• setup.py (modified) (2 diffs)

sansmodels/src/sans/models/c_extensions/core_shell_cylinder.h

@@ -32 +32 @@
  //             phi: the axis_phi of the cylinder...
  //             </text>
- //[FIXED]= <text> axis_phi.width; axis_theta.width; length.width;radius.width; thickness_width</text>
+ //[FIXED]= <text> axis_phi.width; axis_theta.width; length.width;radius.width; thickness.width</text>
  //[ORIENTATION_PARAMS]= axis_phi; axis_theta;axis_phi.width; axis_theta.width
 

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

@@ -31 +31 @@
 void addCLamellarModel(PyObject *module);
 void addCLamellarFFHGModel(PyObject *module);
+void addCHollowCylinderModel(PyObject *module);
 
 
@@ -181 +182 @@
         addCLamellarModel(m);
         addCLamellarFFHGModel(m);
+        addCHollowCylinderModel(m);
         addDisperser(m);
         addCGaussian(m);
         addCLorentzian(m);
 
+
 }

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

@@ -463 +463 @@
         double evaluate_rphi(double q, double phi);
 };
-
+class HollowCylinderModel{
+public:
+        // Model parameters
+        Parameter scale;
+        Parameter core_radius;
+        Parameter shell_radius;
+        Parameter length;
+        Parameter contrast;
+        Parameter background;
+        Parameter axis_theta;
+        Parameter axis_phi;
+        
+        //Constructor
+        HollowCylinderModel();
+        
+        //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/sans/models/pluginmodel.py

@@ -31 +31 @@
         else:
             return self.function(x)
+        
    
     def runXY(self, x = 0.0):

sansmodels/src/setup.py

@@ -11 +11 @@
 """
 import sys
+
 
 
@@ -132 +133 @@
         "sans/models/c_models/coreshellcylinder.cpp",
         srcdir+"/core_shell_cylinder.c",
+        #srcdir+"/CHollowCylinderModel.c",
+        "sans/models/c_models/CHollowCylinderModel.cpp",
+        "sans/models/c_models/hollowcylinder.cpp",
+        srcdir+"/hollow_cylinder.c",
         #srcdir+"/CCoreShellModel.c",
         #srcdir+"/core_shell.c",