Changeset 13eb1c4 in sasview for sansmodels/src/sans/models/c_models/CTriaxialEllipsoidModel.cpp
- Timestamp:
- Apr 15, 2010 6:41:29 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:
- 8426622
- Parents:
- 2339249f
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/c_models/CTriaxialEllipsoidModel.cpp
rc724ccd r13eb1c4 97 97 PyDict_SetItemString(self->params,"semi_axisC",Py_BuildValue("d",400.00000000)); 98 98 PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",1.00000000)); 99 PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000630)); 99 100 PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 100 PyDict_SetItemString(self->params," contrast",Py_BuildValue("d",0.00000530));101 PyDict_SetItemString(self->params,"sldEll",Py_BuildValue("d",0.00000100)); 101 102 // Initialize dispersion / averaging parameter dict 102 103 DispersionVisitor* visitor = new DispersionVisitor(); … … 247 248 self->model->semi_axisC = PyFloat_AsDouble( PyDict_GetItemString(self->params, "semi_axisC") ); 248 249 self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 250 self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 249 251 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 250 self->model-> contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );252 self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") ); 251 253 // Read in dispersion parameters 252 254 PyObject* disp_dict; … … 327 329 self->model->semi_axisC = PyFloat_AsDouble( PyDict_GetItemString(self->params, "semi_axisC") ); 328 330 self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 331 self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 329 332 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 330 self->model-> contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );333 self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") ); 331 334 // Read in dispersion parameters 332 335 PyObject* disp_dict; … … 394 397 self->model->semi_axisC = PyFloat_AsDouble( PyDict_GetItemString(self->params, "semi_axisC") ); 395 398 self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 399 self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 396 400 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 397 self->model-> contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );401 self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") ); 398 402 // Read in dispersion parameters 399 403 PyObject* disp_dict; … … 430 434 self->model->semi_axisC = PyFloat_AsDouble( PyDict_GetItemString(self->params, "semi_axisC") ); 431 435 self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 436 self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 432 437 self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 433 self->model-> contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") );438 self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") ); 434 439 // Read in dispersion parameters 435 440 PyObject* disp_dict;
Note: See TracChangeset
for help on using the changeset viewer.