Ignore:
Timestamp:
Nov 3, 2009 2:55:10 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:
155c088
Parents:
8a6d4af
Message:

removed all non asc font in the units

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rf9bf661 r27972c1d  
    8686         
    8787        // Initialize parameter dictionary 
     88        PyDict_SetItemString(self->params,"s_radius",Py_BuildValue("d",25.000000)); 
     89        PyDict_SetItemString(self->params,"vol_frac_ss",Py_BuildValue("d",0.200000)); 
     90        PyDict_SetItemString(self->params,"l_radius",Py_BuildValue("d",100.000000)); 
    8891        PyDict_SetItemString(self->params,"vol_frac_ls",Py_BuildValue("d",0.100000)); 
    89         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000)); 
    90         PyDict_SetItemString(self->params,"vol_frac_ss",Py_BuildValue("d",0.200000)); 
    91         PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.000006)); 
    92         PyDict_SetItemString(self->params,"ls_sld",Py_BuildValue("d",0.000003)); 
    93         PyDict_SetItemString(self->params,"ss_sld",Py_BuildValue("d",0.000000)); 
    94         PyDict_SetItemString(self->params,"s_radius",Py_BuildValue("d",25.000000)); 
    95         PyDict_SetItemString(self->params,"l_radius",Py_BuildValue("d",100.000000)); 
    9692        // Initialize dispersion / averaging parameter dict 
    9793        DispersionVisitor* visitor = new DispersionVisitor(); 
    … …  
    234230         
    235231            // Reader parameter dictionary 
     232    self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 
     233    self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 
     234    self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 
    236235    self->model->vol_frac_ls = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ls") ); 
    237     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    238     self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 
    239     self->model->solvent_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "solvent_sld") ); 
    240     self->model->ls_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ls_sld") ); 
    241     self->model->ss_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ss_sld") ); 
    242     self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 
    243     self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 
    244236    // Read in dispersion parameters 
    245237    PyObject* disp_dict; 
    … …  
    311303         
    312304            // Reader parameter dictionary 
     305    self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 
     306    self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 
     307    self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 
    313308    self->model->vol_frac_ls = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ls") ); 
    314     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    315     self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 
    316     self->model->solvent_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "solvent_sld") ); 
    317     self->model->ls_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ls_sld") ); 
    318     self->model->ss_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ss_sld") ); 
    319     self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 
    320     self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 
    321309    // Read in dispersion parameters 
    322310    PyObject* disp_dict; 
    … …  
    375363         
    376364            // Reader parameter dictionary 
     365    self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 
     366    self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 
     367    self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 
    377368    self->model->vol_frac_ls = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ls") ); 
    378     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    379     self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 
    380     self->model->solvent_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "solvent_sld") ); 
    381     self->model->ls_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ls_sld") ); 
    382     self->model->ss_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ss_sld") ); 
    383     self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 
    384     self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 
    385369    // Read in dispersion parameters 
    386370    PyObject* disp_dict; 
    … …  
    408392         
    409393            // Reader parameter dictionary 
     394    self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 
     395    self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 
     396    self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 
    410397    self->model->vol_frac_ls = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ls") ); 
    411     self->model->background = PyFloat_AsDouble( PyDict_GetItemString(self->params, "background") ); 
    412     self->model->vol_frac_ss = PyFloat_AsDouble( PyDict_GetItemString(self->params, "vol_frac_ss") ); 
    413     self->model->solvent_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "solvent_sld") ); 
    414     self->model->ls_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ls_sld") ); 
    415     self->model->ss_sld = PyFloat_AsDouble( PyDict_GetItemString(self->params, "ss_sld") ); 
    416     self->model->s_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "s_radius") ); 
    417     self->model->l_radius = PyFloat_AsDouble( PyDict_GetItemString(self->params, "l_radius") ); 
    418398    // Read in dispersion parameters 
    419399    PyObject* disp_dict; 
Note: See TracChangeset for help on using the changeset viewer.