Changeset a8d6888 in sasview for sansmodels/src/sans/models/c_extensions

Timestamp:

Aug 24, 2009 10:08:37 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:

df4702f

Parents:

2339ff1e

Message:

change the orientation of vector for 2D models

Location:

sansmodels/src/sans/models/c_extensions

Files:

• CCoreShellCylinderModel.c (modified) (22 diffs)
• CCoreShellModel.c (modified) (22 diffs)
• CCylinderModel.c (modified) (19 diffs)
• CEllipsoidModel.c (modified) (22 diffs)
• CEllipticalCylinderModel.c (modified) (22 diffs)
• CParallelepipedModel.c (modified) (9 diffs)
• CSphereModel.c (modified) (23 diffs)

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

@@ -1 @@
-/** [PYTHONCLASS]
+/** CCoreShellCylinderModel
  *
  * C extension 
@@ -20 +20 @@
 
 /// Error object for raised exceptions
-static PyObject * [PYTHONCLASS]Error = NULL;
+static PyObject * CCoreShellCylinderModelError = NULL;
 
 
@@ -32 +32 @@
     /// Model parameters
         CoreShellCylinderParameters model_pars;
-} [PYTHONCLASS];
+} CCoreShellCylinderModel;
 
 
 static void
-[PYTHONCLASS]_dealloc([PYTHONCLASS]* self)
+CCoreShellCylinderModel_dealloc(CCoreShellCylinderModel* self)
 {
     self->ob_type->tp_free((PyObject*)self);
@@ -44 +44 @@
 
 static PyObject *
-[PYTHONCLASS]_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+CCoreShellCylinderModel_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    [PYTHONCLASS] *self;
+    CCoreShellCylinderModel *self;
     
-    self = ([PYTHONCLASS] *)type->tp_alloc(type, 0);
+    self = (CCoreShellCylinderModel *)type->tp_alloc(type, 0);
    
     return (PyObject *)self;
@@ -54 +54 @@
 
 static int
-[PYTHONCLASS]_init([PYTHONCLASS] *self, PyObject *args, PyObject *kwds)
+CCoreShellCylinderModel_init(CCoreShellCylinderModel *self, PyObject *args, PyObject *kwds)
 {
     if (self != NULL) {
@@ -83 +83 @@
 }
 
-static PyMemberDef [PYTHONCLASS]_members[] = {
-    {"params", T_OBJECT, offsetof([PYTHONCLASS], params), 0,
+static PyMemberDef CCoreShellCylinderModel_members[] = {
+    {"params", T_OBJECT, offsetof(CCoreShellCylinderModel, params), 0,
      "Parameters"},
-    {"log", T_OBJECT, offsetof([PYTHONCLASS], log), 0,
+    {"log", T_OBJECT, offsetof(CCoreShellCylinderModel, log), 0,
      "Log"},
     {NULL}  /* Sentinel */
@@ -95 +95 @@
     @return double
 */
