source: sasview/sansmodels/src/sans/models/c_models/CHollowCylinderModel.cpp @ 437e639

ESS_GUIESS_GUI_DocsESS_GUI_batch_fittingESS_GUI_bumps_abstractionESS_GUI_iss1116ESS_GUI_iss879ESS_GUI_iss959ESS_GUI_openclESS_GUI_orderingESS_GUI_sync_sascalccostrafo411magnetic_scattrelease-4.1.1release-4.1.2release-4.2.2release_4.0.1ticket-1009ticket-1094-headlessticket-1242-2d-resolutionticket-1243ticket-1249ticket885unittest-saveload
Last change on this file since 437e639 was 3080527, checked in by Jae Cho <jhjcho@…>, 15 years ago

changed classtemplate for 2d evaluation from matrix form to 1d array form
  • Property mode set to 100644
File size: 25.0 KB
Line 
1/**
2        This software was developed by the University of Tennessee as part of the
3        Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
4        project funded by the US National Science Foundation.
5
6        If you use DANSE applications to do scientific research that leads to
7        publication, we ask that you acknowledge the use of the software with the
8        following sentence:
9
10        "This work benefited from DANSE software developed under NSF award DMR-0520547."
11
12        copyright 2008, University of Tennessee
13 */
14
15/** CHollowCylinderModel
16 *
17 * C extension
18 *
19 * WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
20 *          DO NOT MODIFY THIS FILE, MODIFY hollow_cylinder.h
21 *          AND RE-RUN THE GENERATOR SCRIPT
22 *
23 */
24#define NO_IMPORT_ARRAY
25#define PY_ARRAY_UNIQUE_SYMBOL PyArray_API_sans
26 
27extern "C" {
28#include <Python.h>
29#include <arrayobject.h>
30#include "structmember.h"
31#include <stdio.h>
32#include <stdlib.h>
33#include <math.h>
34#include <time.h>
35#include "hollow_cylinder.h"
36}
37
38#include "models.hh"
39#include "dispersion_visitor.hh"
40
41/// Error object for raised exceptions
42static PyObject * CHollowCylinderModelError = NULL;
43
44
45// Class definition
46typedef struct {
47    PyObject_HEAD
48    /// Parameters
49    PyObject * params;
50    /// Dispersion parameters
51    PyObject * dispersion;
52    /// Underlying model object
53    HollowCylinderModel * model;
54    /// Log for unit testing
55    PyObject * log;
56} CHollowCylinderModel;
57
58
59static void
60CHollowCylinderModel_dealloc(CHollowCylinderModel* self)
61{
62    Py_DECREF(self->params);
63    Py_DECREF(self->dispersion);
64    Py_DECREF(self->log);
65    delete self->model;
66    self->ob_type->tp_free((PyObject*)self);
67   
68
69}
70
71static PyObject *
72CHollowCylinderModel_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
73{
74    CHollowCylinderModel *self;
75   
76    self = (CHollowCylinderModel *)type->tp_alloc(type, 0);
77   
78    return (PyObject *)self;
79}
80
81static int
82CHollowCylinderModel_init(CHollowCylinderModel *self, PyObject *args, PyObject *kwds)
83{
84    if (self != NULL) {
85       
86        // Create parameters
87        self->params = PyDict_New();
88        self->dispersion = PyDict_New();
89        self->model = new HollowCylinderModel();
90       
91        // Initialize parameter dictionary
92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000));
93        PyDict_SetItemString(self->params,"core_radius",Py_BuildValue("d",20.000000));
94        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.570000));
95        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000));
96        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.000000));
97        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",30.000000));
98        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.010000));
99        PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000005));
100        // Initialize dispersion / averaging parameter dict
101        DispersionVisitor* visitor = new DispersionVisitor();
102        PyObject * disp_dict;
103        disp_dict = PyDict_New();
104        self->model->core_radius.dispersion->accept_as_source(visitor, self->model->core_radius.dispersion, disp_dict);
105        PyDict_SetItemString(self->dispersion, "core_radius", disp_dict);
106        disp_dict = PyDict_New();
107        self->model->radius.dispersion->accept_as_source(visitor, self->model->radius.dispersion, disp_dict);
108        PyDict_SetItemString(self->dispersion, "radius", disp_dict);
109        disp_dict = PyDict_New();
110        self->model->length.dispersion->accept_as_source(visitor, self->model->length.dispersion, disp_dict);
111        PyDict_SetItemString(self->dispersion, "length", disp_dict);
112        disp_dict = PyDict_New();
113        self->model->axis_theta.dispersion->accept_as_source(visitor, self->model->axis_theta.dispersion, disp_dict);
114        PyDict_SetItemString(self->dispersion, "axis_theta", disp_dict);
115        disp_dict = PyDict_New();
116        self->model->axis_phi.dispersion->accept_as_source(visitor, self->model->axis_phi.dispersion, disp_dict);
117        PyDict_SetItemString(self->dispersion, "axis_phi", disp_dict);
118
119
120         
121        // Create empty log
122        self->log = PyDict_New();
123       
124       
125
126    }
127    return 0;
128}
129
130static PyMemberDef CHollowCylinderModel_members[] = {
131    {"params", T_OBJECT, offsetof(CHollowCylinderModel, params), 0,
132     "Parameters"},
133        {"dispersion", T_OBJECT, offsetof(CHollowCylinderModel, dispersion), 0,
134          "Dispersion parameters"},     
135    {"log", T_OBJECT, offsetof(CHollowCylinderModel, log), 0,
136     "Log"},
137    {NULL}  /* Sentinel */
138};
139
140/** Read double from PyObject
141    @param p PyObject
142    @return double
143*/
144double CHollowCylinderModel_readDouble(PyObject *p) {
145    if (PyFloat_Check(p)==1) {
146        return (double)(((PyFloatObject *)(p))->ob_fval);
147    } else if (PyInt_Check(p)==1) {
148        return (double)(((PyIntObject *)(p))->ob_ival);
149    } else if (PyLong_Check(p)==1) {
150        return (double)PyLong_AsLong(p);
151    } else {
152        return 0.0;
153    }
154}
155/**
156 * Function to call to evaluate model
157 * @param args: input numpy array q[]
158 * @return: numpy array object
159 */
160 
161static PyObject *evaluateOneDim(HollowCylinderModel* model, PyArrayObject *q){
162    PyArrayObject *result;
163   
164    // Check validity of array q , q must be of dimension 1, an array of double
165    if (q->nd != 1 || q->descr->type_num != PyArray_DOUBLE)
166    {
167        //const char * message= "Invalid array: q->nd=%d,type_num=%d\n",q->nd,q->descr->type_num;
168        //PyErr_SetString(PyExc_ValueError , message);
169        return NULL;
170    }
171    result = (PyArrayObject *)PyArray_FromDims(q->nd, (int *)(q->dimensions), 
172                                                                                  PyArray_DOUBLE);
173        if (result == NULL) {
174        const char * message= "Could not create result ";
175        PyErr_SetString(PyExc_RuntimeError , message);
176                return NULL;
177        }
178         for (int i = 0; i < q->dimensions[0]; i++){
179      double q_value  = *(double *)(q->data + i*q->strides[0]);
180      double *result_value = (double *)(result->data + i*result->strides[0]);
181      *result_value =(*model)(q_value);
182        }
183    return PyArray_Return(result); 
184 }
185
186 /**
187 * Function to call to evaluate model
188 * @param args: input numpy array  [x[],y[]]
189 * @return: numpy array object
190 */
191 static PyObject * evaluateTwoDimXY( HollowCylinderModel* model, 
192                              PyArrayObject *x, PyArrayObject *y)
193 {
194    PyArrayObject *result;
195    int i,j, x_len, y_len, dims[1];
196    //check validity of input vectors
197    if (x->nd != 1 || x->descr->type_num != PyArray_DOUBLE
198        || y->nd != 1 || y->descr->type_num != PyArray_DOUBLE
199        || y->dimensions[0] != x->dimensions[0]){
200        const char * message= "evaluateTwoDimXY  expect 2 numpy arrays";
201        PyErr_SetString(PyExc_ValueError , message); 
202        return NULL;
203    }
204   
205        if (PyArray_Check(x) && PyArray_Check(y)) {
206               
207            x_len = dims[0]= x->dimensions[0];
208        y_len = dims[0]= y->dimensions[0];
209           
210            // Make a new double matrix of same dims
211        result=(PyArrayObject *) PyArray_FromDims(1,dims,NPY_DOUBLE);
212        if (result == NULL){
213            const char * message= "Could not create result ";
214        PyErr_SetString(PyExc_RuntimeError , message);
215            return NULL;
216            }
217       
218        /* Do the calculation. */
219        for ( i=0; i< x_len; i++) {
220            double x_value = *(double *)(x->data + i*x->strides[0]);
221                    double y_value = *(double *)(y->data + i*y->strides[0]);
222                        double *result_value = (double *)(result->data +
223                              i*result->strides[0]);
224                        *result_value = (*model)(x_value, y_value);
225        }           
226        return PyArray_Return(result); 
227       
228        }else{
229                    PyErr_SetString(CHollowCylinderModelError, 
230                   "CHollowCylinderModel.evaluateTwoDimXY couldn't run.");
231                return NULL;
232                }       
233}
234/**
235 *  evalDistribution function evaluate a model function with input vector
236 *  @param args: input q as vector or [qx, qy] where qx, qy are vectors
237 *
238 */ 
239static PyObject * evalDistribution(CHollowCylinderModel *self, PyObject *args){
240        PyObject *qx, *qy;
241        PyArrayObject * pars;
242        int npars ,mpars;
243       
244        // Get parameters
245       
246            // Reader parameter dictionary
247    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
248    self->model->core_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "core_radius") );
249    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") );
250    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") );
251    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") );
252    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") );
253    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
254    self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
255    // Read in dispersion parameters
256    PyObject* disp_dict;
257    DispersionVisitor* visitor = new DispersionVisitor();
258    disp_dict = PyDict_GetItemString(self->dispersion, "core_radius");
259    self->model->core_radius.dispersion->accept_as_destination(visitor, self->model->core_radius.dispersion, disp_dict);
260    disp_dict = PyDict_GetItemString(self->dispersion, "radius");
261    self->model->radius.dispersion->accept_as_destination(visitor, self->model->radius.dispersion, disp_dict);
262    disp_dict = PyDict_GetItemString(self->dispersion, "length");
263    self->model->length.dispersion->accept_as_destination(visitor, self->model->length.dispersion, disp_dict);
264    disp_dict = PyDict_GetItemString(self->dispersion, "axis_theta");
265    self->model->axis_theta.dispersion->accept_as_destination(visitor, self->model->axis_theta.dispersion, disp_dict);
266    disp_dict = PyDict_GetItemString(self->dispersion, "axis_phi");
267    self->model->axis_phi.dispersion->accept_as_destination(visitor, self->model->axis_phi.dispersion, disp_dict);
268
269       
270        // Get input and determine whether we have to supply a 1D or 2D return value.
271        if ( !PyArg_ParseTuple(args,"O",&pars) ) {
272            PyErr_SetString(CHollowCylinderModelError, 
273                "CHollowCylinderModel.evalDistribution expects a q value.");
274                return NULL;
275        }
276    // Check params
277       
278    if(PyArray_Check(pars)==1) {
279               
280            // Length of list should 1 or 2
281            npars = pars->nd; 
282            if(npars==1) {
283                // input is a numpy array
284                if (PyArray_Check(pars)) {
285                        return evaluateOneDim(self->model, (PyArrayObject*)pars); 
286                    }
287                }else{
288                    PyErr_SetString(CHollowCylinderModelError, 
289                   "CHollowCylinderModel.evalDistribution expect numpy array of one dimension.");
290                return NULL;
291                }
292    }else if( PyList_Check(pars)==1) {
293        // Length of list should be 2 for I(qx,qy)
294            mpars = PyList_GET_SIZE(pars); 
295            if(mpars!=2) {
296                PyErr_SetString(CHollowCylinderModelError, 
297                        "CHollowCylinderModel.evalDistribution expects a list of dimension 2.");
298                return NULL;
299            }
300             qx = PyList_GET_ITEM(pars,0);
301             qy = PyList_GET_ITEM(pars,1);
302             if (PyArray_Check(qx) && PyArray_Check(qy)) {
303                 return evaluateTwoDimXY(self->model, (PyArrayObject*)qx,
304                           (PyArrayObject*)qy);
305                 }else{
306                    PyErr_SetString(CHollowCylinderModelError, 
307                   "CHollowCylinderModel.evalDistribution expect 2 numpy arrays in list.");
308                return NULL;
309             }
310        }
311        PyErr_SetString(CHollowCylinderModelError, 
312                   "CHollowCylinderModel.evalDistribution couln't be run.");
313        return NULL;
314       
315}
316
317/**
318 * Function to call to evaluate model
319 * @param args: input q or [q,phi]
320 * @return: function value
321 */
322static PyObject * run(CHollowCylinderModel *self, PyObject *args) {
323        double q_value, phi_value;
324        PyObject* pars;
325        int npars;
326       
327        // Get parameters
328       
329            // Reader parameter dictionary
330    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
331    self->model->core_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "core_radius") );
332    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") );
333    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") );
334    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") );
335    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") );
336    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
337    self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
338    // Read in dispersion parameters
339    PyObject* disp_dict;
340    DispersionVisitor* visitor = new DispersionVisitor();
341    disp_dict = PyDict_GetItemString(self->dispersion, "core_radius");
342    self->model->core_radius.dispersion->accept_as_destination(visitor, self->model->core_radius.dispersion, disp_dict);
343    disp_dict = PyDict_GetItemString(self->dispersion, "radius");
344    self->model->radius.dispersion->accept_as_destination(visitor, self->model->radius.dispersion, disp_dict);
345    disp_dict = PyDict_GetItemString(self->dispersion, "length");
346    self->model->length.dispersion->accept_as_destination(visitor, self->model->length.dispersion, disp_dict);
347    disp_dict = PyDict_GetItemString(self->dispersion, "axis_theta");
348    self->model->axis_theta.dispersion->accept_as_destination(visitor, self->model->axis_theta.dispersion, disp_dict);
349    disp_dict = PyDict_GetItemString(self->dispersion, "axis_phi");
350    self->model->axis_phi.dispersion->accept_as_destination(visitor, self->model->axis_phi.dispersion, disp_dict);
351
352       
353        // Get input and determine whether we have to supply a 1D or 2D return value.
354        if ( !PyArg_ParseTuple(args,"O",&pars) ) {
355            PyErr_SetString(CHollowCylinderModelError, 
356                "CHollowCylinderModel.run expects a q value.");
357                return NULL;
358        }
359         
360        // Check params
361        if( PyList_Check(pars)==1) {
362               
363                // Length of list should be 2 for I(q,phi)
364            npars = PyList_GET_SIZE(pars); 
365            if(npars!=2) {
366                PyErr_SetString(CHollowCylinderModelError, 
367                        "CHollowCylinderModel.run expects a double or a list of dimension 2.");
368                return NULL;
369            }
370            // We have a vector q, get the q and phi values at which
371            // to evaluate I(q,phi)
372            q_value = CHollowCylinderModel_readDouble(PyList_GET_ITEM(pars,0));
373            phi_value = CHollowCylinderModel_readDouble(PyList_GET_ITEM(pars,1));
374            // Skip zero
375            if (q_value==0) {
376                return Py_BuildValue("d",0.0);
377            }
378                return Py_BuildValue("d",(*(self->model)).evaluate_rphi(q_value,phi_value));
379
380        } else {
381
382                // We have a scalar q, we will evaluate I(q)
383                q_value = CHollowCylinderModel_readDouble(pars);               
384               
385                return Py_BuildValue("d",(*(self->model))(q_value));
386        }       
387}
388/**
389 * Function to call to calculate_ER
390 * @return: effective radius value
391 */
392static PyObject * calculate_ER(CHollowCylinderModel *self) {
393
394        PyObject* pars;
395        int npars;
396       
397        // Get parameters
398       
399            // Reader parameter dictionary
400    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
401    self->model->core_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "core_radius") );
402    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") );
403    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") );
404    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") );
405    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") );
406    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
407    self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
408    // Read in dispersion parameters
409    PyObject* disp_dict;
410    DispersionVisitor* visitor = new DispersionVisitor();
411    disp_dict = PyDict_GetItemString(self->dispersion, "core_radius");
412    self->model->core_radius.dispersion->accept_as_destination(visitor, self->model->core_radius.dispersion, disp_dict);
413    disp_dict = PyDict_GetItemString(self->dispersion, "radius");
414    self->model->radius.dispersion->accept_as_destination(visitor, self->model->radius.dispersion, disp_dict);
415    disp_dict = PyDict_GetItemString(self->dispersion, "length");
416    self->model->length.dispersion->accept_as_destination(visitor, self->model->length.dispersion, disp_dict);
417    disp_dict = PyDict_GetItemString(self->dispersion, "axis_theta");
418    self->model->axis_theta.dispersion->accept_as_destination(visitor, self->model->axis_theta.dispersion, disp_dict);
419    disp_dict = PyDict_GetItemString(self->dispersion, "axis_phi");
420    self->model->axis_phi.dispersion->accept_as_destination(visitor, self->model->axis_phi.dispersion, disp_dict);
421
422               
423        return Py_BuildValue("d",(*(self->model)).calculate_ER());
424
425}
426/**
427 * Function to call to evaluate model in cartesian coordinates
428 * @param args: input q or [qx, qy]]
429 * @return: function value
430 */
431static PyObject * runXY(CHollowCylinderModel *self, PyObject *args) {
432        double qx_value, qy_value;
433        PyObject* pars;
434        int npars;
435       
436        // Get parameters
437       
438            // Reader parameter dictionary
439    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") );
440    self->model->core_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "core_radius") );
441    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") );
442    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") );
443    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") );
444    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") );
445    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") );
446    self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );
447    // Read in dispersion parameters
448    PyObject* disp_dict;
449    DispersionVisitor* visitor = new DispersionVisitor();
450    disp_dict = PyDict_GetItemString(self->dispersion, "core_radius");
451    self->model->core_radius.dispersion->accept_as_destination(visitor, self->model->core_radius.dispersion, disp_dict);
452    disp_dict = PyDict_GetItemString(self->dispersion, "radius");
453    self->model->radius.dispersion->accept_as_destination(visitor, self->model->radius.dispersion, disp_dict);
454    disp_dict = PyDict_GetItemString(self->dispersion, "length");
455    self->model->length.dispersion->accept_as_destination(visitor, self->model->length.dispersion, disp_dict);
456    disp_dict = PyDict_GetItemString(self->dispersion, "axis_theta");
457    self->model->axis_theta.dispersion->accept_as_destination(visitor, self->model->axis_theta.dispersion, disp_dict);
458    disp_dict = PyDict_GetItemString(self->dispersion, "axis_phi");
459    self->model->axis_phi.dispersion->accept_as_destination(visitor, self->model->axis_phi.dispersion, disp_dict);
460
461       
462        // Get input and determine whether we have to supply a 1D or 2D return value.
463        if ( !PyArg_ParseTuple(args,"O",&pars) ) {
464            PyErr_SetString(CHollowCylinderModelError, 
465                "CHollowCylinderModel.run expects a q value.");
466                return NULL;
467        }
468         
469        // Check params
470        if( PyList_Check(pars)==1) {
471               
472                // Length of list should be 2 for I(qx, qy))
473            npars = PyList_GET_SIZE(pars); 
474            if(npars!=2) {
475                PyErr_SetString(CHollowCylinderModelError, 
476                        "CHollowCylinderModel.run expects a double or a list of dimension 2.");
477                return NULL;
478            }
479            // We have a vector q, get the qx and qy values at which
480            // to evaluate I(qx,qy)
481            qx_value = CHollowCylinderModel_readDouble(PyList_GET_ITEM(pars,0));
482            qy_value = CHollowCylinderModel_readDouble(PyList_GET_ITEM(pars,1));
483            return Py_BuildValue("d",(*(self->model))(qx_value,qy_value));
484
485        } else {
486
487                // We have a scalar q, we will evaluate I(q)
488                qx_value = CHollowCylinderModel_readDouble(pars);               
489               
490                return Py_BuildValue("d",(*(self->model))(qx_value));
491        }       
492}
493
494static PyObject * reset(CHollowCylinderModel *self, PyObject *args) {
495   
496
497    return Py_BuildValue("d",0.0);
498}
499
500static PyObject * set_dispersion(CHollowCylinderModel *self, PyObject *args) {
501        PyObject * disp;
502        const char * par_name;
503
504        if ( !PyArg_ParseTuple(args,"sO", &par_name, &disp) ) {
505            PyErr_SetString(CHollowCylinderModelError,
506                "CHollowCylinderModel.set_dispersion expects a DispersionModel object.");
507                return NULL;
508        }
509        void *temp = PyCObject_AsVoidPtr(disp);
510        DispersionModel * dispersion = static_cast<DispersionModel *>(temp);
511
512
513        // Ugliness necessary to go from python to C
514            // TODO: refactor this
515    if (!strcmp(par_name, "core_radius")) {
516        self->model->core_radius.dispersion = dispersion;
517    } else    if (!strcmp(par_name, "radius")) {
518        self->model->radius.dispersion = dispersion;
519    } else    if (!strcmp(par_name, "length")) {
520        self->model->length.dispersion = dispersion;
521    } else    if (!strcmp(par_name, "axis_theta")) {
522        self->model->axis_theta.dispersion = dispersion;
523    } else    if (!strcmp(par_name, "axis_phi")) {
524        self->model->axis_phi.dispersion = dispersion;
525    } else {
526            PyErr_SetString(CHollowCylinderModelError,
527                "CHollowCylinderModel.set_dispersion expects a valid parameter name.");
528                return NULL;
529        }
530
531        DispersionVisitor* visitor = new DispersionVisitor();
532        PyObject * disp_dict = PyDict_New();
533        dispersion->accept_as_source(visitor, dispersion, disp_dict);
534        PyDict_SetItemString(self->dispersion, par_name, disp_dict);
535    return Py_BuildValue("i",1);
536}
537
538
539static PyMethodDef CHollowCylinderModel_methods[] = {
540    {"run",      (PyCFunction)run     , METH_VARARGS,
541      "Evaluate the model at a given Q or Q, phi"},
542    {"runXY",      (PyCFunction)runXY     , METH_VARARGS,
543      "Evaluate the model at a given Q or Qx, Qy"},
544    {"calculate_ER",      (PyCFunction)calculate_ER     , METH_VARARGS,
545      "Evaluate the model at a given Q or Q, phi"},
546     
547    {"evalDistribution",  (PyCFunction)evalDistribution , METH_VARARGS,
548      "Evaluate the model at a given Q or Qx, Qy vector "},
549    {"reset",    (PyCFunction)reset   , METH_VARARGS,
550      "Reset pair correlation"},
551    {"set_dispersion",      (PyCFunction)set_dispersion     , METH_VARARGS,
552      "Set the dispersion model for a given parameter"},
553   {NULL}
554};
555
556static PyTypeObject CHollowCylinderModelType = {
557    PyObject_HEAD_INIT(NULL)
558    0,                         /*ob_size*/
559    "CHollowCylinderModel",             /*tp_name*/
560    sizeof(CHollowCylinderModel),             /*tp_basicsize*/
561    0,                         /*tp_itemsize*/
562    (destructor)CHollowCylinderModel_dealloc, /*tp_dealloc*/
563    0,                         /*tp_print*/
564    0,                         /*tp_getattr*/
565    0,                         /*tp_setattr*/
566    0,                         /*tp_compare*/
567    0,                         /*tp_repr*/
568    0,                         /*tp_as_number*/
569    0,                         /*tp_as_sequence*/
570    0,                         /*tp_as_mapping*/
571    0,                         /*tp_hash */
572    0,                         /*tp_call*/
573    0,                         /*tp_str*/
574    0,                         /*tp_getattro*/
575    0,                         /*tp_setattro*/
576    0,                         /*tp_as_buffer*/
577    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
578    "CHollowCylinderModel objects",           /* tp_doc */
579    0,                         /* tp_traverse */
580    0,                         /* tp_clear */
581    0,                         /* tp_richcompare */
582    0,                         /* tp_weaklistoffset */
583    0,                         /* tp_iter */
584    0,                         /* tp_iternext */
585    CHollowCylinderModel_methods,             /* tp_methods */
586    CHollowCylinderModel_members,             /* tp_members */
587    0,                         /* tp_getset */
588    0,                         /* tp_base */
589    0,                         /* tp_dict */
590    0,                         /* tp_descr_get */
591    0,                         /* tp_descr_set */
592    0,                         /* tp_dictoffset */
593    (initproc)CHollowCylinderModel_init,      /* tp_init */
594    0,                         /* tp_alloc */
595    CHollowCylinderModel_new,                 /* tp_new */
596};
597
598
599//static PyMethodDef module_methods[] = {
600//    {NULL}
601//};
602
603/**
604 * Function used to add the model class to a module
605 * @param module: module to add the class to
606 */ 
607void addCHollowCylinderModel(PyObject *module) {
608        PyObject *d;
609       
610    if (PyType_Ready(&CHollowCylinderModelType) < 0)
611        return;
612
613    Py_INCREF(&CHollowCylinderModelType);
614    PyModule_AddObject(module, "CHollowCylinderModel", (PyObject *)&CHollowCylinderModelType);
615   
616    d = PyModule_GetDict(module);
617    CHollowCylinderModelError = PyErr_NewException("CHollowCylinderModel.error", NULL, NULL);
618    PyDict_SetItemString(d, "CHollowCylinderModelError", CHollowCylinderModelError);
619}
620
Note: See TracBrowser for help on using the repository browser.