Changeset f10063e in sasview for sansmodels/src/sans/models/c_models


Ignore:
Timestamp:
Mar 30, 2010 7:56:04 PM (15 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

Location:
sansmodels/src/sans/models/c_models
Files:
19 edited

Legend:

Unmodified
Added
Removed

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

    r3080527 rf10063e  
    9191        // Initialize parameter dictionary 
    9292        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000)); 
     93        PyDict_SetItemString(self->params,"sld_core",Py_BuildValue("d",0.000002)); 
    9394        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",0.000000)); 
    9495        PyDict_SetItemString(self->params,"polar_shell",Py_BuildValue("d",30.000000)); 
    … …  
    99100        PyDict_SetItemString(self->params,"equat_core",Py_BuildValue("d",200.000000)); 
    100101        PyDict_SetItemString(self->params,"polar_core",Py_BuildValue("d",20.000000)); 
    101         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000001)); 
     102        PyDict_SetItemString(self->params,"sld_shell",Py_BuildValue("d",0.000001)); 
    102103        // Initialize dispersion / averaging parameter dict 
    103104        DispersionVisitor* visitor = new DispersionVisitor(); 
    … …  
    251252            // Reader parameter dictionary 
    252253    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     254    self->model->sld_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_core") ); 
    253255    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") ); 
    254256    self->model->polar_shell = PyFloat_AsDouble( PyDict_GetItemString(self->params, "polar_shell") ); 
    … …  
    259261    self->model->equat_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "equat_core") ); 
    260262    self->model->polar_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "polar_core") ); 
    261     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     263    self->model->sld_shell = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_shell") ); 
    262264    // Read in dispersion parameters 
    263265    PyObject* disp_dict; 
    … …  
    338340            // Reader parameter dictionary 
    339341    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     342    self->model->sld_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_core") ); 
    340343    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") ); 
    341344    self->model->polar_shell = PyFloat_AsDouble( PyDict_GetItemString(self->params, "polar_shell") ); 
    … …  
    346349    self->model->equat_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "equat_core") ); 
    347350    self->model->polar_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "polar_core") ); 
    348     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     351    self->model->sld_shell = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_shell") ); 
    349352    // Read in dispersion parameters 
    350353    PyObject* disp_dict; 
    … …  
    412415            // Reader parameter dictionary 
    413416    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     417    self->model->sld_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_core") ); 
    414418    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") ); 
    415419    self->model->polar_shell = PyFloat_AsDouble( PyDict_GetItemString(self->params, "polar_shell") ); 
    … …  
    420424    self->model->equat_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "equat_core") ); 
    421425    self->model->polar_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "polar_core") ); 
    422     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     426    self->model->sld_shell = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_shell") ); 
    423427    // Read in dispersion parameters 
    424428    PyObject* disp_dict; 
    … …  
    455459            // Reader parameter dictionary 
    456460    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     461    self->model->sld_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_core") ); 
    457462    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") ); 
    458463    self->model->polar_shell = PyFloat_AsDouble( PyDict_GetItemString(self->params, "polar_shell") ); 
    … …  
    463468    self->model->equat_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "equat_core") ); 
    464469    self->model->polar_core = PyFloat_AsDouble( PyDict_GetItemString(self->params, "polar_core") ); 
    465     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     470    self->model->sld_shell = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_shell") ); 
    466471    // Read in dispersion parameters 
    467472    PyObject* disp_dict; 

  • sansmodels/src/sans/models/c_models/CCylinderModel.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.000004)); 
     94        PyDict_SetItemString(self->params,"cyl_theta",Py_BuildValue("d",1.000000)); 
    9395        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000)); 
    94         PyDict_SetItemString(self->params,"cyl_theta",Py_BuildValue("d",1.000000)); 
     96        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001)); 
    9597        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000)); 
    9698        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.000000)); 
    97         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000003)); 
    9899        PyDict_SetItemString(self->params,"cyl_phi",Py_BuildValue("d",1.000000)); 
    99100        // Initialize dispersion / averaging parameter dict 
    … …  
    242243            // Reader parameter dictionary 
    243244    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     245    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
     246    self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
    244247    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    245     self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
     248    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    246249    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    247250    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    248     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    249251    self->model->cyl_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_phi") ); 
    250252    // Read in dispersion parameters 
    … …  
    322324            // Reader parameter dictionary 
    323325    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     326    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
     327    self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
    324328    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    325     self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
     329    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    326330    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    327331    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    328     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    329332    self->model->cyl_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_phi") ); 
    330333    // Read in dispersion parameters 
    … …  
    389392            // Reader parameter dictionary 
    390393    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     394    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
     395    self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
    391396    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    392     self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
     397    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    393398    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    394399    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    395     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    396400    self->model->cyl_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_phi") ); 
    397401    // Read in dispersion parameters 
    … …  
    425429            // Reader parameter dictionary 
    426430    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     431    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
     432    self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
    427433    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    428     self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
     434    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    429435    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    430436    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    431     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    432437    self->model->cyl_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_phi") ); 
    433438    // Read in dispersion parameters 

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

    r3080527 rf10063e  
    9595        PyDict_SetItemString(self->params,"radius_a",Py_BuildValue("d",20.000000)); 
    9696        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.000000)); 
     97        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001)); 
    9798        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000)); 
    98         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000003)); 
     99        PyDict_SetItemString(self->params,"sldEll",Py_BuildValue("d",0.000004)); 
    99100        // Initialize dispersion / averaging parameter dict 
    100101        DispersionVisitor* visitor = new DispersionVisitor(); 
    … …  
    246247    self->model->radius_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius_a") ); 
    247248    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 
     249    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    248250    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    249     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     251    self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") ); 
    250252    // Read in dispersion parameters 
    251253    PyObject* disp_dict; 
    … …  
    326328    self->model->radius_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius_a") ); 
    327329    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 
     330    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    328331    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    329     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     332    self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") ); 
    330333    // Read in dispersion parameters 
    331334    PyObject* disp_dict; 
    … …  
    393396    self->model->radius_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius_a") ); 
    394397    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 
     398    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    395399    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    396     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     400    self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") ); 
    397401    // Read in dispersion parameters 
    398402    PyObject* disp_dict; 
    … …  
    429433    self->model->radius_a = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius_a") ); 
    430434    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 
     435    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    431436    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    432     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     437    self->model->sldEll = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldEll") ); 
    433438    // Read in dispersion parameters 
    434439    PyObject* disp_dict; 

  • sansmodels/src/sans/models/c_models/CEllipticalCylinderModel.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.000004)); 
    9394        PyDict_SetItemString(self->params,"cyl_psi",Py_BuildValue("d",0.000000)); 
    9495        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000)); 
    9596        PyDict_SetItemString(self->params,"r_minor",Py_BuildValue("d",20.000000)); 
     97        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001)); 
     98        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000)); 
    9699        PyDict_SetItemString(self->params,"cyl_theta",Py_BuildValue("d",1.570000)); 
    97         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000)); 
    98100        PyDict_SetItemString(self->params,"r_ratio",Py_BuildValue("d",1.500000)); 
    99         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000003)); 
    100101        PyDict_SetItemString(self->params,"cyl_phi",Py_BuildValue("d",0.000000)); 
    101102        // Initialize dispersion / averaging parameter dict 
    … …  
    250251            // Reader parameter dictionary 
    251252    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     253    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    252254    self->model->cyl_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_psi") ); 
    253255    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    254256    self->model->r_minor = PyFloat_AsDouble( PyDict_GetItemString(self->params, "r_minor") ); 
     257    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     258    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    255259    self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
    256     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    257260    self->model->r_ratio = PyFloat_AsDouble( PyDict_GetItemString(self->params, "r_ratio") ); 
    258     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    259261    self->model->cyl_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_phi") ); 
    260262    // Read in dispersion parameters 
    … …  
    336338            // Reader parameter dictionary 
    337339    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     340    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    338341    self->model->cyl_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_psi") ); 
    339342    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    340343    self->model->r_minor = PyFloat_AsDouble( PyDict_GetItemString(self->params, "r_minor") ); 
     344    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     345    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    341346    self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
    342     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    343347    self->model->r_ratio = PyFloat_AsDouble( PyDict_GetItemString(self->params, "r_ratio") ); 
    344     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    345348    self->model->cyl_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_phi") ); 
    346349    // Read in dispersion parameters 
    … …  
    409412            // Reader parameter dictionary 
    410413    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     414    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    411415    self->model->cyl_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_psi") ); 
    412416    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    413417    self->model->r_minor = PyFloat_AsDouble( PyDict_GetItemString(self->params, "r_minor") ); 
     418    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     419    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    414420    self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
    415     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    416421    self->model->r_ratio = PyFloat_AsDouble( PyDict_GetItemString(self->params, "r_ratio") ); 
    417     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    418422    self->model->cyl_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_phi") ); 
    419423    // Read in dispersion parameters 
    … …  
    451455            // Reader parameter dictionary 
    452456    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     457    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    453458    self->model->cyl_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_psi") ); 
    454459    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    455460    self->model->r_minor = PyFloat_AsDouble( PyDict_GetItemString(self->params, "r_minor") ); 
     461    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     462    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    456463    self->model->cyl_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_theta") ); 
    457     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    458464    self->model->r_ratio = PyFloat_AsDouble( PyDict_GetItemString(self->params, "r_ratio") ); 
    459     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    460465    self->model->cyl_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "cyl_phi") ); 
    461466    // Read in dispersion parameters 

  • 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; 

  • sansmodels/src/sans/models/c_models/CHollowCylinderModel.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,"core_radius",Py_BuildValue("d",20.000000)); 
    9495        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.570000)); 
    9596        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000)); 
    9697        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.000000)); 
     98        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001)); 
     99        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.010000)); 
    97100        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)); 
    100101        // Initialize dispersion / averaging parameter dict 
    101102        DispersionVisitor* visitor = new DispersionVisitor(); 
    … …  
    246247            // Reader parameter dictionary 
    247248    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     249    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    248250    self->model->core_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "core_radius") ); 
    249251    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") ); 
    250252    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    251253    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 
     254    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     255    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    252256    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") ); 
    255257    // Read in dispersion parameters 
    256258    PyObject* disp_dict; 
    … …  
    329331            // Reader parameter dictionary 
    330332    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     333    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    331334    self->model->core_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "core_radius") ); 
    332335    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") ); 
    333336    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    334337    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 
     338    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     339    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    335340    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") ); 
    338341    // Read in dispersion parameters 
    339342    PyObject* disp_dict; 
    … …  
    399402            // Reader parameter dictionary 
    400403    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     404    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    401405    self->model->core_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "core_radius") ); 
    402406    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") ); 
    403407    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    404408    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 
     409    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     410    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    405411    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") ); 
    408412    // Read in dispersion parameters 
    409413    PyObject* disp_dict; 
    … …  
    438442            // Reader parameter dictionary 
    439443    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     444    self->model->sldCyl = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldCyl") ); 
    440445    self->model->core_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "core_radius") ); 
    441446    self->model->axis_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_theta") ); 
    442447    self->model->length = PyFloat_AsDouble( PyDict_GetItemString(self->params, "length") ); 
    443448    self->model->axis_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "axis_phi") ); 
     449    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     450    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    444451    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") ); 
    447452    // Read in dispersion parameters 
    448453    PyObject* disp_dict; 

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

    r3080527 rf10063e  
    9292        PyDict_SetItemString(self->params,"n_plates",Py_BuildValue("d",20.000000)); 
    9393        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000)); 
     94        PyDict_SetItemString(self->params,"sld_sol",Py_BuildValue("d",0.000001)); 
     95        PyDict_SetItemString(self->params,"delta",Py_BuildValue("d",30.000000)); 
    9496        PyDict_SetItemString(self->params,"spacing",Py_BuildValue("d",400.000000)); 
    9597        PyDict_SetItemString(self->params,"caille",Py_BuildValue("d",0.100000)); 
    9698        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000)); 
    97         PyDict_SetItemString(self->params,"delta",Py_BuildValue("d",30.000000)); 
    98         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000005)); 
     99        PyDict_SetItemString(self->params,"sld_bi",Py_BuildValue("d",0.000006)); 
    99100        // Initialize dispersion / averaging parameter dict 
    100101        DispersionVisitor* visitor = new DispersionVisitor(); 
    … …  
    237238    self->model->n_plates = PyFloat_AsDouble( PyDict_GetItemString(self->params, "n_plates") ); 
    238239    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     240    self->model->sld_sol = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_sol") ); 
     241    self->model->delta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "delta") ); 
    239242    self->model->spacing = PyFloat_AsDouble( PyDict_GetItemString(self->params, "spacing") ); 
    240243    self->model->caille = PyFloat_AsDouble( PyDict_GetItemString(self->params, "caille") ); 
    241244    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    242     self->model->delta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "delta") ); 
    243     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     245    self->model->sld_bi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_bi") ); 
    244246    // Read in dispersion parameters 
    245247    PyObject* disp_dict; 
    … …  
    313315    self->model->n_plates = PyFloat_AsDouble( PyDict_GetItemString(self->params, "n_plates") ); 
    314316    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     317    self->model->sld_sol = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_sol") ); 
     318    self->model->delta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "delta") ); 
    315319    self->model->spacing = PyFloat_AsDouble( PyDict_GetItemString(self->params, "spacing") ); 
    316320    self->model->caille = PyFloat_AsDouble( PyDict_GetItemString(self->params, "caille") ); 
    317321    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    318     self->model->delta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "delta") ); 
    319     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     322    self->model->sld_bi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_bi") ); 
    320323    // Read in dispersion parameters 
    321324    PyObject* disp_dict; 
    … …  
    376379    self->model->n_plates = PyFloat_AsDouble( PyDict_GetItemString(self->params, "n_plates") ); 
    377380    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     381    self->model->sld_sol = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_sol") ); 
     382    self->model->delta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "delta") ); 
    378383    self->model->spacing = PyFloat_AsDouble( PyDict_GetItemString(self->params, "spacing") ); 
    379384    self->model->caille = PyFloat_AsDouble( PyDict_GetItemString(self->params, "caille") ); 
    380385    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    381     self->model->delta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "delta") ); 
    382     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     386    self->model->sld_bi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_bi") ); 
    383387    // Read in dispersion parameters 
    384388    PyObject* disp_dict; 
    … …  
    408412    self->model->n_plates = PyFloat_AsDouble( PyDict_GetItemString(self->params, "n_plates") ); 
    409413    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
     414    self->model->sld_sol = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_sol") ); 
     415    self->model->delta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "delta") ); 
    410416    self->model->spacing = PyFloat_AsDouble( PyDict_GetItemString(self->params, "spacing") ); 
    411417    self->model->caille = PyFloat_AsDouble( PyDict_GetItemString(self->params, "caille") ); 
    412418    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    413     self->model->delta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "delta") ); 
    414     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
     419    self->model->sld_bi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sld_bi") ); 
    415420    // Read in dispersion parameters 
    416421    PyObject* disp_dict; 

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

    r3080527 rf10063e  
    9494        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000)); 
    9595        PyDict_SetItemString(self->params,"long_c",Py_BuildValue("d",400.000000)); 
     96        PyDict_SetItemString(self->params,"sldPipe",Py_BuildValue("d",0.000006)); 
    9697        PyDict_SetItemString(self->params,"parallel_psi",Py_BuildValue("d",0.000000)); 
    9798        PyDict_SetItemString(self->params,"parallel_phi",Py_BuildValue("d",0.000000)); 
    9899        PyDict_SetItemString(self->params,"parallel_theta",Py_BuildValue("d",0.000000)); 
     100        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001)); 
    99101        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000)); 
    100         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000005)); 
    101102        // Initialize dispersion / averaging parameter dict 
    102103        DispersionVisitor* visitor = new DispersionVisitor(); 
    … …  
    253254    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
    254255    self->model->long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") ); 
     256    self->model->sldPipe = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldPipe") ); 
    255257    self->model->parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") ); 
    256258    self->model->parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") ); 
    257259    self->model->parallel_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_theta") ); 
     260    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    258261    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    259     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    260262    // Read in dispersion parameters 
    261263    PyObject* disp_dict; 
    … …  
    339341    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
    340342    self->model->long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") ); 
     343    self->model->sldPipe = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldPipe") ); 
    341344    self->model->parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") ); 
    342345    self->model->parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") ); 
    343346    self->model->parallel_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_theta") ); 
     347    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    344348    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    345     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    346349    // Read in dispersion parameters 
    347350    PyObject* disp_dict; 
    … …  
    412415    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
    413416    self->model->long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") ); 
     417    self->model->sldPipe = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldPipe") ); 
    414418    self->model->parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") ); 
    415419    self->model->parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") ); 
    416420    self->model->parallel_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_theta") ); 
     421    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    417422    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    418     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    419423    // Read in dispersion parameters 
    420424    PyObject* disp_dict; 
    … …  
    454458    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
    455459    self->model->long_c = PyFloat_AsDouble( PyDict_GetItemString(self->params, "long_c") ); 
     460    self->model->sldPipe = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldPipe") ); 
    456461    self->model->parallel_psi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_psi") ); 
    457462    self->model->parallel_phi = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_phi") ); 
    458463    self->model->parallel_theta = PyFloat_AsDouble( PyDict_GetItemString(self->params, "parallel_theta") ); 
     464    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
    459465    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    460     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    461466    // Read in dispersion parameters 
    462467    PyObject* disp_dict; 

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

    r3080527 rf10063e  
    9090         
    9191        // Initialize parameter dictionary 
     92        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001)); 
     93        PyDict_SetItemString(self->params,"sldSph",Py_BuildValue("d",0.000002)); 
    9294        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000)); 
    9395        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",60.000000)); 
    9496        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000)); 
    95         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000001)); 
    9697        // Initialize dispersion / averaging parameter dict 
    9798        DispersionVisitor* visitor = new DispersionVisitor(); 
    … …  
    229230         
    230231            // Reader parameter dictionary 
     232    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     233    self->model->sldSph = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSph") ); 
    231234    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
    232235    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    233236    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    234     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    235237    // Read in dispersion parameters 
    236238    PyObject* disp_dict; 
    … …  
    300302         
    301303            // Reader parameter dictionary 
     304    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     305    self->model->sldSph = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSph") ); 
    302306    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
    303307    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    304308    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    305     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    306309    // Read in dispersion parameters 
    307310    PyObject* disp_dict; 
    … …  
    358361         
    359362            // Reader parameter dictionary 
     363    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     364    self->model->sldSph = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSph") ); 
    360365    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
    361366    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    362367    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    363     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    364368    // Read in dispersion parameters 
    365369    PyObject* disp_dict; 
    … …  
    385389         
    386390            // Reader parameter dictionary 
     391    self->model->sldSolv = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSolv") ); 
     392    self->model->sldSph = PyFloat_AsDouble( PyDict_GetItemString(self->params, "sldSph") ); 
    387393    self->model->scale = PyFloat_AsDouble( PyDict_GetItemString(self->params, "scale") ); 
    388394    self->model->radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "radius") ); 
    389395    self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    390     self->model->contrast = PyFloat_AsDouble( PyDict_GetItemString(self->params, "contrast") ); 
    391396    // Read in dispersion parameters 
    392397    PyObject* disp_dict; 

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

    rc451be9 rf10063e  
    3939        length     = Parameter(400.0, true); 
    4040        length.set_min(0.0); 
    41         contrast   = Parameter(3.e-6); 
     41        sldCyl   = Parameter(4.e-6); 
     42        sldSolv   = Parameter(1.e-6); 
    4243        background = Parameter(0.0); 
    4344        cyl_theta  = Parameter(0.0, true); 
    … …  
    5253 */ 
    5354double CylinderModel :: operator()(double q) { 
    54         double dp[5]; 
     55        double dp[6]; 
    5556 
    5657        // Fill parameter array for IGOR library 
    … …  
    5960        dp[1] = radius(); 
    6061        dp[2] = length(); 
    61         dp[3] = contrast(); 
    62         dp[4] = 0.0; 
     62        dp[3] = sldCyl(); 
     63        dp[4] = sldSolv(); 
     64        dp[5] = 0.0; 
    6365 
    6466        // Get the dispersion points for the radius 
    … …  
    113115        dp.radius     = radius(); 
    114116        dp.length     = length(); 
    115         dp.contrast   = contrast(); 
     117        dp.sldCyl   = sldCyl(); 
     118        dp.sldSolv   = sldSolv(); 
    116119        dp.background = 0.0; 
    117120        dp.cyl_theta  = cyl_theta(); 

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

    rc451be9 rf10063e  
    3939        radius_b   = Parameter(400.0, true); 
    4040        radius_b.set_min(0.0); 
    41         contrast   = Parameter(3.e-6); 
     41        sldEll   = Parameter(4.e-6); 
     42        sldSolv   = Parameter(1.e-6); 
    4243        background = Parameter(0.0); 
    4344        axis_theta  = Parameter(1.57, true); 
    … …  
    5253 */ 
    5354double EllipsoidModel :: operator()(double q) { 
    54         double dp[5]; 
     55        double dp[6]; 
    5556 
    5657        // Fill parameter array for IGOR library 
    … …  
    5960        dp[1] = radius_a(); 
    6061        dp[2] = radius_b(); 
    61         dp[3] = contrast(); 
    62         dp[4] = 0.0; 
     62        dp[3] = sldEll(); 
     63        dp[4] = sldSolv(); 
     64        dp[5] = 0.0; 
    6365 
    6466        // Get the dispersion points for the radius_a 
    … …  
    116118        dp.radius_a   = radius_a(); 
    117119        dp.radius_b   = radius_b(); 
    118         dp.contrast   = contrast(); 
     120        dp.sldEll   = sldEll(); 
     121        dp.sldSolv   = sldSolv(); 
    119122        dp.background = 0.0; 
    120123        dp.axis_theta = axis_theta(); 

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

    rc451be9 rf10063e  
    4141        length     = Parameter(400.0, true); 
    4242        length.set_min(0.0); 
    43         contrast   = Parameter(3.e-6); 
     43        sldCyl   = Parameter(4.e-6); 
     44        sldSolv   = Parameter(1.e-6); 
    4445        background = Parameter(0.0); 
    4546        cyl_theta  = Parameter(1.57, true); 
    … …  
    5556 */ 
    5657double EllipticalCylinderModel :: operator()(double q) { 
    57         double dp[6]; 
     58        double dp[7]; 
    5859 
    5960        dp[0] = scale(); 
    … …  
    6162        dp[2] = r_ratio(); 
    6263        dp[3] = length(); 
    63         dp[4] = contrast(); 
    64         dp[5] = 0.0; 
     64        dp[4] = sldCyl(); 
     65        dp[5] = sldSolv(); 
     66        dp[6] = 0.0; 
    6567 
    6668        // Get the dispersion points for the r_minor 
    … …  
    132134        dp.r_ratio    = r_ratio(); 
    133135        dp.length     = length(); 
    134         dp.contrast   = contrast(); 
     136        dp.sldCyl   = sldCyl(); 
     137        dp.sldSolv   = sldSolv(); 
    135138        dp.background = 0.0; 
    136139        dp.cyl_theta  = cyl_theta(); 

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

    rc451be9 rf10063e  
    4242        radius  = Parameter(20.0, true); 
    4343        radius.set_min(0.0); 
    44         contrast   = Parameter(5.3e-6); 
     44        sldCyl   = Parameter(6.3e-6); 
     45        sldSolv   = Parameter(1.0e-6); 
    4546        background = Parameter(0.0001); 
    4647} 
    … …  
    5354 */ 
    5455double FlexibleCylinderModel :: operator()(double q) { 
    55         double dp[6]; 
     56        double dp[7]; 
    5657 
    5758        // Fill parameter array for IGOR library 
    … …  
    6162        dp[2] = kuhn_length(); 
    6263        dp[3] = radius(); 
    63         dp[4] = contrast(); 
    64         dp[5] = 0.0; 
     64        dp[4] = sldCyl(); 
     65        dp[5] = sldSolv(); 
     66        dp[6] = 0.0; 
    6567 
    6668        // Get the dispersion points for the length 

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

    rc451be9 rf10063e  
    4141        length     = Parameter(400.0, true); 
    4242        length.set_min(0.0); 
    43         contrast  = Parameter(5.3e-6); 
     43        sldCyl  = Parameter(6.3e-6); 
     44        sldSolv  = Parameter(1.0e-6); 
    4445        background = Parameter(0.0); 
    4546        axis_theta = Parameter(0.0, true); 
    … …  
    5455 */ 
    5556double HollowCylinderModel :: operator()(double q) { 
    56         double dp[6]; 
     57        double dp[7]; 
    5758 
    5859        dp[0] = scale(); 
    … …  
    6061        dp[2] = radius(); 
    6162        dp[3] = length(); 
    62         dp[4] = contrast(); 
    63         dp[5] = 0.0; 
     63        dp[4] = sldCyl(); 
     64        dp[5] = sldSolv(); 
     65        dp[6] = 0.0; 
    6466 
    6567        // Get the dispersion points for the core radius 
    … …  
    113115        if (vol != 0.0 && norm != 0.0) { 
    114116                //Re-normalize by avg volume 
    115                 sum = sum/(vol/norm);} 
     117                sum = sum*(vol/norm);} 
    116118 
    117119        return sum/norm + background(); 
    … …  
    131133        dp.radius  = radius(); 
    132134        dp.length     = length(); 
    133         dp.contrast   = contrast(); 
     135        dp.sldCyl   = sldCyl(); 
     136        dp.sldSolv  = sldSolv(); 
    134137        dp.background = 0.0; 
    135138        dp.axis_theta = axis_theta(); 
    … …  
    223226        if (vol != 0.0 && norm_vol != 0.0) { 
    224227                //Re-normalize by avg volume 
    225                 sum = sum/(vol/norm_vol);} 
     228                sum = sum*(vol/norm_vol);} 
    226229        return sum/norm + background(); 
    227230} 

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

    rf9bf661 rf10063e  
    3939        delta     = Parameter(30.0); 
    4040        delta.set_min(0.0); 
    41         contrast   = Parameter(5.3e-6); 
     41        sld_bi   = Parameter(6.3e-6); 
     42        sld_sol   = Parameter(1.0e-6); 
    4243        n_plates     = Parameter(20.0); 
    4344        caille = Parameter(0.1); 
    … …  
    5354 */ 
    5455double LamellarPSModel :: operator()(double q) { 
    55         double dp[7]; 
     56        double dp[8]; 
    5657 
    5758        // Fill parameter array for IGOR library 
    … …  
    6061        dp[1] = spacing(); 
    6162        dp[2] = delta(); 
    62         dp[3] = contrast(); 
    63         dp[4] = n_plates(); 
    64         dp[5] = caille(); 
    65         dp[6] = 0.0; 
     63        dp[3] = sld_bi(); 
     64        dp[4] = sld_sol(); 
     65        dp[5] = n_plates(); 
     66        dp[6] = caille(); 
     67        dp[7] = 0.0; 
    6668 
    6769 

  • sansmodels/src/sans/models/c_models/models.hh

    r5eb9154 rf10063e  
    3232        Parameter scale; 
    3333        Parameter length; 
    34         Parameter contrast; 
     34        Parameter sldCyl; 
     35        Parameter sldSolv; 
    3536        Parameter background; 
    3637        Parameter cyl_theta; 
    … …  
    5556        Parameter short_b; 
    5657        Parameter long_c; 
    57         Parameter contrast; 
     58        Parameter sldPipe; 
     59        Parameter sldSolv; 
    5860        Parameter background; 
    5961        Parameter parallel_theta; 
    … …  
    7779        Parameter radius; 
    7880        Parameter scale; 
    79         Parameter contrast; 
     81        Parameter sldSph; 
     82        Parameter sldSolv; 
    8083        Parameter background; 
    8184 
    … …  
    245248        Parameter scale; 
    246249        Parameter radius_b; 
    247         Parameter contrast; 
     250        Parameter sldEll; 
     251        Parameter sldSolv; 
    248252        Parameter background; 
    249253        Parameter axis_theta; 
    … …  
    267271        Parameter r_ratio; 
    268272        Parameter length; 
    269         Parameter contrast; 
     273        Parameter sldCyl; 
     274        Parameter sldSolv; 
    270275        Parameter background; 
    271276        Parameter cyl_theta; 
    … …  
    312317        Parameter kuhn_length; 
    313318        Parameter radius; 
    314         Parameter contrast; 
     319        Parameter sldCyl; 
     320        Parameter sldSolv; 
    315321        Parameter background; 
    316322        Parameter axis_theta; 
    … …  
    403409        Parameter spacing; 
    404410        Parameter delta; 
    405         Parameter contrast; 
     411        Parameter sld_bi; 
     412        Parameter sld_sol; 
    406413        Parameter n_plates; 
    407414        Parameter caille; 
    … …  
    450457        Parameter equat_shell; 
    451458        Parameter polar_shell; 
    452         Parameter contrast; 
     459        Parameter sld_core; 
     460        Parameter sld_shell; 
    453461        Parameter sld_solvent; 
    454462        Parameter background; 
    … …  
    473481        Parameter radius; 
    474482        Parameter length; 
    475         Parameter contrast; 
     483        Parameter sldCyl; 
     484        Parameter sldSolv; 
    476485        Parameter background; 
    477486        Parameter axis_theta; 

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

    rc451be9 rf10063e  
    4242        long_c     = Parameter(400.0, true); 
    4343        long_c.set_min(1.0); 
    44         contrast   = Parameter(53.e-7); 
     44        sldPipe   = Parameter(6.3e-6); 
     45        sldSolv   = Parameter(1.0e-6); 
    4546        background = Parameter(0.0); 
    4647        parallel_theta  = Parameter(0.0, true); 
    … …  
    5657 */ 
    5758double ParallelepipedModel :: operator()(double q) { 
    58         double dp[6]; 
     59        double dp[7]; 
    5960 
    6061        // Fill parameter array for IGOR library 
    … …  
    6465        dp[2] = short_b(); 
    6566        dp[3] = long_c(); 
    66         dp[4] = contrast(); 
    67         dp[5] = 0.0; 
     67        dp[4] = sldPipe(); 
     68        dp[5] = sldSolv(); 
     69        dp[6] = 0.0; 
    6870 
    6971        // Get the dispersion points for the short_edgeA 
    … …  
    132134        dp.short_b   = short_b(); 
    133135        dp.long_c  = long_c(); 
    134         dp.contrast   = contrast(); 
     136        dp.sldPipe   = sldPipe(); 
     137        dp.sldSolv   = sldSolv(); 
    135138        dp.background = 0.0; 
    136139        //dp.background = background(); 

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

    rc451be9 rf10063e  
    3535        radius     = Parameter(20.0, true); 
    3636        radius.set_min(0.0); 
    37         contrast   = Parameter(3.e-6); 
     37        sldSph   = Parameter(4.0e-6); 
     38        sldSolv   = Parameter(1.0e-6); 
    3839        background = Parameter(0.0); 
    3940} 
    … …  
    4647 */ 
    4748double SphereModel :: operator()(double q) { 
    48         double dp[4]; 
     49        double dp[5]; 
    4950 
    5051        // Fill parameter array for IGOR library 
    … …  
    5253        dp[0] = scale(); 
    5354        dp[1] = radius(); 
    54         dp[2] = contrast(); 
    55         dp[3] = 0.0; 
     55        dp[2] = sldSph(); 
     56        dp[3] = sldSolv(); 
     57        dp[4] = 0.0; 
    5658 
    5759        // Get the dispersion points for the radius 
    … …  
    114116        dp.scale = scale(); 
    115117        dp.radius = radius(); 
    116         dp.contrast = contrast(); 
     118        dp.sldSph = sldSph(); 
     119        dp.sldSolv = sldSolv(); 
    117120        dp.background = background(); 
    118121        double rad_out = 0.0; 

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

    rc451be9 rf10063e  
    4343        polar_shell    = Parameter(30.0, true); 
    4444        polar_shell.set_min(0.0); 
    45         contrast   = Parameter(1e-6); 
     45        sld_core   = Parameter(2e-6); 
     46        sld_shell  = Parameter(1e-6); 
    4647        sld_solvent = Parameter(6.3e-6); 
    4748        background = Parameter(0.0); 
    … …  
    5859 */ 
    5960double CoreShellEllipsoidModel :: operator()(double q) { 
    60         double dp[8]; 
     61        double dp[9]; 
    6162 
    6263        // Fill parameter array for IGOR library 
    … …  
    6768        dp[3] = equat_shell(); 
    6869        dp[4] = polar_shell(); 
    69         dp[5] = contrast(); 
    70         dp[6] = sld_solvent(); 
    71         dp[7] = 0.0; 
     70        dp[5] = sld_core(); 
     71        dp[6] = sld_shell(); 
     72        dp[7] = sld_solvent(); 
     73        dp[8] = 0.0; 
    7274 
    7375        // Get the dispersion points for the major core 
    … …  
    110112                                        //Un-normalize  by volume 
    111113                                        sum += weights_equat_core[i].weight* weights_polar_core[j].weight * weights_equat_shell[k].weight 
    112                                                 * weights_polar_shell[l].weight * ProlateForm(dp, q) 
     114                                                * weights_polar_shell[l].weight * OblateForm(dp, q) 
    113115                                                * pow(weights_equat_shell[k].value,2)*weights_polar_shell[l].value; 
    114116                                        //Find average volume 
    … …  
    170172        dp.equat_shell = equat_shell(); 
    171173        dp.polar_shell = polar_shell(); 
    172         dp.contrast = contrast(); 
     174        dp.sld_core = sld_core(); 
     175        dp.sld_shell = sld_shell(); 
    173176        dp.sld_solvent = sld_solvent(); 
    174177        dp.background = 0.0; 
Note: See TracChangeset for help on using the changeset viewer.