Changeset 8e36cdd in sasview for sansmodels/src/sans/models/c_models/CParallelepipedModel.cpp
- Timestamp:
- Aug 20, 2009 1:24:23 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:
- 1d67243
- Parents:
- 191b369
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sansmodels/src/sans/models/c_models/CParallelepipedModel.cpp
r2cb89e7 r8e36cdd 87 87 // Initialize parameter dictionary 88 88 PyDict_SetItemString(self->params,"short_a",Py_BuildValue("d",35.000000)); 89 PyDict_SetItemString(self->params,"short_b",Py_BuildValue("d",75.000000)); 89 90 PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000)); 90 PyDict_SetItemString(self->params,"long_b",Py_BuildValue("d",75.000000)); 91 PyDict_SetItemString(self->params,"longer_c",Py_BuildValue("d",400.000000)); 91 PyDict_SetItemString(self->params,"long_c",Py_BuildValue("d",400.000000)); 92 92 PyDict_SetItemString(self->params,"parallel_psi",Py_BuildValue("d",0.000000)); 93 93 PyDict_SetItemString(self->params,"parallel_phi",Py_BuildValue("d",0.000000)); … … 102 102 PyDict_SetItemString(self->dispersion, "short_a", disp_dict); 103 103 disp_dict = PyDict_New(); 104 self->model-> long_b.dispersion->accept_as_source(visitor, self->model->long_b.dispersion, disp_dict);105 PyDict_SetItemString(self->dispersion, " long_b", disp_dict);104 self->model->short_b.dispersion->accept_as_source(visitor, self->model->short_b.dispersion, disp_dict); 105 PyDict_SetItemString(self->dispersion, "short_b", disp_dict); 106 106 disp_dict = PyDict_New(); 107 self->model->long er_c.dispersion->accept_as_source(visitor, self->model->longer_c.dispersion, disp_dict);108 PyDict_SetItemString(self->dispersion, "long er_c", disp_dict);107 self->model->long_c.dispersion->accept_as_source(visitor, self->model->long_c.dispersion, disp_dict); 108 PyDict_SetItemString(self->dispersion, "long_c", disp_dict); 109 109 disp_dict = PyDict_New(); 110 110 self->model->parallel_phi.dispersion->accept_as_source(visitor, self->model->parallel_phi.dispersion, disp_dict); … … 247 247 // Reader parameter dictionary 248 248 self->model->short_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_a") ); 249 self->model->short_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_b") ); 249 250 self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 250 self->model->long_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_b") ); 251 self->model->longer_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "longer_c") ); 251 self->model->long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") ); 252 252 self->model->parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") ); 253 253 self->model->parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") ); … … 260 260 disp_dict = PyDict_GetItemString(self->dispersion, "short_a"); 261 261 self->model->short_a.dispersion->accept_as_destination(visitor, self->model->short_a.dispersion, disp_dict); 262 disp_dict = PyDict_GetItemString(self->dispersion, " long_b");263 self->model-> long_b.dispersion->accept_as_destination(visitor, self->model->long_b.dispersion, disp_dict);264 disp_dict = PyDict_GetItemString(self->dispersion, "long er_c");265 self->model->long er_c.dispersion->accept_as_destination(visitor, self->model->longer_c.dispersion, disp_dict);262 disp_dict = PyDict_GetItemString(self->dispersion, "short_b"); 263 self->model->short_b.dispersion->accept_as_destination(visitor, self->model->short_b.dispersion, disp_dict); 264 disp_dict = PyDict_GetItemString(self->dispersion, "long_c"); 265 self->model->long_c.dispersion->accept_as_destination(visitor, self->model->long_c.dispersion, disp_dict); 266 266 disp_dict = PyDict_GetItemString(self->dispersion, "parallel_phi"); 267 267 self->model->parallel_phi.dispersion->accept_as_destination(visitor, self->model->parallel_phi.dispersion, disp_dict); … … 333 333 // Reader parameter dictionary 334 334 self->model->short_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_a") ); 335 self->model->short_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_b") ); 335 336 self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 336 self->model->long_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_b") ); 337 self->model->longer_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "longer_c") ); 337 self->model->long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") ); 338 338 self->model->parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") ); 339 339 self->model->parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") ); … … 346 346 disp_dict = PyDict_GetItemString(self->dispersion, "short_a"); 347 347 self->model->short_a.dispersion->accept_as_destination(visitor, self->model->short_a.dispersion, disp_dict); 348 disp_dict = PyDict_GetItemString(self->dispersion, " long_b");349 self->model-> long_b.dispersion->accept_as_destination(visitor, self->model->long_b.dispersion, disp_dict);350 disp_dict = PyDict_GetItemString(self->dispersion, "long er_c");351 self->model->long er_c.dispersion->accept_as_destination(visitor, self->model->longer_c.dispersion, disp_dict);348 disp_dict = PyDict_GetItemString(self->dispersion, "short_b"); 349 self->model->short_b.dispersion->accept_as_destination(visitor, self->model->short_b.dispersion, disp_dict); 350 disp_dict = PyDict_GetItemString(self->dispersion, "long_c"); 351 self->model->long_c.dispersion->accept_as_destination(visitor, self->model->long_c.dispersion, disp_dict); 352 352 disp_dict = PyDict_GetItemString(self->dispersion, "parallel_phi"); 353 353 self->model->parallel_phi.dispersion->accept_as_destination(visitor, self->model->parallel_phi.dispersion, disp_dict); … … 408 408 // Reader parameter dictionary 409 409 self->model->short_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_a") ); 410 self->model->short_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "short_b") ); 410 411 self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 411 self->model->long_b = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_b") ); 412 self->model->longer_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "longer_c") ); 412 self->model->long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") ); 413 413 self->model->parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") ); 414 414 self->model->parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") ); … … 421 421 disp_dict = PyDict_GetItemString(self->dispersion, "short_a"); 422 422 self->model->short_a.dispersion->accept_as_destination(visitor, self->model->short_a.dispersion, disp_dict); 423 disp_dict = PyDict_GetItemString(self->dispersion, " long_b");424 self->model-> long_b.dispersion->accept_as_destination(visitor, self->model->long_b.dispersion, disp_dict);425 disp_dict = PyDict_GetItemString(self->dispersion, "long er_c");426 self->model->long er_c.dispersion->accept_as_destination(visitor, self->model->longer_c.dispersion, disp_dict);423 disp_dict = PyDict_GetItemString(self->dispersion, "short_b"); 424 self->model->short_b.dispersion->accept_as_destination(visitor, self->model->short_b.dispersion, disp_dict); 425 disp_dict = PyDict_GetItemString(self->dispersion, "long_c"); 426 self->model->long_c.dispersion->accept_as_destination(visitor, self->model->long_c.dispersion, disp_dict); 427 427 disp_dict = PyDict_GetItemString(self->dispersion, "parallel_phi"); 428 428 self->model->parallel_phi.dispersion->accept_as_destination(visitor, self->model->parallel_phi.dispersion, disp_dict); … … 488 488 if (!strcmp(par_name, "short_a")) { 489 489 self->model->short_a.dispersion = dispersion; 490 } else if (!strcmp(par_name, " long_b")) {491 self->model-> long_b.dispersion = dispersion;492 } else if (!strcmp(par_name, "long er_c")) {493 self->model->long er_c.dispersion = dispersion;490 } else if (!strcmp(par_name, "short_b")) { 491 self->model->short_b.dispersion = dispersion; 492 } else if (!strcmp(par_name, "long_c")) { 493 self->model->long_c.dispersion = dispersion; 494 494 } else if (!strcmp(par_name, "parallel_phi")) { 495 495 self->model->parallel_phi.dispersion = dispersion;
Note: See TracChangeset
for help on using the changeset viewer.