Changeset e2afadf in sasview for sansmodels/src/sans/models/c_models/CHollowCylinderModel.cpp
- Timestamp:
- Aug 25, 2009 3:31:36 PM (15 years ago)
- 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:
- ff85cc5
- Parents:
- c8727c5
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/c_models/CHollowCylinderModel.cpp
r870f131 re2afadf 91 91 PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000)); 92 92 PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.000000)); 93 PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",30.000000)); 93 94 PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.010000)); 94 PyDict_SetItemString(self->params,"shell_radius",Py_BuildValue("d",30.000000));95 95 PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000005)); 96 96 // Initialize dispersion / averaging parameter dict … … 101 101 PyDict_SetItemString(self->dispersion, "core_radius", disp_dict); 102 102 disp_dict = PyDict_New(); 103 self->model-> shell_radius.dispersion->accept_as_source(visitor, self->model->shell_radius.dispersion, disp_dict);104 PyDict_SetItemString(self->dispersion, " shell_radius", disp_dict);103 self->model->radius.dispersion->accept_as_source(visitor, self->model->radius.dispersion, disp_dict); 104 PyDict_SetItemString(self->dispersion, "radius", disp_dict); 105 105 disp_dict = PyDict_New(); 106 106 self->model->length.dispersion->accept_as_source(visitor, self->model->length.dispersion, disp_dict); … … 248 248 self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 249 249 self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 250 self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 250 251 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 251 self->model->shell_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "shell_radius") );252 252 self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 253 253 // Read in dispersion parameters … … 256 256 disp_dict = PyDict_GetItemString(self->dispersion, "core_radius"); 257 257 self->model->core_radius.dispersion->accept_as_destination(visitor, self->model->core_radius.dispersion, disp_dict); 258 disp_dict = PyDict_GetItemString(self->dispersion, " shell_radius");259 self->model-> shell_radius.dispersion->accept_as_destination(visitor, self->model->shell_radius.dispersion, disp_dict);258 disp_dict = PyDict_GetItemString(self->dispersion, "radius"); 259 self->model->radius.dispersion->accept_as_destination(visitor, self->model->radius.dispersion, disp_dict); 260 260 disp_dict = PyDict_GetItemString(self->dispersion, "length"); 261 261 self->model->length.dispersion->accept_as_destination(visitor, self->model->length.dispersion, disp_dict); … … 331 331 self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 332 332 self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 333 self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 333 334 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 334 self->model->shell_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "shell_radius") );335 335 self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 336 336 // Read in dispersion parameters … … 339 339 disp_dict = PyDict_GetItemString(self->dispersion, "core_radius"); 340 340 self->model->core_radius.dispersion->accept_as_destination(visitor, self->model->core_radius.dispersion, disp_dict); 341 disp_dict = PyDict_GetItemString(self->dispersion, " shell_radius");342 self->model-> shell_radius.dispersion->accept_as_destination(visitor, self->model->shell_radius.dispersion, disp_dict);341 disp_dict = PyDict_GetItemString(self->dispersion, "radius"); 342 self->model->radius.dispersion->accept_as_destination(visitor, self->model->radius.dispersion, disp_dict); 343 343 disp_dict = PyDict_GetItemString(self->dispersion, "length"); 344 344 self->model->length.dispersion->accept_as_destination(visitor, self->model->length.dispersion, disp_dict); … … 403 403 self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 404 404 self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 405 self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 405 406 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 406 self->model->shell_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "shell_radius") );407 407 self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 408 408 // Read in dispersion parameters … … 411 411 disp_dict = PyDict_GetItemString(self->dispersion, "core_radius"); 412 412 self->model->core_radius.dispersion->accept_as_destination(visitor, self->model->core_radius.dispersion, disp_dict); 413 disp_dict = PyDict_GetItemString(self->dispersion, " shell_radius");414 self->model-> shell_radius.dispersion->accept_as_destination(visitor, self->model->shell_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 415 disp_dict = PyDict_GetItemString(self->dispersion, "length"); 416 416 self->model->length.dispersion->accept_as_destination(visitor, self->model->length.dispersion, disp_dict); … … 476 476 if (!strcmp(par_name, "core_radius")) { 477 477 self->model->core_radius.dispersion = dispersion; 478 } else if (!strcmp(par_name, " shell_radius")) {479 self->model-> shell_radius.dispersion = dispersion;478 } else if (!strcmp(par_name, "radius")) { 479 self->model->radius.dispersion = dispersion; 480 480 } else if (!strcmp(par_name, "length")) { 481 481 self->model->length.dispersion = dispersion;
Note: See TracChangeset
for help on using the changeset viewer.