Ignore:
Timestamp:
Mar 30, 2010 7:56:04 PM (14 years ago)
Author:
Jae Cho <jhjcho@…>
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:
8d97277
Parents:
6e93a02
Message:

Updated the definition of SLD params according to new libigor functions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/src/sans/models/c_models/CFlexibleCylinderModel.cpp

    r3080527 rf10063e  
    9191        // Initialize parameter dictionary 
    9292        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000)); 
     93        PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.000006)); 
    9394        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",1000.000000)); 
     95        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001)); 
     96        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000100)); 
    9497        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.000000)); 
    95         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000100)); 
    9698        PyDict_SetItemString(self->params,"kuhn_length",Py_BuildValue("d",100.000000)); 
    97         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000005)); 
    9899        // Initialize dispersion / averaging parameter dict 
    99100        DispersionVisitor* visitor = new DispersionVisitor(); 
    … …  
    238239            // Reader parameter dictionary 
    239240    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     241    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    240242    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
     243    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     244    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    241245    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    242     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    243246    self->model->kuhn_length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "kuhn_length") ); 
    244     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    245247    // Read in dispersion parameters 
    246248    PyObject* disp_dict; 
    … …  
    315317            // Reader parameter dictionary 
    316318    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     319    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    317320    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
     321    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     322    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    318323    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    319     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    320324    self->model->kuhn_length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "kuhn_length") ); 
    321     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    322325    // Read in dispersion parameters 
    323326    PyObject* disp_dict; 
    … …  
    379382            // Reader parameter dictionary 
    380383    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     384    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    381385    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
     386    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     387    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    382388    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    383     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    384389    self->model->kuhn_length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "kuhn_length") ); 
    385     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    386390    // Read in dispersion parameters 
    387391    PyObject* disp_dict; 
    … …  
    412416            // Reader parameter dictionary 
    413417    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     418    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    414419    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
     420    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     421    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    415422    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    416     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    417423    self->model->kuhn_length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "kuhn_length") ); 
    418     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    419424    // Read in dispersion parameters 
    420425    PyObject* disp_dict; 
Note: See TracChangeset for help on using the changeset viewer.