-double [PYTHONCLASS]_readDouble(PyObject *p) {
+double CCoreShellCylinderModel_readDouble(PyObject *p) {
     if (PyFloat_Check(p)==1) {
         return (double)(((PyFloatObject *)(p))->ob_fval);
@@ -113 +113 @@
  * @return: function value
  */
-static PyObject * run([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * run(CCoreShellCylinderModel *self, PyObject *args) {
         double q_value, phi_value;
         PyObject* pars;
@@ -135 +135 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CCoreShellCylinderModelError, 
+                "CCoreShellCylinderModel.run expects a q value.");
                 return NULL;
         }
@@ -146 +146 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CCoreShellCylinderModelError, 
+                        "CCoreShellCylinderModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the q and phi values at which
             // to evaluate I(q,phi)
-            q_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            phi_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            q_value = CCoreShellCylinderModel_readDouble(PyList_GET_ITEM(pars,0));
+            phi_value = CCoreShellCylinderModel_readDouble(PyList_GET_ITEM(pars,1));
             // Skip zero
             if (q_value==0) {
@@ -163 +163 @@
 
                 // We have a scalar q, we will evaluate I(q)
-                q_value = [PYTHONCLASS]_readDouble(pars);               
+                q_value = CCoreShellCylinderModel_readDouble(pars);             
                 
                 return Py_BuildValue("d",core_shell_cylinder_analytical_1D(&(self->model_pars),q_value));
@@ -174 +174 @@
  * @return: function value
  */
-static PyObject * runXY([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * runXY(CCoreShellCylinderModel *self, PyObject *args) {
         double qx_value, qy_value;
         PyObject* pars;
@@ -196 +196 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CCoreShellCylinderModelError, 
+                "CCoreShellCylinderModel.run expects a q value.");
                 return NULL;
         }
@@ -207 +207 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CCoreShellCylinderModelError, 
+                        "CCoreShellCylinderModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the qx and qy values at which
             // to evaluate I(qx,qy)
-            qx_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            qy_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            qx_value = CCoreShellCylinderModel_readDouble(PyList_GET_ITEM(pars,0));
+            qy_value = CCoreShellCylinderModel_readDouble(PyList_GET_ITEM(pars,1));
                 return Py_BuildValue("d",core_shell_cylinder_analytical_2DXY(&(self->model_pars),qx_value,qy_value));
 
@@ -220 +220 @@
 
                 // We have a scalar q, we will evaluate I(q)
-                qx_value = [PYTHONCLASS]_readDouble(pars);              
+                qx_value = CCoreShellCylinderModel_readDouble(pars);            
                 
                 return Py_BuildValue("d",core_shell_cylinder_analytical_1D(&(self->model_pars),qx_value));
@@ -226 +226 @@
 }
 
-static PyObject * reset([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * reset(CCoreShellCylinderModel *self, PyObject *args) {
     
 
@@ -233 +233 @@
 
 
-static PyMethodDef [PYTHONCLASS]_methods[] = {
+static PyMethodDef CCoreShellCylinderModel_methods[] = {
     {"run",      (PyCFunction)run     , METH_VARARGS,
       "Evaluate the model at a given Q or Q, phi"},
@@ -245 +245 @@
 };
 
-static PyTypeObject [PYTHONCLASS]Type = {
+static PyTypeObject CCoreShellCylinderModelType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "[PYTHONCLASS]",             /*tp_name*/
-    sizeof([PYTHONCLASS]),             /*tp_basicsize*/
+    "CCoreShellCylinderModel",             /*tp_name*/
+    sizeof(CCoreShellCylinderModel),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
-    (destructor)[PYTHONCLASS]_dealloc, /*tp_dealloc*/
+    (destructor)CCoreShellCylinderModel_dealloc, /*tp_dealloc*/
     0,                         /*tp_print*/
     0,                         /*tp_getattr*/
@@ -267 +267 @@
     0,                         /*tp_as_buffer*/
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-    "[PYTHONCLASS] objects",           /* tp_doc */
+    "CCoreShellCylinderModel objects",           /* tp_doc */
     0,                         /* tp_traverse */
     0,                         /* tp_clear */
@@ -274 +274 @@
     0,                         /* tp_iter */
     0,                         /* tp_iternext */
-    [PYTHONCLASS]_methods,             /* tp_methods */
-    [PYTHONCLASS]_members,             /* tp_members */
+    CCoreShellCylinderModel_methods,             /* tp_methods */
+    CCoreShellCylinderModel_members,             /* tp_members */
     0,                         /* tp_getset */
     0,                         /* tp_base */
@@ -282 +282 @@
     0,                         /* tp_descr_set */
     0,                         /* tp_dictoffset */
-    (initproc)[PYTHONCLASS]_init,      /* tp_init */
+    (initproc)CCoreShellCylinderModel_init,      /* tp_init */
     0,                         /* tp_alloc */
-    [PYTHONCLASS]_new,                 /* tp_new */
+    CCoreShellCylinderModel_new,                 /* tp_new */
 };
 
@@ -296 +296 @@
  * @param module: module to add the class to
  */ 
-void add[PYTHONCLASS](PyObject *module) {
+void addCCoreShellCylinderModel(PyObject *module) {
         PyObject *d;
         
-    if (PyType_Ready(&[PYTHONCLASS]Type) < 0)
+    if (PyType_Ready(&CCoreShellCylinderModelType) < 0)
         return;
 
-    Py_INCREF(&[PYTHONCLASS]Type);
-    PyModule_AddObject(module, "[PYTHONCLASS]", (PyObject *)&[PYTHONCLASS]Type);
+    Py_INCREF(&CCoreShellCylinderModelType);
+    PyModule_AddObject(module, "CCoreShellCylinderModel", (PyObject *)&CCoreShellCylinderModelType);
     
     d = PyModule_GetDict(module);
-    [PYTHONCLASS]Error = PyErr_NewException("[PYTHONCLASS].error", NULL, NULL);
-    PyDict_SetItemString(d, "[PYTHONCLASS]Error", [PYTHONCLASS]Error);
-}
-
+    CCoreShellCylinderModelError = PyErr_NewException("CCoreShellCylinderModel.error", NULL, NULL);
+    PyDict_SetItemString(d, "CCoreShellCylinderModelError", CCoreShellCylinderModelError);
+}
+

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

@@ -1 @@
-/** [PYTHONCLASS]
+/** CCoreShellModel
  *
  * C extension 
@@ -20 +20 @@
 
 /// Error object for raised exceptions
-static PyObject * [PYTHONCLASS]Error = NULL;
+static PyObject * CCoreShellModelError = NULL;
 
 
@@ -32 +32 @@
     /// Model parameters
         CoreShellParameters model_pars;
-} [PYTHONCLASS];
+} CCoreShellModel;
 
 
 static void
-[PYTHONCLASS]_dealloc([PYTHONCLASS]* self)
+CCoreShellModel_dealloc(CCoreShellModel* self)
 {
     self->ob_type->tp_free((PyObject*)self);
@@ -44 +44 @@
 
 static PyObject *
-[PYTHONCLASS]_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+CCoreShellModel_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    [PYTHONCLASS] *self;
+    CCoreShellModel *self;
     
-    self = ([PYTHONCLASS] *)type->tp_alloc(type, 0);
+    self = (CCoreShellModel *)type->tp_alloc(type, 0);
    
     return (PyObject *)self;
@@ -54 +54 @@
 
 static int
-[PYTHONCLASS]_init([PYTHONCLASS] *self, PyObject *args, PyObject *kwds)
+CCoreShellModel_init(CCoreShellModel *self, PyObject *args, PyObject *kwds)
 {
     if (self != NULL) {
@@ -80 +80 @@
 }
 
-static PyMemberDef [PYTHONCLASS]_members[] = {
-    {"params", T_OBJECT, offsetof([PYTHONCLASS], params), 0,
+static PyMemberDef CCoreShellModel_members[] = {
+    {"params", T_OBJECT, offsetof(CCoreShellModel, params), 0,
      "Parameters"},
-    {"log", T_OBJECT, offsetof([PYTHONCLASS], log), 0,
+    {"log", T_OBJECT, offsetof(CCoreShellModel, log), 0,
      "Log"},
     {NULL}  /* Sentinel */
@@ -92 +92 @@
     @return double
 */
-double [PYTHONCLASS]_readDouble(PyObject *p) {
+double CCoreShellModel_readDouble(PyObject *p) {
     if (PyFloat_Check(p)==1) {
         return (double)(((PyFloatObject *)(p))->ob_fval);
@@ -110 +110 @@
  * @return: function value
  */
-static PyObject * run([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * run(CCoreShellModel *self, PyObject *args) {
         double q_value, phi_value;
         PyObject* pars;
@@ -129 +129 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CCoreShellModelError, 
+                "CCoreShellModel.run expects a q value.");
                 return NULL;
         }
@@ -140 +140 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CCoreShellModelError, 
+                        "CCoreShellModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the q and phi values at which
             // to evaluate I(q,phi)
-            q_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            phi_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            q_value = CCoreShellModel_readDouble(PyList_GET_ITEM(pars,0));
+            phi_value = CCoreShellModel_readDouble(PyList_GET_ITEM(pars,1));
             // Skip zero
             if (q_value==0) {
@@ -157 +157 @@
 
                 // We have a scalar q, we will evaluate I(q)
-                q_value = [PYTHONCLASS]_readDouble(pars);               
+                q_value = CCoreShellModel_readDouble(pars);             
                 
                 return Py_BuildValue("d",core_shell_analytical_1D(&(self->model_pars),q_value));
@@ -168 +168 @@
  * @return: function value
  */
-static PyObject * runXY([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * runXY(CCoreShellModel *self, PyObject *args) {
         double qx_value, qy_value;
         PyObject* pars;
@@ -187 +187 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CCoreShellModelError, 
+                "CCoreShellModel.run expects a q value.");
                 return NULL;
         }
@@ -198 +198 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CCoreShellModelError, 
+                        "CCoreShellModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the qx and qy values at which
             // to evaluate I(qx,qy)
-            qx_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            qy_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            qx_value = CCoreShellModel_readDouble(PyList_GET_ITEM(pars,0));
+            qy_value = CCoreShellModel_readDouble(PyList_GET_ITEM(pars,1));
                 return Py_BuildValue("d",core_shell_analytical_2DXY(&(self->model_pars),qx_value,qy_value));
 
@@ -211 +211 @@
 
                 // We have a scalar q, we will evaluate I(q)
-                qx_value = [PYTHONCLASS]_readDouble(pars);              
+                qx_value = CCoreShellModel_readDouble(pars);            
                 
                 return Py_BuildValue("d",core_shell_analytical_1D(&(self->model_pars),qx_value));
@@ -217 +217 @@
 }
 
-static PyObject * reset([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * reset(CCoreShellModel *self, PyObject *args) {
     
 
@@ -224 +224 @@
 
 
-static PyMethodDef [PYTHONCLASS]_methods[] = {
+static PyMethodDef CCoreShellModel_methods[] = {
     {"run",      (PyCFunction)run     , METH_VARARGS,
       "Evaluate the model at a given Q or Q, phi"},
@@ -236 +236 @@
 };
 
-static PyTypeObject [PYTHONCLASS]Type = {
+static PyTypeObject CCoreShellModelType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "[PYTHONCLASS]",             /*tp_name*/
-    sizeof([PYTHONCLASS]),             /*tp_basicsize*/
+    "CCoreShellModel",             /*tp_name*/
+    sizeof(CCoreShellModel),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
-    (destructor)[PYTHONCLASS]_dealloc, /*tp_dealloc*/
+    (destructor)CCoreShellModel_dealloc, /*tp_dealloc*/
     0,                         /*tp_print*/
     0,                         /*tp_getattr*/
@@ -258 +258 @@
     0,                         /*tp_as_buffer*/
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-    "[PYTHONCLASS] objects",           /* tp_doc */
+    "CCoreShellModel objects",           /* tp_doc */
     0,                         /* tp_traverse */
     0,                         /* tp_clear */
@@ -265 +265 @@
     0,                         /* tp_iter */
     0,                         /* tp_iternext */
-    [PYTHONCLASS]_methods,             /* tp_methods */
-    [PYTHONCLASS]_members,             /* tp_members */
+    CCoreShellModel_methods,             /* tp_methods */
+    CCoreShellModel_members,             /* tp_members */
     0,                         /* tp_getset */
     0,                         /* tp_base */
@@ -273 +273 @@
     0,                         /* tp_descr_set */
     0,                         /* tp_dictoffset */
-    (initproc)[PYTHONCLASS]_init,      /* tp_init */
+    (initproc)CCoreShellModel_init,      /* tp_init */
     0,                         /* tp_alloc */
-    [PYTHONCLASS]_new,                 /* tp_new */
+    CCoreShellModel_new,                 /* tp_new */
 };
 
@@ -287 +287 @@
  * @param module: module to add the class to
  */ 
-void add[PYTHONCLASS](PyObject *module) {
+void addCCoreShellModel(PyObject *module) {
         PyObject *d;
         
-    if (PyType_Ready(&[PYTHONCLASS]Type) < 0)
+    if (PyType_Ready(&CCoreShellModelType) < 0)
         return;
 
-    Py_INCREF(&[PYTHONCLASS]Type);
-    PyModule_AddObject(module, "[PYTHONCLASS]", (PyObject *)&[PYTHONCLASS]Type);
+    Py_INCREF(&CCoreShellModelType);
+    PyModule_AddObject(module, "CCoreShellModel", (PyObject *)&CCoreShellModelType);
     
     d = PyModule_GetDict(module);
-    [PYTHONCLASS]Error = PyErr_NewException("[PYTHONCLASS].error", NULL, NULL);
-    PyDict_SetItemString(d, "[PYTHONCLASS]Error", [PYTHONCLASS]Error);
-}
-
+    CCoreShellModelError = PyErr_NewException("CCoreShellModel.error", NULL, NULL);
+    PyDict_SetItemString(d, "CCoreShellModelError", CCoreShellModelError);
+}
+

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

@@ -1 @@
-/** [PYTHONCLASS]
+/** CCylinderModel
  *
  * C extension 
  *
  * WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
- *          DO NOT MODIFY THIS FILE, MODIFY Cylinder.h
+ *          DO NOT MODIFY THIS FILE, MODIFY cylinder.h
  *          AND RE-RUN THE GENERATOR SCRIPT
  *
@@ -17 +17 @@
 #include <time.h>
 
-#include "Cylinder.h"
+#include "cylinder.h"
 
 /// Error object for raised exceptions
-static PyObject * [PYTHONCLASS]Error = NULL;
+static PyObject * CCylinderModelError = NULL;
 
 
@@ -32 +32 @@
     /// Model parameters
         CylinderParameters model_pars;
-} [PYTHONCLASS];
+} CCylinderModel;
 
 
 static void
-[PYTHONCLASS]_dealloc([PYTHONCLASS]* self)
+CCylinderModel_dealloc(CCylinderModel* self)
 {
     self->ob_type->tp_free((PyObject*)self);
@@ -44 +44 @@
 
 static PyObject *
-[PYTHONCLASS]_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+CCylinderModel_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    [PYTHONCLASS] *self;
+    CCylinderModel *self;
     
-    self = ([PYTHONCLASS] *)type->tp_alloc(type, 0);
+    self = (CCylinderModel *)type->tp_alloc(type, 0);
    
     return (PyObject *)self;
@@ -54 +54 @@
 
 static int
-[PYTHONCLASS]_init([PYTHONCLASS] *self, PyObject *args, PyObject *kwds)
+CCylinderModel_init(CCylinderModel *self, PyObject *args, PyObject *kwds)
 {
     if (self != NULL) {
@@ -80 +80 @@
 }
 
-static PyMemberDef [PYTHONCLASS]_members[] = {
-    {"params", T_OBJECT, offsetof([PYTHONCLASS], params), 0,
+static PyMemberDef CCylinderModel_members[] = {
+    {"params", T_OBJECT, offsetof(CCylinderModel, params), 0,
      "Parameters"},
-    {"log", T_OBJECT, offsetof([PYTHONCLASS], log), 0,
+    {"log", T_OBJECT, offsetof(CCylinderModel, log), 0,
      "Log"},
     {NULL}  /* Sentinel */
@@ -92 +92 @@
     @return double
 */
-double [PYTHONCLASS]_readDouble(PyObject *p) {
+double CCylinderModel_readDouble(PyObject *p) {
     if (PyFloat_Check(p)==1) {
         return (double)(((PyFloatObject *)(p))->ob_fval);
@@ -110 +110 @@
  * @return: function value
  */
-static PyObject * run([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * run(CCylinderModel *self, PyObject *args) {
         double q_value, phi_value;
         PyObject* pars;
@@ -129 +129 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CCylinderModelError, 
+                "CCylinderModel.run expects a q value.");
                 return NULL;
         }
@@ -140 +140 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CCylinderModelError, 
+                        "CCylinderModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the q and phi values at which
             // to evaluate I(q,phi)
-            q_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            phi_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            q_value = CCylinderModel_readDouble(PyList_GET_ITEM(pars,0));
+            phi_value = CCylinderModel_readDouble(PyList_GET_ITEM(pars,1));
             // Skip zero
             if (q_value==0) {
                 return Py_BuildValue("d",0.0);
             }
-                return Py_BuildValue("d",Cylinder_analytical_2D(&(self->model_pars),q_value,phi_value));
+                return Py_BuildValue("d",cylinder_analytical_2D(&(self->model_pars),q_value,phi_value));
 
         } else {
 
                 // We have a scalar q, we will evaluate I(q)
-                q_value = [PYTHONCLASS]_readDouble(pars);               
+                q_value = CCylinderModel_readDouble(pars);              
                 
-                return Py_BuildValue("d",Cylinder_analytical_1D(&(self->model_pars),q_value));
+                return Py_BuildValue("d",cylinder_analytical_1D(&(self->model_pars),q_value));
         }       
 }
@@ -168 +168 @@
  * @return: function value
  */
-static PyObject * runXY([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * runXY(CCylinderModel *self, PyObject *args) {
         double qx_value, qy_value;
         PyObject* pars;
@@ -187 +187 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CCylinderModelError, 
+                "CCylinderModel.run expects a q value.");
                 return NULL;
         }
@@ -198 +198 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CCylinderModelError, 
+                        "CCylinderModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the qx and qy values at which
             // to evaluate I(qx,qy)
-            qx_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            qy_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
-                return Py_BuildValue("d",Cylinder_analytical_2DXY(&(self->model_pars),qx_value,qy_value));
+            qx_value = CCylinderModel_readDouble(PyList_GET_ITEM(pars,0));
+            qy_value = CCylinderModel_readDouble(PyList_GET_ITEM(pars,1));
+                return Py_BuildValue("d",cylinder_analytical_2DXY(&(self->model_pars),qx_value,qy_value));
 
         } else {
 
                 // We have a scalar q, we will evaluate I(q)
-                qx_value = [PYTHONCLASS]_readDouble(pars);              
+                qx_value = CCylinderModel_readDouble(pars);             
                 
-                return Py_BuildValue("d",Cylinder_analytical_1D(&(self->model_pars),qx_value));
+                return Py_BuildValue("d",cylinder_analytical_1D(&(self->model_pars),qx_value));
         }       
 }
 
-static PyObject * reset([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * reset(CCylinderModel *self, PyObject *args) {
     
 
@@ -224 +224 @@
 
 
-static PyMethodDef [PYTHONCLASS]_methods[] = {
+static PyMethodDef CCylinderModel_methods[] = {
     {"run",      (PyCFunction)run     , METH_VARARGS,
       "Evaluate the model at a given Q or Q, phi"},
@@ -236 +236 @@
 };
 
-static PyTypeObject [PYTHONCLASS]Type = {
+static PyTypeObject CCylinderModelType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "[PYTHONCLASS]",             /*tp_name*/
-    sizeof([PYTHONCLASS]),             /*tp_basicsize*/
+    "CCylinderModel",             /*tp_name*/
+    sizeof(CCylinderModel),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
-    (destructor)[PYTHONCLASS]_dealloc, /*tp_dealloc*/
+    (destructor)CCylinderModel_dealloc, /*tp_dealloc*/
     0,                         /*tp_print*/
     0,                         /*tp_getattr*/
@@ -258 +258 @@
     0,                         /*tp_as_buffer*/
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-    "[PYTHONCLASS] objects",           /* tp_doc */
+    "CCylinderModel objects",           /* tp_doc */
     0,                         /* tp_traverse */
     0,                         /* tp_clear */
@@ -265 +265 @@
     0,                         /* tp_iter */
     0,                         /* tp_iternext */
-    [PYTHONCLASS]_methods,             /* tp_methods */
-    [PYTHONCLASS]_members,             /* tp_members */
+    CCylinderModel_methods,             /* tp_methods */
+    CCylinderModel_members,             /* tp_members */
     0,                         /* tp_getset */
     0,                         /* tp_base */
@@ -273 +273 @@
     0,                         /* tp_descr_set */
     0,                         /* tp_dictoffset */
-    (initproc)[PYTHONCLASS]_init,      /* tp_init */
+    (initproc)CCylinderModel_init,      /* tp_init */
     0,                         /* tp_alloc */
-    [PYTHONCLASS]_new,                 /* tp_new */
+    CCylinderModel_new,                 /* tp_new */
 };
 
@@ -287 +287 @@
  * @param module: module to add the class to
  */ 
-void add[PYTHONCLASS](PyObject *module) {
+void addCCylinderModel(PyObject *module) {
         PyObject *d;
         
-    if (PyType_Ready(&[PYTHONCLASS]Type) < 0)
+    if (PyType_Ready(&CCylinderModelType) < 0)
         return;
 
-    Py_INCREF(&[PYTHONCLASS]Type);
-    PyModule_AddObject(module, "[PYTHONCLASS]", (PyObject *)&[PYTHONCLASS]Type);
+    Py_INCREF(&CCylinderModelType);
+    PyModule_AddObject(module, "CCylinderModel", (PyObject *)&CCylinderModelType);
     
     d = PyModule_GetDict(module);
-    [PYTHONCLASS]Error = PyErr_NewException("[PYTHONCLASS].error", NULL, NULL);
-    PyDict_SetItemString(d, "[PYTHONCLASS]Error", [PYTHONCLASS]Error);
-}
-
+    CCylinderModelError = PyErr_NewException("CCylinderModel.error", NULL, NULL);
+    PyDict_SetItemString(d, "CCylinderModelError", CCylinderModelError);
+}
+

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

@@ -1 @@
-/** [PYTHONCLASS]
+/** CEllipsoidModel
  *
  * C extension 
@@ -20 +20 @@
 
 /// Error object for raised exceptions
-static PyObject * [PYTHONCLASS]Error = NULL;
+static PyObject * CEllipsoidModelError = NULL;
 
 
@@ -32 +32 @@
     /// Model parameters
         EllipsoidParameters model_pars;
-} [PYTHONCLASS];
+} CEllipsoidModel;
 
 
 static void
-[PYTHONCLASS]_dealloc([PYTHONCLASS]* self)
+CEllipsoidModel_dealloc(CEllipsoidModel* self)
 {
     self->ob_type->tp_free((PyObject*)self);
@@ -44 +44 @@
 
 static PyObject *
-[PYTHONCLASS]_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+CEllipsoidModel_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    [PYTHONCLASS] *self;
+    CEllipsoidModel *self;
     
-    self = ([PYTHONCLASS] *)type->tp_alloc(type, 0);
+    self = (CEllipsoidModel *)type->tp_alloc(type, 0);
    
     return (PyObject *)self;
@@ -54 +54 @@
 
 static int
-[PYTHONCLASS]_init([PYTHONCLASS] *self, PyObject *args, PyObject *kwds)
+CEllipsoidModel_init(CEllipsoidModel *self, PyObject *args, PyObject *kwds)
 {
     if (self != NULL) {
@@ -80 +80 @@
 }
 
-static PyMemberDef [PYTHONCLASS]_members[] = {
-    {"params", T_OBJECT, offsetof([PYTHONCLASS], params), 0,
+static PyMemberDef CEllipsoidModel_members[] = {
+    {"params", T_OBJECT, offsetof(CEllipsoidModel, params), 0,
      "Parameters"},
-    {"log", T_OBJECT, offsetof([PYTHONCLASS], log), 0,
+    {"log", T_OBJECT, offsetof(CEllipsoidModel, log), 0,
      "Log"},
     {NULL}  /* Sentinel */
@@ -92 +92 @@
     @return double
 */
-double [PYTHONCLASS]_readDouble(PyObject *p) {
+double CEllipsoidModel_readDouble(PyObject *p) {
     if (PyFloat_Check(p)==1) {
         return (double)(((PyFloatObject *)(p))->ob_fval);
@@ -110 +110 @@
  * @return: function value
  */
-static PyObject * run([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * run(CEllipsoidModel *self, PyObject *args) {
         double q_value, phi_value;
         PyObject* pars;
@@ -129 +129 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CEllipsoidModelError, 
+                "CEllipsoidModel.run expects a q value.");
                 return NULL;
         }
@@ -140 +140 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CEllipsoidModelError, 
+                        "CEllipsoidModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the q and phi values at which
             // to evaluate I(q,phi)
-            q_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            phi_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            q_value = CEllipsoidModel_readDouble(PyList_GET_ITEM(pars,0));
+            phi_value = CEllipsoidModel_readDouble(PyList_GET_ITEM(pars,1));
             // Skip zero
             if (q_value==0) {
@@ -157 +157 @@
 
                 // We have a scalar q, we will evaluate I(q)
-                q_value = [PYTHONCLASS]_readDouble(pars);               
+                q_value = CEllipsoidModel_readDouble(pars);             
                 
                 return Py_BuildValue("d",ellipsoid_analytical_1D(&(self->model_pars),q_value));
@@ -168 +168 @@
  * @return: function value
  */
-static PyObject * runXY([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * runXY(CEllipsoidModel *self, PyObject *args) {
         double qx_value, qy_value;
         PyObject* pars;
@@ -187 +187 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CEllipsoidModelError, 
+                "CEllipsoidModel.run expects a q value.");
                 return NULL;
         }
@@ -198 +198 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CEllipsoidModelError, 
+                        "CEllipsoidModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the qx and qy values at which
             // to evaluate I(qx,qy)
-            qx_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            qy_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            qx_value = CEllipsoidModel_readDouble(PyList_GET_ITEM(pars,0));
+            qy_value = CEllipsoidModel_readDouble(PyList_GET_ITEM(pars,1));
                 return Py_BuildValue("d",ellipsoid_analytical_2DXY(&(self->model_pars),qx_value,qy_value));
 
@@ -211 +211 @@
 
                 // We have a scalar q, we will evaluate I(q)
-                qx_value = [PYTHONCLASS]_readDouble(pars);              
+                qx_value = CEllipsoidModel_readDouble(pars);            
                 
                 return Py_BuildValue("d",ellipsoid_analytical_1D(&(self->model_pars),qx_value));
@@ -217 +217 @@
 }
 
-static PyObject * reset([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * reset(CEllipsoidModel *self, PyObject *args) {
     
 
@@ -224 +224 @@
 
 
-static PyMethodDef [PYTHONCLASS]_methods[] = {
+static PyMethodDef CEllipsoidModel_methods[] = {
     {"run",      (PyCFunction)run     , METH_VARARGS,
       "Evaluate the model at a given Q or Q, phi"},
@@ -236 +236 @@
 };
 
-static PyTypeObject [PYTHONCLASS]Type = {
+static PyTypeObject CEllipsoidModelType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "[PYTHONCLASS]",             /*tp_name*/
-    sizeof([PYTHONCLASS]),             /*tp_basicsize*/
+    "CEllipsoidModel",             /*tp_name*/
+    sizeof(CEllipsoidModel),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
-    (destructor)[PYTHONCLASS]_dealloc, /*tp_dealloc*/
+    (destructor)CEllipsoidModel_dealloc, /*tp_dealloc*/
     0,                         /*tp_print*/
     0,                         /*tp_getattr*/
@@ -258 +258 @@
     0,                         /*tp_as_buffer*/
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-    "[PYTHONCLASS] objects",           /* tp_doc */
+    "CEllipsoidModel objects",           /* tp_doc */
     0,                         /* tp_traverse */
     0,                         /* tp_clear */
@@ -265 +265 @@
     0,                         /* tp_iter */
     0,                         /* tp_iternext */
-    [PYTHONCLASS]_methods,             /* tp_methods */
-    [PYTHONCLASS]_members,             /* tp_members */
+    CEllipsoidModel_methods,             /* tp_methods */
+    CEllipsoidModel_members,             /* tp_members */
     0,                         /* tp_getset */
     0,                         /* tp_base */
@@ -273 +273 @@
     0,                         /* tp_descr_set */
     0,                         /* tp_dictoffset */
-    (initproc)[PYTHONCLASS]_init,      /* tp_init */
+    (initproc)CEllipsoidModel_init,      /* tp_init */
     0,                         /* tp_alloc */
-    [PYTHONCLASS]_new,                 /* tp_new */
+    CEllipsoidModel_new,                 /* tp_new */
 };
 
@@ -287 +287 @@
  * @param module: module to add the class to
  */ 
-void add[PYTHONCLASS](PyObject *module) {
+void addCEllipsoidModel(PyObject *module) {
         PyObject *d;
         
-    if (PyType_Ready(&[PYTHONCLASS]Type) < 0)
+    if (PyType_Ready(&CEllipsoidModelType) < 0)
         return;
 
-    Py_INCREF(&[PYTHONCLASS]Type);
-    PyModule_AddObject(module, "[PYTHONCLASS]", (PyObject *)&[PYTHONCLASS]Type);
+    Py_INCREF(&CEllipsoidModelType);
+    PyModule_AddObject(module, "CEllipsoidModel", (PyObject *)&CEllipsoidModelType);
     
     d = PyModule_GetDict(module);
-    [PYTHONCLASS]Error = PyErr_NewException("[PYTHONCLASS].error", NULL, NULL);
-    PyDict_SetItemString(d, "[PYTHONCLASS]Error", [PYTHONCLASS]Error);
-}
-
+    CEllipsoidModelError = PyErr_NewException("CEllipsoidModel.error", NULL, NULL);
+    PyDict_SetItemString(d, "CEllipsoidModelError", CEllipsoidModelError);
+}
+

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

@@ -1 @@
-/** [PYTHONCLASS]
+/** CEllipticalCylinderModel
  *
  * C extension 
@@ -20 +20 @@
 
 /// Error object for raised exceptions
-static PyObject * [PYTHONCLASS]Error = NULL;
+static PyObject * CEllipticalCylinderModelError = NULL;
 
 
@@ -32 +32 @@
     /// Model parameters
         EllipticalCylinderParameters model_pars;
-} [PYTHONCLASS];
+} CEllipticalCylinderModel;
 
 
 static void
-[PYTHONCLASS]_dealloc([PYTHONCLASS]* self)
+CEllipticalCylinderModel_dealloc(CEllipticalCylinderModel* self)
 {
     self->ob_type->tp_free((PyObject*)self);
@@ -44 +44 @@
 
 static PyObject *
-[PYTHONCLASS]_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+CEllipticalCylinderModel_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    [PYTHONCLASS] *self;
+    CEllipticalCylinderModel *self;
     
-    self = ([PYTHONCLASS] *)type->tp_alloc(type, 0);
+    self = (CEllipticalCylinderModel *)type->tp_alloc(type, 0);
    
     return (PyObject *)self;
@@ -54 +54 @@
 
 static int
-[PYTHONCLASS]_init([PYTHONCLASS] *self, PyObject *args, PyObject *kwds)
+CEllipticalCylinderModel_init(CEllipticalCylinderModel *self, PyObject *args, PyObject *kwds)
 {
     if (self != NULL) {
@@ -82 +82 @@
 }
 
-static PyMemberDef [PYTHONCLASS]_members[] = {
-    {"params", T_OBJECT, offsetof([PYTHONCLASS], params), 0,
+static PyMemberDef CEllipticalCylinderModel_members[] = {
+    {"params", T_OBJECT, offsetof(CEllipticalCylinderModel, params), 0,
      "Parameters"},
-    {"log", T_OBJECT, offsetof([PYTHONCLASS], log), 0,
+    {"log", T_OBJECT, offsetof(CEllipticalCylinderModel, log), 0,
      "Log"},
     {NULL}  /* Sentinel */
@@ -94 +94 @@
     @return double
 */
-double [PYTHONCLASS]_readDouble(PyObject *p) {
+double CEllipticalCylinderModel_readDouble(PyObject *p) {
     if (PyFloat_Check(p)==1) {
         return (double)(((PyFloatObject *)(p))->ob_fval);
@@ -112 +112 @@
  * @return: function value
  */
-static PyObject * run([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * run(CEllipticalCylinderModel *self, PyObject *args) {
         double q_value, phi_value;
         PyObject* pars;
@@ -133 +133 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CEllipticalCylinderModelError, 
+                "CEllipticalCylinderModel.run expects a q value.");
                 return NULL;
         }
@@ -144 +144 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CEllipticalCylinderModelError, 
+                        "CEllipticalCylinderModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the q and phi values at which
             // to evaluate I(q,phi)
-            q_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            phi_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            q_value = CEllipticalCylinderModel_readDouble(PyList_GET_ITEM(pars,0));
+            phi_value = CEllipticalCylinderModel_readDouble(PyList_GET_ITEM(pars,1));
             // Skip zero
             if (q_value==0) {
@@ -161 +161 @@
 
                 // We have a scalar q, we will evaluate I(q)
-                q_value = [PYTHONCLASS]_readDouble(pars);               
+                q_value = CEllipticalCylinderModel_readDouble(pars);            
                 
                 return Py_BuildValue("d",elliptical_cylinder_analytical_1D(&(self->model_pars),q_value));
@@ -172 +172 @@
  * @return: function value
  */
-static PyObject * runXY([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * runXY(CEllipticalCylinderModel *self, PyObject *args) {
         double qx_value, qy_value;
         PyObject* pars;
@@ -193 +193 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CEllipticalCylinderModelError, 
+                "CEllipticalCylinderModel.run expects a q value.");
                 return NULL;
         }
@@ -204 +204 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CEllipticalCylinderModelError, 
+                        "CEllipticalCylinderModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the qx and qy values at which
             // to evaluate I(qx,qy)
-            qx_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            qy_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            qx_value = CEllipticalCylinderModel_readDouble(PyList_GET_ITEM(pars,0));
+            qy_value = CEllipticalCylinderModel_readDouble(PyList_GET_ITEM(pars,1));
                 return Py_BuildValue("d",elliptical_cylinder_analytical_2DXY(&(self->model_pars),qx_value,qy_value));
 
@@ -217 +217 @@
 
                 // We have a scalar q, we will evaluate I(q)
-                qx_value = [PYTHONCLASS]_readDouble(pars);              
+                qx_value = CEllipticalCylinderModel_readDouble(pars);           
                 
                 return Py_BuildValue("d",elliptical_cylinder_analytical_1D(&(self->model_pars),qx_value));
@@ -223 +223 @@
 }
 
-static PyObject * reset([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * reset(CEllipticalCylinderModel *self, PyObject *args) {
     
 
@@ -230 +230 @@
 
 
-static PyMethodDef [PYTHONCLASS]_methods[] = {
+static PyMethodDef CEllipticalCylinderModel_methods[] = {
     {"run",      (PyCFunction)run     , METH_VARARGS,
       "Evaluate the model at a given Q or Q, phi"},
@@ -242 +242 @@
 };
 
-static PyTypeObject [PYTHONCLASS]Type = {
+static PyTypeObject CEllipticalCylinderModelType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "[PYTHONCLASS]",             /*tp_name*/
-    sizeof([PYTHONCLASS]),             /*tp_basicsize*/
+    "CEllipticalCylinderModel",             /*tp_name*/
+    sizeof(CEllipticalCylinderModel),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
-    (destructor)[PYTHONCLASS]_dealloc, /*tp_dealloc*/
+    (destructor)CEllipticalCylinderModel_dealloc, /*tp_dealloc*/
     0,                         /*tp_print*/
     0,                         /*tp_getattr*/
@@ -264 +264 @@
     0,                         /*tp_as_buffer*/
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-    "[PYTHONCLASS] objects",           /* tp_doc */
+    "CEllipticalCylinderModel objects",           /* tp_doc */
     0,                         /* tp_traverse */
     0,                         /* tp_clear */
@@ -271 +271 @@
     0,                         /* tp_iter */
     0,                         /* tp_iternext */
-    [PYTHONCLASS]_methods,             /* tp_methods */
-    [PYTHONCLASS]_members,             /* tp_members */
+    CEllipticalCylinderModel_methods,             /* tp_methods */
+    CEllipticalCylinderModel_members,             /* tp_members */
     0,                         /* tp_getset */
     0,                         /* tp_base */
@@ -279 +279 @@
     0,                         /* tp_descr_set */
     0,                         /* tp_dictoffset */
-    (initproc)[PYTHONCLASS]_init,      /* tp_init */
+    (initproc)CEllipticalCylinderModel_init,      /* tp_init */
     0,                         /* tp_alloc */
-    [PYTHONCLASS]_new,                 /* tp_new */
+    CEllipticalCylinderModel_new,                 /* tp_new */
 };
 
@@ -293 +293 @@
  * @param module: module to add the class to
  */ 
-void add[PYTHONCLASS](PyObject *module) {
+void addCEllipticalCylinderModel(PyObject *module) {
         PyObject *d;
         
-    if (PyType_Ready(&[PYTHONCLASS]Type) < 0)
+    if (PyType_Ready(&CEllipticalCylinderModelType) < 0)
         return;
 
-    Py_INCREF(&[PYTHONCLASS]Type);
-    PyModule_AddObject(module, "[PYTHONCLASS]", (PyObject *)&[PYTHONCLASS]Type);
+    Py_INCREF(&CEllipticalCylinderModelType);
+    PyModule_AddObject(module, "CEllipticalCylinderModel", (PyObject *)&CEllipticalCylinderModelType);
     
     d = PyModule_GetDict(module);
-    [PYTHONCLASS]Error = PyErr_NewException("[PYTHONCLASS].error", NULL, NULL);
-    PyDict_SetItemString(d, "[PYTHONCLASS]Error", [PYTHONCLASS]Error);
-}
-
+    CEllipticalCylinderModelError = PyErr_NewException("CEllipticalCylinderModel.error", NULL, NULL);
+    PyDict_SetItemString(d, "CEllipticalCylinderModelError", CEllipticalCylinderModelError);
+}
+

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

@@ -4 +4 @@
  *
  * WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
- *          DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\parallelepiped.h
+ *          DO NOT MODIFY THIS FILE, MODIFY parallelepiped.h
  *          AND RE-RUN THE GENERATOR SCRIPT
  *
@@ -17 +17 @@
 #include <time.h>
 
-#include "..\c_extensions\parallelepiped.h"
+#include "parallelepiped.h"
 
 /// Error object for raised exceptions
@@ -62 +62 @@
         
         // Initialize parameter dictionary
+        PyDict_SetItemString(self->params,"short_a",Py_BuildValue("d",35.000000));
+        PyDict_SetItemString(self->params,"short_b",Py_BuildValue("d",75.000000));
         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000));
-        PyDict_SetItemString(self->params,"longer_edgeB",Py_BuildValue("d",75.000000));
-        PyDict_SetItemString(self->params,"longuest_edgeC",Py_BuildValue("d",400.000000));
-        PyDict_SetItemString(self->params,"parallel_phi",Py_BuildValue("d",1.000000));
-        PyDict_SetItemString(self->params,"parallel_theta",Py_BuildValue("d",1.000000));
+        PyDict_SetItemString(self->params,"long_c",Py_BuildValue("d",400.000000));
+        PyDict_SetItemString(self->params,"parallel_psi",Py_BuildValue("d",0.000000));
+        PyDict_SetItemString(self->params,"parallel_phi",Py_BuildValue("d",0.000000));
+        PyDict_SetItemString(self->params,"parallel_theta",Py_BuildValue("d",0.000000));
         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000));
-        PyDict_SetItemString(self->params,"short_edgeA",Py_BuildValue("d",35.000000));
         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000005));
 
@@ -119 +120 @@
         
         // Reader parameter dictionary
+    self->model_pars.short_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_a") );
+    self->model_pars.short_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_b") );
     self->model_pars.scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
-    self->model_pars.longer_edgeB = PyFloat_AsDouble( PyDict_GetItemString(self->params, "longer_edgeB") );
-    self->model_pars.longuest_edgeC = PyFloat_AsDouble( PyDict_GetItemString(self->params, "longuest_edgeC") );
+    self->model_pars.long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") );
+    self->model_pars.parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") );
     self->model_pars.parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") );
     self->model_pars.parallel_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_theta") );
     self->model_pars.background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
-    self->model_pars.short_edgeA = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_edgeA") );
     self->model_pars.contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
 
@@ -154 +156 @@
                 return Py_BuildValue("d",0.0);
             }
-                return Py_BuildValue("d",_analytical_2D(&(self->model_pars),q_value,phi_value));
+                return Py_BuildValue("d",parallelepiped_analytical_2D(&(self->model_pars),q_value,phi_value));
 
         } else {
@@ -161 +163 @@
                 q_value = CParallelepipedModel_readDouble(pars);                
                 
-                return Py_BuildValue("d",_analytical_1D(&(self->model_pars),q_value));
+                return Py_BuildValue("d",parallelepiped_analytical_1D(&(self->model_pars),q_value));
         }       
 }
@@ -178 +180 @@
         
         // Reader parameter dictionary
+    self->model_pars.short_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_a") );
+    self->model_pars.short_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_b") );
     self->model_pars.scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
-    self->model_pars.longer_edgeB = PyFloat_AsDouble( PyDict_GetItemString(self->params, "longer_edgeB") );
-    self->model_pars.longuest_edgeC = PyFloat_AsDouble( PyDict_GetItemString(self->params, "longuest_edgeC") );
+    self->model_pars.long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") );
+    self->model_pars.parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") );
     self->model_pars.parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") );
     self->model_pars.parallel_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_theta") );
     self->model_pars.background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
-    self->model_pars.short_edgeA = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_edgeA") );
     self->model_pars.contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
 
@@ -209 +212 @@
             qx_value = CParallelepipedModel_readDouble(PyList_GET_ITEM(pars,0));
             qy_value = CParallelepipedModel_readDouble(PyList_GET_ITEM(pars,1));
-                return Py_BuildValue("d",_analytical_2DXY(&(self->model_pars),qx_value,qy_value));
+                return Py_BuildValue("d",parallelepiped_analytical_2DXY(&(self->model_pars),qx_value,qy_value));
 
         } else {
@@ -216 +219 @@
                 qx_value = CParallelepipedModel_readDouble(pars);               
                 
-                return Py_BuildValue("d",_analytical_1D(&(self->model_pars),qx_value));
+                return Py_BuildValue("d",parallelepiped_analytical_1D(&(self->model_pars),qx_value));
         }       
 }

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

@@ -1 @@
-/** [PYTHONCLASS]
+/** CSphereModel
  *
  * C extension 
@@ -20 +20 @@
 
 /// Error object for raised exceptions
-static PyObject * [PYTHONCLASS]Error = NULL;
+static PyObject * CSphereModelError = NULL;
 
 
@@ -32 +32 @@
     /// Model parameters
         SphereParameters model_pars;
-} [PYTHONCLASS];
+} CSphereModel;
 
 
 static void
-[PYTHONCLASS]_dealloc([PYTHONCLASS]* self)
+CSphereModel_dealloc(CSphereModel* self)
 {
     self->ob_type->tp_free((PyObject*)self);
@@ -44 +44 @@
 
 static PyObject *
-[PYTHONCLASS]_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+CSphereModel_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
-    [PYTHONCLASS] *self;
-    
-    self = ([PYTHONCLASS] *)type->tp_alloc(type, 0);
+    CSphereModel *self;
+    
+    self = (CSphereModel *)type->tp_alloc(type, 0);
    
     return (PyObject *)self;
@@ -54 +54 @@
 
 static int
-[PYTHONCLASS]_init([PYTHONCLASS] *self, PyObject *args, PyObject *kwds)
+CSphereModel_init(CSphereModel *self, PyObject *args, PyObject *kwds)
 {
     if (self != NULL) {
@@ -62 +62 @@
         
         // Initialize parameter dictionary
-        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",0.000001));
+        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000));
         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",60.000000));
         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000));
-        PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",1.000000));
+        PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000001));
 
          
@@ -77 +77 @@
 }
 
-static PyMemberDef [PYTHONCLASS]_members[] = {
-    {"params", T_OBJECT, offsetof([PYTHONCLASS], params), 0,
+static PyMemberDef CSphereModel_members[] = {
+    {"params", T_OBJECT, offsetof(CSphereModel, params), 0,
      "Parameters"},
-    {"log", T_OBJECT, offsetof([PYTHONCLASS], log), 0,
+    {"log", T_OBJECT, offsetof(CSphereModel, log), 0,
      "Log"},
     {NULL}  /* Sentinel */
@@ -89 +89 @@
     @return double
 */
-double [PYTHONCLASS]_readDouble(PyObject *p) {
+double CSphereModel_readDouble(PyObject *p) {
     if (PyFloat_Check(p)==1) {
         return (double)(((PyFloatObject *)(p))->ob_fval);
@@ -107 +107 @@
  * @return: function value
  */
-static PyObject * run([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * run(CSphereModel *self, PyObject *args) {
         double q_value, phi_value;
         PyObject* pars;
@@ -123 +123 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CSphereModelError, 
+                "CSphereModel.run expects a q value.");
                 return NULL;
         }
@@ -134 +134 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CSphereModelError, 
+                        "CSphereModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the q and phi values at which
             // to evaluate I(q,phi)
-            q_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            phi_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            q_value = CSphereModel_readDouble(PyList_GET_ITEM(pars,0));
+            phi_value = CSphereModel_readDouble(PyList_GET_ITEM(pars,1));
             // Skip zero
             if (q_value==0) {
@@ -151 +151 @@
 
                 // We have a scalar q, we will evaluate I(q)
-                q_value = [PYTHONCLASS]_readDouble(pars);               
+                q_value = CSphereModel_readDouble(pars);                
                 
                 return Py_BuildValue("d",sphere_analytical_1D(&(self->model_pars),q_value));
@@ -162 +162 @@
  * @return: function value
  */
-static PyObject * runXY([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * runXY(CSphereModel *self, PyObject *args) {
         double qx_value, qy_value;
         PyObject* pars;
@@ -178 +178 @@
         // Get input and determine whether we have to supply a 1D or 2D return value.
         if ( !PyArg_ParseTuple(args,"O",&pars) ) {
-            PyErr_SetString([PYTHONCLASS]Error, 
-                "[PYTHONCLASS].run expects a q value.");
+            PyErr_SetString(CSphereModelError, 
+                "CSphereModel.run expects a q value.");
                 return NULL;
         }
@@ -189 +189 @@
             npars = PyList_GET_SIZE(pars); 
             if(npars!=2) {
-                PyErr_SetString([PYTHONCLASS]Error, 
-                        "[PYTHONCLASS].run expects a double or a list of dimension 2.");
+                PyErr_SetString(CSphereModelError, 
+                        "CSphereModel.run expects a double or a list of dimension 2.");
                 return NULL;
             }
             // We have a vector q, get the qx and qy values at which
             // to evaluate I(qx,qy)
-            qx_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,0));
-            qy_value = [PYTHONCLASS]_readDouble(PyList_GET_ITEM(pars,1));
+            qx_value = CSphereModel_readDouble(PyList_GET_ITEM(pars,0));
+            qy_value = CSphereModel_readDouble(PyList_GET_ITEM(pars,1));
                 return Py_BuildValue("d",sphere_analytical_2DXY(&(self->model_pars),qx_value,qy_value));
 
@@ -202 +202 @@
 
                 // We have a scalar q, we will evaluate I(q)
-                qx_value = [PYTHONCLASS]_readDouble(pars);              
+                qx_value = CSphereModel_readDouble(pars);               
                 
                 return Py_BuildValue("d",sphere_analytical_1D(&(self->model_pars),qx_value));
@@ -208 +208 @@
 }
 
-static PyObject * reset([PYTHONCLASS] *self, PyObject *args) {
+static PyObject * reset(CSphereModel *self, PyObject *args) {
     
 
@@ -215 +215 @@
 
 
-static PyMethodDef [PYTHONCLASS]_methods[] = {
+static PyMethodDef CSphereModel_methods[] = {
     {"run",      (PyCFunction)run     , METH_VARARGS,
       "Evaluate the model at a given Q or Q, phi"},
@@ -227 +227 @@
 };
 
-static PyTypeObject [PYTHONCLASS]Type = {
+static PyTypeObject CSphereModelType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "[PYTHONCLASS]",             /*tp_name*/
-    sizeof([PYTHONCLASS]),             /*tp_basicsize*/
+    "CSphereModel",             /*tp_name*/
+    sizeof(CSphereModel),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
-    (destructor)[PYTHONCLASS]_dealloc, /*tp_dealloc*/
+    (destructor)CSphereModel_dealloc, /*tp_dealloc*/
     0,                         /*tp_print*/
     0,                         /*tp_getattr*/
@@ -249 +249 @@
     0,                         /*tp_as_buffer*/
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-    "[PYTHONCLASS] objects",           /* tp_doc */
+    "CSphereModel objects",           /* tp_doc */
     0,                         /* tp_traverse */
     0,                         /* tp_clear */
@@ -256 +256 @@
     0,                         /* tp_iter */
     0,                         /* tp_iternext */
-    [PYTHONCLASS]_methods,             /* tp_methods */
-    [PYTHONCLASS]_members,             /* tp_members */
+    CSphereModel_methods,             /* tp_methods */
+    CSphereModel_members,             /* tp_members */
     0,                         /* tp_getset */
     0,                         /* tp_base */
@@ -264 +264 @@
     0,                         /* tp_descr_set */
     0,                         /* tp_dictoffset */
-    (initproc)[PYTHONCLASS]_init,      /* tp_init */
+    (initproc)CSphereModel_init,      /* tp_init */
     0,                         /* tp_alloc */
-    [PYTHONCLASS]_new,                 /* tp_new */
+    CSphereModel_new,                 /* tp_new */
 };
 
@@ -278 +278 @@
  * @param module: module to add the class to
  */ 
-void add[PYTHONCLASS](PyObject *module) {
+void addCSphereModel(PyObject *module) {
         PyObject *d;
         
-    if (PyType_Ready(&[PYTHONCLASS]Type) < 0)
+    if (PyType_Ready(&CSphereModelType) < 0)
         return;
 
-    Py_INCREF(&[PYTHONCLASS]Type);
-    PyModule_AddObject(module, "[PYTHONCLASS]", (PyObject *)&[PYTHONCLASS]Type);
+    Py_INCREF(&CSphereModelType);
+    PyModule_AddObject(module, "CSphereModel", (PyObject *)&CSphereModelType);
     
     d = PyModule_GetDict(module);
-    [PYTHONCLASS]Error = PyErr_NewException("[PYTHONCLASS].error", NULL, NULL);
-    PyDict_SetItemString(d, "[PYTHONCLASS]Error", [PYTHONCLASS]Error);
-}
-
+    CSphereModelError = PyErr_NewException("CSphereModel.error", NULL, NULL);
+    PyDict_SetItemString(d, "CSphereModelError", CSphereModelError);
+}
+