Changeset 0f5bc9f in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

Aug 19, 2008 2:42:22 PM (17 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

d30fdde

Parents:

a86bbe9

Message:

Update of all C models to the new style of C++ models

Location:

sansmodels/src/sans/models/c_extensions

Files:

• c_models.cpp (modified) (1 diff)
• core_shell.h (modified) (2 diffs)
• core_shell_cylinder.h (modified) (1 diff)
• ellipsoid.h (modified) (2 diffs)
• elliptical_cylinder.h (modified) (3 diffs)
• sphere.h (modified) (1 diff)

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

@@ -9 +9 @@
 
 void addCCylinderModel(PyObject *module);
+void addCSphereModel(PyObject *module);
+void addCCoreShellModel(PyObject *module);
+void addCCoreShellCylinderModel(PyObject *module);
+void addCEllipsoidModel(PyObject *module);
+void addCEllipticalCylinderModel(PyObject *module);
+
 extern "C" {
-        void addCCoreShellCylinderModel(PyObject *module);
-        void addCCoreShellModel(PyObject *module);
-        void addCEllipsoidModel(PyObject *module);
-        void addCSphereModel(PyObject *module);
-        void addCEllipticalCylinderModel(PyObject *module);
+        //void addCCoreShellCylinderModel(PyObject *module);
+        //void addCCoreShellModel(PyObject *module);
+        //void addCEllipsoidModel(PyObject *module);
+        //void addCSphereModel(PyObject *module);
+        //void addCEllipticalCylinderModel(PyObject *module);
         void addDisperser(PyObject *module);
         void addCGaussian(PyObject *module);

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

@@ -2 +2 @@
 #define core_shell_h
 
-/** 
- * Structure definition for core-shell parameters 
+/**
+ * Structure definition for core-shell parameters
  */
  //[PYTHONCLASS] = CoreShellModel
+ //[DISP_PARAMS] = radius, thickness
 typedef struct {
-    /// Scale factor 
+    /// Scale factor
     //  [DEFAULT]=scale=1.0
     double scale;
@@ -27 +28 @@
         /// Incoherent Background (cm-1) 0.000
         //  [DEFAULT]=background=0 cm-1
-        double background;    
+        double background;
 } CoreShellParameters;
 

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

@@ -2 +2 @@
 #define core_shell_cylinder_h
 
-/** 
- * Structure definition for core-shell cylinder parameters 
+/**
+ * Structure definition for core-shell cylinder parameters
  */
  //[PYTHONCLASS] = CoreShellCylinderModel
+ //[DISP_PARAMS] = radius, thickness, length, axis_theta, axis_phi
 typedef struct {
-    /// Scale factor 
+    /// Scale factor
     //  [DEFAULT]=scale=1.0
     double scale;
-    
+
     /// Core radius [A]
     //  [DEFAULT]=radius=20.0 A
     double radius;
-    
+
     /// Shell thickness [A]
     //  [DEFAULT]=thickness=10.0 A
     double thickness;
-    
+
     /// Core length [A]
     //  [DEFAULT]=length=400.0 A
     double length;
-    
+
     /// Core SLD [A-2]
     //  [DEFAULT]=core_sld=1.0e-6 A-2
     double core_sld;
-    
+
     /// Shell SLD [A-2]
     //  [DEFAULT]=shell_sld=4.0e-6 A-2
     double shell_sld;
-    
+
     /// Solvent SLD [A-2]
     //  [DEFAULT]=solvent_sld=1.0e-6 A-2
     double solvent_sld;
-    
+
         /// Incoherent Background [cm-1]
         //  [DEFAULT]=background=0 cm-1
-        double background;    
-        
+        double background;
+
     /// Orientation of the long axis of the core-shell cylinder w/respect incoming beam [rad]
     //  [DEFAULT]=axis_theta=1.57 rad
     double axis_theta;
-    
+
     /// Orientation of the long axis of the core-shell cylinder in the plane of the detector [rad]
     //  [DEFAULT]=axis_phi=0.0 rad
-    double axis_phi;    
-        
+    double axis_phi;
+
 } CoreShellCylinderParameters;
 

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

@@ -2 +2 @@
 #define ellipsoid_h
 
-/** 
- * Structure definition for ellipsoid parameters 
+/**
+ * Structure definition for ellipsoid parameters
  * The ellipsoid has axes radius_b, radius_b, radius_a.
  * Ref: Jan Skov Pedersen, Advances in Colloid and Interface Science, 70 (1997) 171-210
  */
  //[PYTHONCLASS] = EllipsoidModel
+ //[DISP_PARAMS] = radius_a, radius_b, axis_theta, axis_phi
 typedef struct {
-    /// Scale factor 
+    /// Scale factor
     //  [DEFAULT]=scale=1.0
     double scale;
-    
-    /// Rotation axis radius_a [A] 
+
+    /// Rotation axis radius_a [A]
     //  [DEFAULT]=radius_a=20.0 A
     double radius_a;
-    
-    /// Radius_b [A] 
+
+    /// Radius_b [A]
     //  [DEFAULT]=radius_b=400 A
     double radius_b;
-    
-    /// Contrast [Å-2] 
+
+    /// Contrast [Å-2]
     //  [DEFAULT]=contrast=3.0e-6 A-2
     double contrast;
-    
+
         /// Incoherent Background [cm-1]
         //  [DEFAULT]=background=0 cm-1
-        double background;    
-        
+        double background;
+
     /// Orientation of the long axis of the ellipsoid w/respect incoming beam [rad]
     //  [DEFAULT]=axis_theta=1.57 rad
@@ -34 +35 @@
     /// Orientation of the long axis of the ellipsoid in the plane of the detector [rad]
     //  [DEFAULT]=axis_phi=0.0 rad
-    double axis_phi;    
+    double axis_phi;
 } EllipsoidParameters;
 

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

@@ -2 +2 @@
 #define ell_cylinder_h
 
-/** Structure definition for cylinder parameters 
+/** Structure definition for cylinder parameters
  * [PYTHONCLASS] = EllipticalCylinderModel
+ * [DISP_PARAMS] = r_minor, r_ratio, length, cyl_theta, cyl_phi, cyl_psi
+ *
  * */
 typedef struct {
-    /// Scale factor 
+    /// Scale factor
     //  [DEFAULT]=scale=1.0
     double scale;
@@ -23 +25 @@
         /// Incoherent Background (cm-1) 0.000
         //  [DEFAULT]=background=0 cm-1
-        double background;    
+        double background;
     /// Orientation of the cylinder axis w/respect incoming beam [rad]
     //  [DEFAULT]=cyl_theta=1.57 rad
@@ -29 +31 @@
     /// Orientation of the cylinder in the plane of the detector [rad]
     //  [DEFAULT]=cyl_phi=0.0 rad
-    double cyl_phi;    
+    double cyl_phi;
     /// Orientation of major radius of the cross-section w/respect vector q [rad]
     //  [DEFAULT]=cyl_psi=0.0 rad
-    double cyl_psi;    
+    double cyl_psi;
 } EllipticalCylinderParameters;
 

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

@@ -2 +2 @@
 #define sphere_h
 
-/** 
- * Structure definition for sphere parameters 
+/**
+ * Structure definition for sphere parameters
  */
  //[PYTHONCLASS] = SphereModel
+ //[DISP_PARAMS] = radius
 typedef struct {
-    /// Scale factor 
+    /// Scale factor
     //  [DEFAULT]=scale=1.0e-6
     double scale;
-    
-    /// Radius of sphere [A] 
+
+    /// Radius of sphere [A]
     //  [DEFAULT]=radius=60.0 A
     double radius;
-    
-    /// Contrast [Å-2] 
+
+    /// Contrast [Å-2]
     //  [DEFAULT]=contrast=1.0 A-2
     double contrast;
-    
+
         /// Incoherent Background [cm-1]
         //  [DEFAULT]=background=0 cm-1
-        double background;    
+        double background;
 } SphereParameters;