Changeset 35aface in sasview for sansmodels/src/sans/models/c_models


Ignore:
Timestamp:
Oct 6, 2010 2:54:35 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:
fbae881
Parents:
6d48919
Message:

addede new models and attr. non_fittable

Location:
sansmodels/src/sans/models/c_models
Files:
4 added
42 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/c_models/CBinaryHSModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"vol_frac_ls",Py_BuildValue("d",0.10000000)); 
    93         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00100000)); 
    94         PyDict_SetItemString(self->params,"vol_frac_ss",Py_BuildValue("d",0.20000000)); 
    95         PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.00000636)); 
    96         PyDict_SetItemString(self->params,"ls_sld",Py_BuildValue("d",0.00000350)); 
    97         PyDict_SetItemString(self->params,"ss_sld",Py_BuildValue("d",0.00000050)); 
    98         PyDict_SetItemString(self->params,"s_radius",Py_BuildValue("d",25.00000000)); 
    99         PyDict_SetItemString(self->params,"l_radius",Py_BuildValue("d",100.00000000)); 
     92        PyDict_SetItemString(self->params,"vol_frac_ls",Py_BuildValue("d",0.100000000000)); 
     93        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000000000)); 
     94        PyDict_SetItemString(self->params,"vol_frac_ss",Py_BuildValue("d",0.200000000000)); 
     95        PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.000006360000)); 
     96        PyDict_SetItemString(self->params,"ls_sld",Py_BuildValue("d",0.000003500000)); 
     97        PyDict_SetItemString(self->params,"ss_sld",Py_BuildValue("d",0.000000500000)); 
     98        PyDict_SetItemString(self->params,"s_radius",Py_BuildValue("d",25.000000000000)); 
     99        PyDict_SetItemString(self->params,"l_radius",Py_BuildValue("d",100.000000000000)); 
    100100        // Initialize dispersion / averaging parameter dict 
    101101        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CBinaryHSPSF11Model.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"vol_frac_ls",Py_BuildValue("d",0.20000000)); 
    93         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00100000)); 
    94         PyDict_SetItemString(self->params,"vol_frac_ss",Py_BuildValue("d",0.20000000)); 
    95         PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.00000636)); 
    96         PyDict_SetItemString(self->params,"ls_sld",Py_BuildValue("d",0.00000350)); 
    97         PyDict_SetItemString(self->params,"ss_sld",Py_BuildValue("d",0.00000050)); 
    98         PyDict_SetItemString(self->params,"s_radius",Py_BuildValue("d",25.00000000)); 
    99         PyDict_SetItemString(self->params,"l_radius",Py_BuildValue("d",160.00000000)); 
     92        PyDict_SetItemString(self->params,"vol_frac_ls",Py_BuildValue("d",0.200000000000)); 
     93        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000000000)); 
     94        PyDict_SetItemString(self->params,"vol_frac_ss",Py_BuildValue("d",0.200000000000)); 
     95        PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.000006360000)); 
     96        PyDict_SetItemString(self->params,"ls_sld",Py_BuildValue("d",0.000003500000)); 
     97        PyDict_SetItemString(self->params,"ss_sld",Py_BuildValue("d",0.000000500000)); 
     98        PyDict_SetItemString(self->params,"s_radius",Py_BuildValue("d",25.000000000000)); 
     99        PyDict_SetItemString(self->params,"l_radius",Py_BuildValue("d",160.000000000000)); 
    100100        // Initialize dispersion / averaging parameter dict 
    101101        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CCoreFourShellModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"thick_shell4",Py_BuildValue("d",10.00000000)); 
    93         PyDict_SetItemString(self->params,"sld_shell4",Py_BuildValue("d",0.00000400)); 
    94         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    95         PyDict_SetItemString(self->params,"sld_shell2",Py_BuildValue("d",0.00000200)); 
    96         PyDict_SetItemString(self->params,"thick_shell1",Py_BuildValue("d",10.00000000)); 
    97         PyDict_SetItemString(self->params,"thick_shell2",Py_BuildValue("d",10.00000000)); 
    98         PyDict_SetItemString(self->params,"sld_shell1",Py_BuildValue("d",0.00000100)); 
    99         PyDict_SetItemString(self->params,"rad_core",Py_BuildValue("d",60.00000000)); 
    100         PyDict_SetItemString(self->params,"sld_core",Py_BuildValue("d",0.00000640)); 
    101         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00100000)); 
    102         PyDict_SetItemString(self->params,"thick_shell3",Py_BuildValue("d",10.00000000)); 
    103         PyDict_SetItemString(self->params,"sld_solv",Py_BuildValue("d",0.00000640)); 
    104         PyDict_SetItemString(self->params,"sld_shell3",Py_BuildValue("d",0.00000300)); 
     92        PyDict_SetItemString(self->params,"thick_shell4",Py_BuildValue("d",10.000000000000)); 
     93        PyDict_SetItemString(self->params,"sld_shell4",Py_BuildValue("d",0.000004000000)); 
     94        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     95        PyDict_SetItemString(self->params,"sld_shell2",Py_BuildValue("d",0.000002000000)); 
     96        PyDict_SetItemString(self->params,"thick_shell1",Py_BuildValue("d",10.000000000000)); 
     97        PyDict_SetItemString(self->params,"thick_shell2",Py_BuildValue("d",10.000000000000)); 
     98        PyDict_SetItemString(self->params,"sld_shell1",Py_BuildValue("d",0.000001000000)); 
     99        PyDict_SetItemString(self->params,"rad_core",Py_BuildValue("d",60.000000000000)); 
     100        PyDict_SetItemString(self->params,"sld_core",Py_BuildValue("d",0.000006400000)); 
     101        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000000000)); 
     102        PyDict_SetItemString(self->params,"thick_shell3",Py_BuildValue("d",10.000000000000)); 
     103        PyDict_SetItemString(self->params,"sld_solv",Py_BuildValue("d",0.000006400000)); 
     104        PyDict_SetItemString(self->params,"sld_shell3",Py_BuildValue("d",0.000003000000)); 
    105105        // Initialize dispersion / averaging parameter dict 
    106106        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CCoreShellCylinderModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.57000000)); 
    94         PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.00000100)); 
    95         PyDict_SetItemString(self->params,"thickness",Py_BuildValue("d",10.00000000)); 
    96         PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.00000000)); 
    97         PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.00000000)); 
    98         PyDict_SetItemString(self->params,"core_sld",Py_BuildValue("d",0.00000100)); 
    99         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.00000000)); 
    100         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    101         PyDict_SetItemString(self->params,"shell_sld",Py_BuildValue("d",0.00000400)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.570000000000)); 
     94        PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.000001000000)); 
     95        PyDict_SetItemString(self->params,"thickness",Py_BuildValue("d",10.000000000000)); 
     96        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.000000000000)); 
     97        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000000000)); 
     98        PyDict_SetItemString(self->params,"core_sld",Py_BuildValue("d",0.000001000000)); 
     99        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.000000000000)); 
     100        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     101        PyDict_SetItemString(self->params,"shell_sld",Py_BuildValue("d",0.000004000000)); 
    102102        // Initialize dispersion / averaging parameter dict 
    103103        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CCoreShellEllipsoidModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"sld_core",Py_BuildValue("d",0.00000200)); 
    94         PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",0.00000000)); 
    95         PyDict_SetItemString(self->params,"polar_shell",Py_BuildValue("d",30.00000000)); 
    96         PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.00000630)); 
    97         PyDict_SetItemString(self->params,"equat_shell",Py_BuildValue("d",250.00000000)); 
    98         PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.00000000)); 
    99         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00100000)); 
    100         PyDict_SetItemString(self->params,"equat_core",Py_BuildValue("d",200.00000000)); 
    101         PyDict_SetItemString(self->params,"polar_core",Py_BuildValue("d",20.00000000)); 
    102         PyDict_SetItemString(self->params,"sld_shell",Py_BuildValue("d",0.00000100)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"sld_core",Py_BuildValue("d",0.000002000000)); 
     94        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",0.000000000000)); 
     95        PyDict_SetItemString(self->params,"polar_shell",Py_BuildValue("d",30.000000000000)); 
     96        PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.000006300000)); 
     97        PyDict_SetItemString(self->params,"equat_shell",Py_BuildValue("d",250.000000000000)); 
     98        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.000000000000)); 
     99        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000000000)); 
     100        PyDict_SetItemString(self->params,"equat_core",Py_BuildValue("d",200.000000000000)); 
     101        PyDict_SetItemString(self->params,"polar_core",Py_BuildValue("d",20.000000000000)); 
     102        PyDict_SetItemString(self->params,"sld_shell",Py_BuildValue("d",0.000001000000)); 
    103103        // Initialize dispersion / averaging parameter dict 
    104104        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CCoreShellModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"core_sld",Py_BuildValue("d",0.00000100)); 
    93         PyDict_SetItemString(self->params,"thickness",Py_BuildValue("d",10.00000000)); 
    94         PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.00000300)); 
    95         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    96         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",60.00000000)); 
    97         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    98         PyDict_SetItemString(self->params,"shell_sld",Py_BuildValue("d",0.00000200)); 
     92        PyDict_SetItemString(self->params,"core_sld",Py_BuildValue("d",0.000001000000)); 
     93        PyDict_SetItemString(self->params,"thickness",Py_BuildValue("d",10.000000000000)); 
     94        PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.000003000000)); 
     95        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     96        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",60.000000000000)); 
     97        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     98        PyDict_SetItemString(self->params,"shell_sld",Py_BuildValue("d",0.000002000000)); 
    9999        // Initialize dispersion / averaging parameter dict 
    100100        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CCylinderModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.00000400)); 
    94         PyDict_SetItemString(self->params,"cyl_theta",Py_BuildValue("d",1.00000000)); 
    95         PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.00000000)); 
    96         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000100)); 
    97         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    98         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.00000000)); 
    99         PyDict_SetItemString(self->params,"cyl_phi",Py_BuildValue("d",1.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.000004000000)); 
     94        PyDict_SetItemString(self->params,"cyl_theta",Py_BuildValue("d",1.000000000000)); 
     95        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000000000)); 
     96        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001000000)); 
     97        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     98        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.000000000000)); 
     99        PyDict_SetItemString(self->params,"cyl_phi",Py_BuildValue("d",1.000000000000)); 
    100100        // Initialize dispersion / averaging parameter dict 
    101101        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CDiamCylFunc.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.00000000)); 
    93         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.00000000)); 
     92        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000000000)); 
     93        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.000000000000)); 
    9494        // Initialize dispersion / averaging parameter dict 
    9595        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CDiamEllipFunc.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"radius_b",Py_BuildValue("d",400.00000000)); 
    93         PyDict_SetItemString(self->params,"radius_a",Py_BuildValue("d",20.00000000)); 
     92        PyDict_SetItemString(self->params,"radius_b",Py_BuildValue("d",400.000000000000)); 
     93        PyDict_SetItemString(self->params,"radius_a",Py_BuildValue("d",20.000000000000)); 
    9494        // Initialize dispersion / averaging parameter dict 
    9595        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CEllipsoidModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.57000000)); 
    94         PyDict_SetItemString(self->params,"radius_b",Py_BuildValue("d",400.00000000)); 
    95         PyDict_SetItemString(self->params,"radius_a",Py_BuildValue("d",20.00000000)); 
    96         PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.00000000)); 
    97         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000100)); 
    98         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    99         PyDict_SetItemString(self->params,"sldEll",Py_BuildValue("d",0.00000400)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.570000000000)); 
     94        PyDict_SetItemString(self->params,"radius_b",Py_BuildValue("d",400.000000000000)); 
     95        PyDict_SetItemString(self->params,"radius_a",Py_BuildValue("d",20.000000000000)); 
     96        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.000000000000)); 
     97        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001000000)); 
     98        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     99        PyDict_SetItemString(self->params,"sldEll",Py_BuildValue("d",0.000004000000)); 
    100100        // Initialize dispersion / averaging parameter dict 
    101101        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CEllipticalCylinderModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.00000400)); 
    94         PyDict_SetItemString(self->params,"cyl_psi",Py_BuildValue("d",0.00000000)); 
    95         PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.00000000)); 
    96         PyDict_SetItemString(self->params,"r_minor",Py_BuildValue("d",20.00000000)); 
    97         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000100)); 
    98         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    99         PyDict_SetItemString(self->params,"cyl_theta",Py_BuildValue("d",1.57000000)); 
    100         PyDict_SetItemString(self->params,"r_ratio",Py_BuildValue("d",1.50000000)); 
    101         PyDict_SetItemString(self->params,"cyl_phi",Py_BuildValue("d",0.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.000004000000)); 
     94        PyDict_SetItemString(self->params,"cyl_psi",Py_BuildValue("d",0.000000000000)); 
     95        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000000000)); 
     96        PyDict_SetItemString(self->params,"r_minor",Py_BuildValue("d",20.000000000000)); 
     97        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001000000)); 
     98        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     99        PyDict_SetItemString(self->params,"cyl_theta",Py_BuildValue("d",1.570000000000)); 
     100        PyDict_SetItemString(self->params,"r_ratio",Py_BuildValue("d",1.500000000000)); 
     101        PyDict_SetItemString(self->params,"cyl_phi",Py_BuildValue("d",0.000000000000)); 
    102102        // Initialize dispersion / averaging parameter dict 
    103103        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CFlexCylEllipXModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.00000100)); 
    94         PyDict_SetItemString(self->params,"axis_ratio",Py_BuildValue("d",1.50000000)); 
    95         PyDict_SetItemString(self->params,"length",Py_BuildValue("d",1000.00000000)); 
    96         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.00000000)); 
    97         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00010000)); 
    98         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000630)); 
    99         PyDict_SetItemString(self->params,"kuhn_length",Py_BuildValue("d",100.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.000001000000)); 
     94        PyDict_SetItemString(self->params,"axis_ratio",Py_BuildValue("d",1.500000000000)); 
     95        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",1000.000000000000)); 
     96        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.000000000000)); 
     97        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000100000000)); 
     98        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000006300000)); 
     99        PyDict_SetItemString(self->params,"kuhn_length",Py_BuildValue("d",100.000000000000)); 
    100100        // Initialize dispersion / averaging parameter dict 
    101101        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CFlexibleCylinderModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.00000100)); 
    94         PyDict_SetItemString(self->params,"length",Py_BuildValue("d",1000.00000000)); 
    95         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000630)); 
    96         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00010000)); 
    97         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.00000000)); 
    98         PyDict_SetItemString(self->params,"kuhn_length",Py_BuildValue("d",100.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.000001000000)); 
     94        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",1000.000000000000)); 
     95        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000006300000)); 
     96        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000100000000)); 
     97        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",20.000000000000)); 
     98        PyDict_SetItemString(self->params,"kuhn_length",Py_BuildValue("d",100.000000000000)); 
    9999        // Initialize dispersion / averaging parameter dict 
    100100        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CFractalModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",0.05000000)); 
    93         PyDict_SetItemString(self->params,"fractal_dim",Py_BuildValue("d",2.00000000)); 
    94         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000635)); 
    95         PyDict_SetItemString(self->params,"cor_length",Py_BuildValue("d",100.00000000)); 
    96         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    97         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",5.00000000)); 
    98         PyDict_SetItemString(self->params,"sldBlock",Py_BuildValue("d",0.00000200)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",0.050000000000)); 
     93        PyDict_SetItemString(self->params,"fractal_dim",Py_BuildValue("d",2.000000000000)); 
     94        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000006350000)); 
     95        PyDict_SetItemString(self->params,"cor_length",Py_BuildValue("d",100.000000000000)); 
     96        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     97        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",5.000000000000)); 
     98        PyDict_SetItemString(self->params,"sldBlock",Py_BuildValue("d",0.000002000000)); 
    9999        // Initialize dispersion / averaging parameter dict 
    100100        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CFuzzySphereModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",0.01000000)); 
    93         PyDict_SetItemString(self->params,"sldSph",Py_BuildValue("d",0.00000100)); 
    94         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",60.00000000)); 
    95         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00100000)); 
    96         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000300)); 
    97         PyDict_SetItemString(self->params,"fuzziness",Py_BuildValue("d",10.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",0.010000000000)); 
     93        PyDict_SetItemString(self->params,"sldSph",Py_BuildValue("d",0.000001000000)); 
     94        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",60.000000000000)); 
     95        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000000000)); 
     96        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000003000000)); 
     97        PyDict_SetItemString(self->params,"fuzziness",Py_BuildValue("d",10.000000000000)); 
    9898        // Initialize dispersion / averaging parameter dict 
    9999        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CGaussian.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"sigma",Py_BuildValue("d",1.00000000)); 
    94         PyDict_SetItemString(self->params,"center",Py_BuildValue("d",0.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"sigma",Py_BuildValue("d",1.000000000000)); 
     94        PyDict_SetItemString(self->params,"center",Py_BuildValue("d",0.000000000000)); 
    9595        // Initialize dispersion / averaging parameter dict 
    9696        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CHardsphereStructure.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"effect_radius",Py_BuildValue("d",50.00000000)); 
    93         PyDict_SetItemString(self->params,"volfraction",Py_BuildValue("d",0.20000000)); 
     92        PyDict_SetItemString(self->params,"effect_radius",Py_BuildValue("d",50.000000000000)); 
     93        PyDict_SetItemString(self->params,"volfraction",Py_BuildValue("d",0.200000000000)); 
    9494        // Initialize dispersion / averaging parameter dict 
    9595        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CHayterMSAStructure.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"temperature",Py_BuildValue("d",318.16000000)); 
    93         PyDict_SetItemString(self->params,"saltconc",Py_BuildValue("d",0.00000000)); 
    94         PyDict_SetItemString(self->params,"dielectconst",Py_BuildValue("d",71.08000000)); 
    95         PyDict_SetItemString(self->params,"volfraction",Py_BuildValue("d",0.01920000)); 
    96         PyDict_SetItemString(self->params,"charge",Py_BuildValue("d",19.00000000)); 
    97         PyDict_SetItemString(self->params,"effect_radius",Py_BuildValue("d",20.75000000)); 
     92        PyDict_SetItemString(self->params,"temperature",Py_BuildValue("d",318.160000000000)); 
     93        PyDict_SetItemString(self->params,"saltconc",Py_BuildValue("d",0.000000000000)); 
     94        PyDict_SetItemString(self->params,"dielectconst",Py_BuildValue("d",71.080000000000)); 
     95        PyDict_SetItemString(self->params,"volfraction",Py_BuildValue("d",0.019200000000)); 
     96        PyDict_SetItemString(self->params,"charge",Py_BuildValue("d",19.000000000000)); 
     97        PyDict_SetItemString(self->params,"effect_radius",Py_BuildValue("d",20.750000000000)); 
    9898        // Initialize dispersion / averaging parameter dict 
    9999        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CHollowCylinderModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.00000630)); 
    94         PyDict_SetItemString(self->params,"core_radius",Py_BuildValue("d",20.00000000)); 
    95         PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.57000000)); 
    96         PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.00000000)); 
    97         PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.00000000)); 
    98         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000100)); 
    99         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.01000000)); 
    100         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",30.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"sldCyl",Py_BuildValue("d",0.000006300000)); 
     94        PyDict_SetItemString(self->params,"core_radius",Py_BuildValue("d",20.000000000000)); 
     95        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.570000000000)); 
     96        PyDict_SetItemString(self->params,"length",Py_BuildValue("d",400.000000000000)); 
     97        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.000000000000)); 
     98        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001000000)); 
     99        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.010000000000)); 
     100        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",30.000000000000)); 
    101101        // Initialize dispersion / averaging parameter dict 
    102102        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CLamellarFFHGModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"h_thickness",Py_BuildValue("d",10.00000000)); 
    94         PyDict_SetItemString(self->params,"sld_tail",Py_BuildValue("d",0.00000040)); 
    95         PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.00000600)); 
    96         PyDict_SetItemString(self->params,"t_length",Py_BuildValue("d",15.00000000)); 
    97         PyDict_SetItemString(self->params,"sld_head",Py_BuildValue("d",0.00000300)); 
    98         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"h_thickness",Py_BuildValue("d",10.000000000000)); 
     94        PyDict_SetItemString(self->params,"sld_tail",Py_BuildValue("d",0.000000400000)); 
     95        PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.000006000000)); 
     96        PyDict_SetItemString(self->params,"t_length",Py_BuildValue("d",15.000000000000)); 
     97        PyDict_SetItemString(self->params,"sld_head",Py_BuildValue("d",0.000003000000)); 
     98        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
    9999        // Initialize dispersion / averaging parameter dict 
    100100        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CLamellarModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"sld_sol",Py_BuildValue("d",0.00000630)); 
    93         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    94         PyDict_SetItemString(self->params,"bi_thick",Py_BuildValue("d",50.00000000)); 
    95         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    96         PyDict_SetItemString(self->params,"sld_bi",Py_BuildValue("d",0.00000100)); 
     92        PyDict_SetItemString(self->params,"sld_sol",Py_BuildValue("d",0.000006300000)); 
     93        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     94        PyDict_SetItemString(self->params,"bi_thick",Py_BuildValue("d",50.000000000000)); 
     95        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     96        PyDict_SetItemString(self->params,"sld_bi",Py_BuildValue("d",0.000001000000)); 
    9797        // Initialize dispersion / averaging parameter dict 
    9898        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CLamellarPSHGModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"n_plates",Py_BuildValue("d",30.00000000)); 
    93         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    94         PyDict_SetItemString(self->params,"deltaT",Py_BuildValue("d",10.00000000)); 
    95         PyDict_SetItemString(self->params,"spacing",Py_BuildValue("d",40.00000000)); 
    96         PyDict_SetItemString(self->params,"sld_tail",Py_BuildValue("d",0.00000040)); 
    97         PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.00000600)); 
    98         PyDict_SetItemString(self->params,"caille",Py_BuildValue("d",0.00100000)); 
    99         PyDict_SetItemString(self->params,"sld_head",Py_BuildValue("d",0.00000200)); 
    100         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00100000)); 
    101         PyDict_SetItemString(self->params,"deltaH",Py_BuildValue("d",2.00000000)); 
     92        PyDict_SetItemString(self->params,"n_plates",Py_BuildValue("d",30.000000000000)); 
     93        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     94        PyDict_SetItemString(self->params,"deltaT",Py_BuildValue("d",10.000000000000)); 
     95        PyDict_SetItemString(self->params,"spacing",Py_BuildValue("d",40.000000000000)); 
     96        PyDict_SetItemString(self->params,"sld_tail",Py_BuildValue("d",0.000000400000)); 
     97        PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.000006000000)); 
     98        PyDict_SetItemString(self->params,"caille",Py_BuildValue("d",0.001000000000)); 
     99        PyDict_SetItemString(self->params,"sld_head",Py_BuildValue("d",0.000002000000)); 
     100        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000000000)); 
     101        PyDict_SetItemString(self->params,"deltaH",Py_BuildValue("d",2.000000000000)); 
    102102        // Initialize dispersion / averaging parameter dict 
    103103        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CLamellarPSModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"n_plates",Py_BuildValue("d",20.00000000)); 
    93         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    94         PyDict_SetItemString(self->params,"sld_sol",Py_BuildValue("d",0.00000100)); 
    95         PyDict_SetItemString(self->params,"delta",Py_BuildValue("d",30.00000000)); 
    96         PyDict_SetItemString(self->params,"spacing",Py_BuildValue("d",400.00000000)); 
    97         PyDict_SetItemString(self->params,"caille",Py_BuildValue("d",0.10000000)); 
    98         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    99         PyDict_SetItemString(self->params,"sld_bi",Py_BuildValue("d",0.00000630)); 
     92        PyDict_SetItemString(self->params,"n_plates",Py_BuildValue("d",20.000000000000)); 
     93        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     94        PyDict_SetItemString(self->params,"sld_sol",Py_BuildValue("d",0.000001000000)); 
     95        PyDict_SetItemString(self->params,"delta",Py_BuildValue("d",30.000000000000)); 
     96        PyDict_SetItemString(self->params,"spacing",Py_BuildValue("d",400.000000000000)); 
     97        PyDict_SetItemString(self->params,"caille",Py_BuildValue("d",0.100000000000)); 
     98        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     99        PyDict_SetItemString(self->params,"sld_bi",Py_BuildValue("d",0.000006300000)); 
    100100        // Initialize dispersion / averaging parameter dict 
    101101        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CLogNormal.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"sigma",Py_BuildValue("d",1.00000000)); 
    94         PyDict_SetItemString(self->params,"center",Py_BuildValue("d",0.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"sigma",Py_BuildValue("d",1.000000000000)); 
     94        PyDict_SetItemString(self->params,"center",Py_BuildValue("d",0.000000000000)); 
    9595        // Initialize dispersion / averaging parameter dict 
    9696        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CLorentzian.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"center",Py_BuildValue("d",0.00000000)); 
    94         PyDict_SetItemString(self->params,"gamma",Py_BuildValue("d",1.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"center",Py_BuildValue("d",0.000000000000)); 
     94        PyDict_SetItemString(self->params,"gamma",Py_BuildValue("d",1.000000000000)); 
    9595        // Initialize dispersion / averaging parameter dict 
    9696        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CMultiShellModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"core_sld",Py_BuildValue("d",0.00000640)); 
    93         PyDict_SetItemString(self->params,"core_radius",Py_BuildValue("d",60.00000000)); 
    94         PyDict_SetItemString(self->params,"n_pairs",Py_BuildValue("d",2.00000000)); 
    95         PyDict_SetItemString(self->params,"w_thickness",Py_BuildValue("d",10.00000000)); 
    96         PyDict_SetItemString(self->params,"s_thickness",Py_BuildValue("d",10.00000000)); 
    97         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    98         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    99         PyDict_SetItemString(self->params,"shell_sld",Py_BuildValue("d",0.00000040)); 
     92        PyDict_SetItemString(self->params,"core_sld",Py_BuildValue("d",0.000006400000)); 
     93        PyDict_SetItemString(self->params,"core_radius",Py_BuildValue("d",60.000000000000)); 
     94        PyDict_SetItemString(self->params,"n_pairs",Py_BuildValue("d",2.000000000000)); 
     95        PyDict_SetItemString(self->params,"w_thickness",Py_BuildValue("d",10.000000000000)); 
     96        PyDict_SetItemString(self->params,"s_thickness",Py_BuildValue("d",10.000000000000)); 
     97        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     98        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     99        PyDict_SetItemString(self->params,"shell_sld",Py_BuildValue("d",0.000000400000)); 
    100100        // Initialize dispersion / averaging parameter dict 
    101101        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/COblateModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"major_core",Py_BuildValue("d",200.00000000)); 
    93         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    94         PyDict_SetItemString(self->params,"minor_core",Py_BuildValue("d",20.00000000)); 
    95         PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.00000000)); 
    96         PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.00000630)); 
    97         PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",1.00000000)); 
    98         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00100000)); 
    99         PyDict_SetItemString(self->params,"major_shell",Py_BuildValue("d",250.00000000)); 
    100         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.00000100)); 
    101         PyDict_SetItemString(self->params,"minor_shell",Py_BuildValue("d",30.00000000)); 
     92        PyDict_SetItemString(self->params,"major_core",Py_BuildValue("d",200.000000000000)); 
     93        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     94        PyDict_SetItemString(self->params,"minor_core",Py_BuildValue("d",20.000000000000)); 
     95        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.000000000000)); 
     96        PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.000006300000)); 
     97        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",1.000000000000)); 
     98        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000000000)); 
     99        PyDict_SetItemString(self->params,"major_shell",Py_BuildValue("d",250.000000000000)); 
     100        PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000001000000)); 
     101        PyDict_SetItemString(self->params,"minor_shell",Py_BuildValue("d",30.000000000000)); 
    102102        // Initialize dispersion / averaging parameter dict 
    103103        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/COnionModel.cpp

    re096270 r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"thick_shell4",Py_BuildValue("d",50.00000000)); 
    93         PyDict_SetItemString(self->params,"thick_shell5",Py_BuildValue("d",50.00000000)); 
    94         PyDict_SetItemString(self->params,"thick_shell9",Py_BuildValue("d",50.00000000)); 
    95         PyDict_SetItemString(self->params,"thick_shell7",Py_BuildValue("d",50.00000000)); 
    96         PyDict_SetItemString(self->params,"A_shell10",Py_BuildValue("d",1.00000000)); 
    97         PyDict_SetItemString(self->params,"thick_shell1",Py_BuildValue("d",50.00000000)); 
    98         PyDict_SetItemString(self->params,"func_shell4",Py_BuildValue("d",2.00000000)); 
    99         PyDict_SetItemString(self->params,"func_shell5",Py_BuildValue("d",2.00000000)); 
    100         PyDict_SetItemString(self->params,"func_shell6",Py_BuildValue("d",2.00000000)); 
    101         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    102         PyDict_SetItemString(self->params,"func_shell1",Py_BuildValue("d",2.00000000)); 
    103         PyDict_SetItemString(self->params,"thick_shell10",Py_BuildValue("d",50.00000000)); 
    104         PyDict_SetItemString(self->params,"func_shell3",Py_BuildValue("d",2.00000000)); 
    105         PyDict_SetItemString(self->params,"rad_core",Py_BuildValue("d",200.00000000)); 
    106         PyDict_SetItemString(self->params,"thick_shell3",Py_BuildValue("d",50.00000000)); 
    107         PyDict_SetItemString(self->params,"func_shell8",Py_BuildValue("d",2.00000000)); 
    108         PyDict_SetItemString(self->params,"func_shell9",Py_BuildValue("d",2.00000000)); 
    109         PyDict_SetItemString(self->params,"sld_in_shell5",Py_BuildValue("d",0.00000370)); 
    110         PyDict_SetItemString(self->params,"func_shell10",Py_BuildValue("d",2.00000000)); 
    111         PyDict_SetItemString(self->params,"sld_in_shell4",Py_BuildValue("d",0.00000320)); 
    112         PyDict_SetItemString(self->params,"sld_in_shell7",Py_BuildValue("d",0.00000470)); 
    113         PyDict_SetItemString(self->params,"sld_out_shell9",Py_BuildValue("d",0.00000600)); 
    114         PyDict_SetItemString(self->params,"sld_out_shell8",Py_BuildValue("d",0.00000550)); 
    115         PyDict_SetItemString(self->params,"thick_shell6",Py_BuildValue("d",50.00000000)); 
    116         PyDict_SetItemString(self->params,"sld_out_shell2",Py_BuildValue("d",0.00000250)); 
    117         PyDict_SetItemString(self->params,"sld_in_shell9",Py_BuildValue("d",0.00000570)); 
    118         PyDict_SetItemString(self->params,"sld_in_shell8",Py_BuildValue("d",0.00000520)); 
    119         PyDict_SetItemString(self->params,"thick_shell2",Py_BuildValue("d",50.00000000)); 
    120         PyDict_SetItemString(self->params,"sld_core",Py_BuildValue("d",0.00000100)); 
    121         PyDict_SetItemString(self->params,"sld_out_shell1",Py_BuildValue("d",0.00000200)); 
    122         PyDict_SetItemString(self->params,"sld_in_shell1",Py_BuildValue("d",0.00000170)); 
    123         PyDict_SetItemString(self->params,"sld_out_shell3",Py_BuildValue("d",0.00000300)); 
    124         PyDict_SetItemString(self->params,"sld_in_shell6",Py_BuildValue("d",0.00000420)); 
    125         PyDict_SetItemString(self->params,"sld_out_shell5",Py_BuildValue("d",0.00000400)); 
    126         PyDict_SetItemString(self->params,"sld_out_shell4",Py_BuildValue("d",0.00000350)); 
    127         PyDict_SetItemString(self->params,"sld_in_shell3",Py_BuildValue("d",0.00000270)); 
    128         PyDict_SetItemString(self->params,"sld_out_shell6",Py_BuildValue("d",0.00000450)); 
    129         PyDict_SetItemString(self->params,"func_shell7",Py_BuildValue("d",2.00000000)); 
    130         PyDict_SetItemString(self->params,"sld_out_shell7",Py_BuildValue("d",0.00000500)); 
    131         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    132         PyDict_SetItemString(self->params,"n_shells",Py_BuildValue("d",1.00000000)); 
    133         PyDict_SetItemString(self->params,"sld_in_shell2",Py_BuildValue("d",0.00000220)); 
    134         PyDict_SetItemString(self->params,"sld_solv",Py_BuildValue("d",0.00000640)); 
    135         PyDict_SetItemString(self->params,"func_shell2",Py_BuildValue("d",2.00000000)); 
    136         PyDict_SetItemString(self->params,"thick_shell8",Py_BuildValue("d",50.00000000)); 
    137         PyDict_SetItemString(self->params,"sld_out_shell10",Py_BuildValue("d",0.00000620)); 
    138         PyDict_SetItemString(self->params,"sld_in_shell10",Py_BuildValue("d",0.00000600)); 
    139         PyDict_SetItemString(self->params,"A_shell8",Py_BuildValue("d",1.00000000)); 
    140         PyDict_SetItemString(self->params,"A_shell9",Py_BuildValue("d",1.00000000)); 
    141         PyDict_SetItemString(self->params,"A_shell6",Py_BuildValue("d",1.00000000)); 
    142         PyDict_SetItemString(self->params,"A_shell7",Py_BuildValue("d",1.00000000)); 
    143         PyDict_SetItemString(self->params,"A_shell4",Py_BuildValue("d",1.00000000)); 
    144         PyDict_SetItemString(self->params,"A_shell5",Py_BuildValue("d",1.00000000)); 
    145         PyDict_SetItemString(self->params,"A_shell2",Py_BuildValue("d",1.00000000)); 
    146         PyDict_SetItemString(self->params,"A_shell3",Py_BuildValue("d",1.00000000)); 
    147         PyDict_SetItemString(self->params,"A_shell1",Py_BuildValue("d",1.00000000)); 
     92        PyDict_SetItemString(self->params,"thick_shell4",Py_BuildValue("d",50.000000000000)); 
     93        PyDict_SetItemString(self->params,"thick_shell5",Py_BuildValue("d",50.000000000000)); 
     94        PyDict_SetItemString(self->params,"thick_shell9",Py_BuildValue("d",50.000000000000)); 
     95        PyDict_SetItemString(self->params,"thick_shell7",Py_BuildValue("d",50.000000000000)); 
     96        PyDict_SetItemString(self->params,"A_shell10",Py_BuildValue("d",1.000000000000)); 
     97        PyDict_SetItemString(self->params,"thick_shell1",Py_BuildValue("d",50.000000000000)); 
     98        PyDict_SetItemString(self->params,"func_shell4",Py_BuildValue("d",2.000000000000)); 
     99        PyDict_SetItemString(self->params,"func_shell5",Py_BuildValue("d",2.000000000000)); 
     100        PyDict_SetItemString(self->params,"func_shell6",Py_BuildValue("d",2.000000000000)); 
     101        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     102        PyDict_SetItemString(self->params,"func_shell1",Py_BuildValue("d",2.000000000000)); 
     103        PyDict_SetItemString(self->params,"thick_shell10",Py_BuildValue("d",50.000000000000)); 
     104        PyDict_SetItemString(self->params,"func_shell3",Py_BuildValue("d",2.000000000000)); 
     105        PyDict_SetItemString(self->params,"rad_core",Py_BuildValue("d",200.000000000000)); 
     106        PyDict_SetItemString(self->params,"thick_shell3",Py_BuildValue("d",50.000000000000)); 
     107        PyDict_SetItemString(self->params,"func_shell8",Py_BuildValue("d",2.000000000000)); 
     108        PyDict_SetItemString(self->params,"func_shell9",Py_BuildValue("d",2.000000000000)); 
     109        PyDict_SetItemString(self->params,"sld_in_shell5",Py_BuildValue("d",0.000003700000)); 
     110        PyDict_SetItemString(self->params,"func_shell10",Py_BuildValue("d",2.000000000000)); 
     111        PyDict_SetItemString(self->params,"sld_in_shell4",Py_BuildValue("d",0.000003200000)); 
     112        PyDict_SetItemString(self->params,"sld_in_shell7",Py_BuildValue("d",0.000004700000)); 
     113        PyDict_SetItemString(self->params,"sld_out_shell9",Py_BuildValue("d",0.000006000000)); 
     114        PyDict_SetItemString(self->params,"sld_out_shell8",Py_BuildValue("d",0.000005500000)); 
     115        PyDict_SetItemString(self->params,"thick_shell6",Py_BuildValue("d",50.000000000000)); 
     116        PyDict_SetItemString(self->params,"sld_out_shell2",Py_BuildValue("d",0.000002500000)); 
     117        PyDict_SetItemString(self->params,"sld_in_shell9",Py_BuildValue("d",0.000005700000)); 
     118        PyDict_SetItemString(self->params,"sld_in_shell8",Py_BuildValue("d",0.000005200000)); 
     119        PyDict_SetItemString(self->params,"thick_shell2",Py_BuildValue("d",50.000000000000)); 
     120        PyDict_SetItemString(self->params,"sld_core",Py_BuildValue("d",0.000001000000)); 
     121        PyDict_SetItemString(self->params,"sld_out_shell1",Py_BuildValue("d",0.000002000000)); 
     122        PyDict_SetItemString(self->params,"sld_in_shell1",Py_BuildValue("d",0.000001700000)); 
     123        PyDict_SetItemString(self->params,"sld_out_shell3",Py_BuildValue("d",0.000003000000)); 
     124        PyDict_SetItemString(self->params,"sld_in_shell6",Py_BuildValue("d",0.000004200000)); 
     125        PyDict_SetItemString(self->params,"sld_out_shell5",Py_BuildValue("d",0.000004000000)); 
     126        PyDict_SetItemString(self->params,"sld_out_shell4",Py_BuildValue("d",0.000003500000)); 
     127        PyDict_SetItemString(self->params,"sld_in_shell3",Py_BuildValue("d",0.000002700000)); 
     128        PyDict_SetItemString(self->params,"sld_out_shell6",Py_BuildValue("d",0.000004500000)); 
     129        PyDict_SetItemString(self->params,"func_shell7",Py_BuildValue("d",2.000000000000)); 
     130        PyDict_SetItemString(self->params,"sld_out_shell7",Py_BuildValue("d",0.000005000000)); 
     131        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     132        PyDict_SetItemString(self->params,"n_shells",Py_BuildValue("d",1.000000000000)); 
     133        PyDict_SetItemString(self->params,"sld_in_shell2",Py_BuildValue("d",0.000002200000)); 
     134        PyDict_SetItemString(self->params,"sld_solv",Py_BuildValue("d",0.000006400000)); 
     135        PyDict_SetItemString(self->params,"func_shell2",Py_BuildValue("d",2.000000000000)); 
     136        PyDict_SetItemString(self->params,"thick_shell8",Py_BuildValue("d",50.000000000000)); 
     137        PyDict_SetItemString(self->params,"sld_out_shell10",Py_BuildValue("d",0.000006200000)); 
     138        PyDict_SetItemString(self->params,"sld_in_shell10",Py_BuildValue("d",0.000006000000)); 
     139        PyDict_SetItemString(self->params,"A_shell8",Py_BuildValue("d",1.000000000000)); 
     140        PyDict_SetItemString(self->params,"A_shell9",Py_BuildValue("d",1.000000000000)); 
     141        PyDict_SetItemString(self->params,"A_shell6",Py_BuildValue("d",1.000000000000)); 
     142        PyDict_SetItemString(self->params,"A_shell7",Py_BuildValue("d",1.000000000000)); 
     143        PyDict_SetItemString(self->params,"A_shell4",Py_BuildValue("d",1.000000000000)); 
     144        PyDict_SetItemString(self->params,"A_shell5",Py_BuildValue("d",1.000000000000)); 
     145        PyDict_SetItemString(self->params,"A_shell2",Py_BuildValue("d",1.000000000000)); 
     146        PyDict_SetItemString(self->params,"A_shell3",Py_BuildValue("d",1.000000000000)); 
     147        PyDict_SetItemString(self->params,"A_shell1",Py_BuildValue("d",1.000000000000)); 
    148148        // Initialize dispersion / averaging parameter dict 
    149149        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CParallelepipedModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"short_a",Py_BuildValue("d",35.00000000)); 
    93         PyDict_SetItemString(self->params,"short_b",Py_BuildValue("d",75.00000000)); 
    94         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    95         PyDict_SetItemString(self->params,"long_c",Py_BuildValue("d",400.00000000)); 
    96         PyDict_SetItemString(self->params,"sldPipe",Py_BuildValue("d",0.00000630)); 
    97         PyDict_SetItemString(self->params,"parallel_psi",Py_BuildValue("d",0.00000000)); 
    98         PyDict_SetItemString(self->params,"parallel_phi",Py_BuildValue("d",0.00000000)); 
    99         PyDict_SetItemString(self->params,"parallel_theta",Py_BuildValue("d",0.00000000)); 
    100         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000100)); 
    101         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
     92        PyDict_SetItemString(self->params,"short_a",Py_BuildValue("d",35.000000000000)); 
     93        PyDict_SetItemString(self->params,"short_b",Py_BuildValue("d",75.000000000000)); 
     94        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     95        PyDict_SetItemString(self->params,"long_c",Py_BuildValue("d",400.000000000000)); 
     96        PyDict_SetItemString(self->params,"sldPipe",Py_BuildValue("d",0.000006300000)); 
     97        PyDict_SetItemString(self->params,"parallel_psi",Py_BuildValue("d",0.000000000000)); 
     98        PyDict_SetItemString(self->params,"parallel_phi",Py_BuildValue("d",0.000000000000)); 
     99        PyDict_SetItemString(self->params,"parallel_theta",Py_BuildValue("d",0.000000000000)); 
     100        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001000000)); 
     101        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
    102102        // Initialize dispersion / averaging parameter dict 
    103103        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CPoly_GaussCoil.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"poly_m",Py_BuildValue("d",2.00000000)); 
    93         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    94         PyDict_SetItemString(self->params,"rg",Py_BuildValue("d",60.00000000)); 
    95         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00100000)); 
     92        PyDict_SetItemString(self->params,"poly_m",Py_BuildValue("d",2.000000000000)); 
     93        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     94        PyDict_SetItemString(self->params,"rg",Py_BuildValue("d",60.000000000000)); 
     95        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000000000)); 
    9696        // Initialize dispersion / averaging parameter dict 
    9797        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CProlateModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"major_core",Py_BuildValue("d",100.00000000)); 
    93         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    94         PyDict_SetItemString(self->params,"minor_core",Py_BuildValue("d",50.00000000)); 
    95         PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.00000630)); 
    96         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00100000)); 
    97         PyDict_SetItemString(self->params,"major_shell",Py_BuildValue("d",110.00000000)); 
    98         PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.00000100)); 
    99         PyDict_SetItemString(self->params,"minor_shell",Py_BuildValue("d",60.00000000)); 
     92        PyDict_SetItemString(self->params,"major_core",Py_BuildValue("d",100.000000000000)); 
     93        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     94        PyDict_SetItemString(self->params,"minor_core",Py_BuildValue("d",50.000000000000)); 
     95        PyDict_SetItemString(self->params,"sld_solvent",Py_BuildValue("d",0.000006300000)); 
     96        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000000000)); 
     97        PyDict_SetItemString(self->params,"major_shell",Py_BuildValue("d",110.000000000000)); 
     98        PyDict_SetItemString(self->params,"contrast",Py_BuildValue("d",0.000001000000)); 
     99        PyDict_SetItemString(self->params,"minor_shell",Py_BuildValue("d",60.000000000000)); 
    100100        // Initialize dispersion / averaging parameter dict 
    101101        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CSchulz.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"sigma",Py_BuildValue("d",1.00000000)); 
    94         PyDict_SetItemString(self->params,"center",Py_BuildValue("d",0.00000000)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"sigma",Py_BuildValue("d",1.000000000000)); 
     94        PyDict_SetItemString(self->params,"center",Py_BuildValue("d",0.000000000000)); 
    9595        // Initialize dispersion / averaging parameter dict 
    9696        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CSphereModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000100)); 
    93         PyDict_SetItemString(self->params,"sldSph",Py_BuildValue("d",0.00000200)); 
    94         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    95         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",60.00000000)); 
    96         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
     92        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000001000000)); 
     93        PyDict_SetItemString(self->params,"sldSph",Py_BuildValue("d",0.000002000000)); 
     94        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     95        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",60.000000000000)); 
     96        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
    9797        // Initialize dispersion / averaging parameter dict 
    9898        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CSquareWellStructure.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"welldepth",Py_BuildValue("d",1.50000000)); 
    93         PyDict_SetItemString(self->params,"effect_radius",Py_BuildValue("d",50.00000000)); 
    94         PyDict_SetItemString(self->params,"volfraction",Py_BuildValue("d",0.04000000)); 
    95         PyDict_SetItemString(self->params,"wellwidth",Py_BuildValue("d",1.20000000)); 
     92        PyDict_SetItemString(self->params,"welldepth",Py_BuildValue("d",1.500000000000)); 
     93        PyDict_SetItemString(self->params,"effect_radius",Py_BuildValue("d",50.000000000000)); 
     94        PyDict_SetItemString(self->params,"volfraction",Py_BuildValue("d",0.040000000000)); 
     95        PyDict_SetItemString(self->params,"wellwidth",Py_BuildValue("d",1.200000000000)); 
    9696        // Initialize dispersion / averaging parameter dict 
    9797        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CStackedDisksModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"core_sld",Py_BuildValue("d",0.00000400)); 
    93         PyDict_SetItemString(self->params,"core_thick",Py_BuildValue("d",10.00000000)); 
    94         PyDict_SetItemString(self->params,"layer_thick",Py_BuildValue("d",15.00000000)); 
    95         PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",0.00000000)); 
    96         PyDict_SetItemString(self->params,"layer_sld",Py_BuildValue("d",-0.00000040)); 
    97         PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.00000000)); 
    98         PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.00000500)); 
    99         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",0.01000000)); 
    100         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",3000.00000000)); 
    101         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00100000)); 
    102         PyDict_SetItemString(self->params,"sigma_d",Py_BuildValue("d",0.00000000)); 
    103         PyDict_SetItemString(self->params,"n_stacking",Py_BuildValue("d",1.00000000)); 
     92        PyDict_SetItemString(self->params,"core_sld",Py_BuildValue("d",0.000004000000)); 
     93        PyDict_SetItemString(self->params,"core_thick",Py_BuildValue("d",10.000000000000)); 
     94        PyDict_SetItemString(self->params,"layer_thick",Py_BuildValue("d",15.000000000000)); 
     95        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",0.000000000000)); 
     96        PyDict_SetItemString(self->params,"layer_sld",Py_BuildValue("d",-0.000000400000)); 
     97        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",0.000000000000)); 
     98        PyDict_SetItemString(self->params,"solvent_sld",Py_BuildValue("d",0.000005000000)); 
     99        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",0.010000000000)); 
     100        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",3000.000000000000)); 
     101        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.001000000000)); 
     102        PyDict_SetItemString(self->params,"sigma_d",Py_BuildValue("d",0.000000000000)); 
     103        PyDict_SetItemString(self->params,"n_stacking",Py_BuildValue("d",1.000000000000)); 
    104104        // Initialize dispersion / averaging parameter dict 
    105105        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CStickyHSStructure.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"stickiness",Py_BuildValue("d",0.20000000)); 
    93         PyDict_SetItemString(self->params,"effect_radius",Py_BuildValue("d",50.00000000)); 
    94         PyDict_SetItemString(self->params,"volfraction",Py_BuildValue("d",0.10000000)); 
    95         PyDict_SetItemString(self->params,"perturb",Py_BuildValue("d",0.05000000)); 
     92        PyDict_SetItemString(self->params,"stickiness",Py_BuildValue("d",0.200000000000)); 
     93        PyDict_SetItemString(self->params,"effect_radius",Py_BuildValue("d",50.000000000000)); 
     94        PyDict_SetItemString(self->params,"volfraction",Py_BuildValue("d",0.100000000000)); 
     95        PyDict_SetItemString(self->params,"perturb",Py_BuildValue("d",0.050000000000)); 
    9696        // Initialize dispersion / averaging parameter dict 
    9797        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CTriaxialEllipsoidModel.cpp

    r186c4eb r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    93         PyDict_SetItemString(self->params,"axis_psi",Py_BuildValue("d",0.00000000)); 
    94         PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.00000000)); 
    95         PyDict_SetItemString(self->params,"semi_axisA",Py_BuildValue("d",35.00000000)); 
    96         PyDict_SetItemString(self->params,"semi_axisB",Py_BuildValue("d",100.00000000)); 
    97         PyDict_SetItemString(self->params,"semi_axisC",Py_BuildValue("d",400.00000000)); 
    98         PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",1.00000000)); 
    99         PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.00000630)); 
    100         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    101         PyDict_SetItemString(self->params,"sldEll",Py_BuildValue("d",0.00000100)); 
     92        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     93        PyDict_SetItemString(self->params,"axis_psi",Py_BuildValue("d",0.000000000000)); 
     94        PyDict_SetItemString(self->params,"axis_theta",Py_BuildValue("d",1.000000000000)); 
     95        PyDict_SetItemString(self->params,"semi_axisA",Py_BuildValue("d",35.000000000000)); 
     96        PyDict_SetItemString(self->params,"semi_axisB",Py_BuildValue("d",100.000000000000)); 
     97        PyDict_SetItemString(self->params,"semi_axisC",Py_BuildValue("d",400.000000000000)); 
     98        PyDict_SetItemString(self->params,"axis_phi",Py_BuildValue("d",1.000000000000)); 
     99        PyDict_SetItemString(self->params,"sldSolv",Py_BuildValue("d",0.000006300000)); 
     100        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     101        PyDict_SetItemString(self->params,"sldEll",Py_BuildValue("d",0.000001000000)); 
    102102        // Initialize dispersion / averaging parameter dict 
    103103        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/CVesicleModel.cpp

    rc724ccd r35aface  
    9090         
    9191        // Initialize parameter dictionary 
    92         PyDict_SetItemString(self->params,"core_sld",Py_BuildValue("d",0.00000636)); 
    93         PyDict_SetItemString(self->params,"thickness",Py_BuildValue("d",30.00000000)); 
    94         PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.00000000)); 
    95         PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",100.00000000)); 
    96         PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.00000000)); 
    97         PyDict_SetItemString(self->params,"shell_sld",Py_BuildValue("d",0.00000050)); 
     92        PyDict_SetItemString(self->params,"core_sld",Py_BuildValue("d",0.000006360000)); 
     93        PyDict_SetItemString(self->params,"thickness",Py_BuildValue("d",30.000000000000)); 
     94        PyDict_SetItemString(self->params,"scale",Py_BuildValue("d",1.000000000000)); 
     95        PyDict_SetItemString(self->params,"radius",Py_BuildValue("d",100.000000000000)); 
     96        PyDict_SetItemString(self->params,"background",Py_BuildValue("d",0.000000000000)); 
     97        PyDict_SetItemString(self->params,"shell_sld",Py_BuildValue("d",0.000000500000)); 
    9898        // Initialize dispersion / averaging parameter dict 
    9999        DispersionVisitor* visitor = new DispersionVisitor(); 
  • sansmodels/src/sans/models/c_models/WrapperGenerator.py

    rc724ccd r35aface  
    8484        # paramaters for fittable 
    8585        self.fixed= [] 
     86        # paramaters for non-fittable 
     87        self.non_fittable= [] 
    8688        ## parameters with orientation 
    8789        self.orientation_params =[] 
     
    9698        rep += "  description:    %s\n\n" % self.description 
    9799        rep += "  Fittable parameters:     %s\n\n"% self.fixed 
     100        rep += "  Non-Fittable parameters:     %s\n\n"% self.non_fittable 
    98101        rep += "  Orientation parameters:  %s\n\n"% self.orientation_params 
    99102        return rep 
     
    129132        except: 
    130133           raise    
     134        ## Catch non-fittable parameters parameters 
     135        key = "[NON_FITTABLE_PARAMS]" 
     136        try: 
     137            self.non_fittable= lineparser.readhelper(lines,key, key2,key3, file= self.file) 
     138        except: 
     139           raise    
     140 
    131141        ## Catch parameters with orientation 
    132142        key = "[ORIENTATION_PARAMS]"     
     
    298308            param_str = "// Initialize parameter dictionary\n"             
    299309            for par in self.params: 
    300                 param_str += "        PyDict_SetItemString(self->params,\"%s\",Py_BuildValue(\"d\",%10.8f));\n" % \ 
     310                param_str += "        PyDict_SetItemString(self->params,\"%s\",Py_BuildValue(\"d\",%10.12f));\n" % \ 
    301311                    (par, self.params[par]) 
    302312 
     
    420430            newline = self.replaceToken(newline,  
    421431                                        "[FIXED]",str(self.fixed)) 
     432            # non-fittable list  details 
     433            newline = self.replaceToken(newline,  
     434                                        "[NON_FITTABLE_PARAMS]",str(self.non_fittable)) 
    422435            ## parameters with orientation 
    423436        
  • sansmodels/src/sans/models/c_models/c_models.cpp

    re096270 r35aface  
    1616void addCSphereModel(PyObject *module); 
    1717void addCOnionModel(PyObject *module); 
     18void addCReflModel(PyObject *module); 
    1819void addCFuzzySphereModel(PyObject *module); 
    1920void addCHardsphereStructure(PyObject *module); 
     
    4445void addCVesicleModel(PyObject *module); 
    4546void addCBinaryHSModel(PyObject *module); 
    46 //void addCPolymerExclVolModel(PyObject *module); 
     47void addCRPAModel(PyObject *module); 
    4748void addCFractalModel(PyObject *module); 
    4849void addCPoly_GaussCoil(PyObject *module); 
     
    224225        addCSphereModel(m); 
    225226        addCOnionModel(m); 
     227        addCReflModel(m); 
    226228        addCFuzzySphereModel(m); 
    227229        addCHardsphereStructure(m); 
     
    254256        addCVesicleModel(m); 
    255257        addCPoly_GaussCoil(m); 
     258        addCRPAModel(m); 
    256259        addCFractalModel(m); 
    257 //      addCPolymerExclVolModel(m); 
    258 } 
     260} 
  • sansmodels/src/sans/models/c_models/modelTemplate.txt

    r79ac6f8 r35aface  
    5353        ## fittable parameters 
    5454        self.fixed=[FIXED] 
     55         
     56        ## non-fittable parameters 
     57        self.non_fittable=[NON_FITTABLE_PARAMS] 
    5558         
    5659        ## parameters with orientation 
  • sansmodels/src/sans/models/c_models/models.hh

    re096270 r35aface  
    149149        double evaluate_rphi(double q, double phi); 
    150150}; 
     151 
     152 
     153class RPAModel{ 
     154public: 
     155        // Model parameters 
     156        Parameter lcase_n; 
     157        Parameter ba; 
     158        Parameter bb; 
     159        Parameter bc; 
     160        Parameter bd; 
     161 
     162        Parameter Kab; 
     163        Parameter Kac; 
     164        Parameter Kad; 
     165        Parameter Kbc; 
     166        Parameter Kbd; 
     167        Parameter Kcd; 
     168 
     169        Parameter scale; 
     170        Parameter background; 
     171 
     172        Parameter Na; 
     173        Parameter Phia; 
     174        Parameter va; 
     175        Parameter La; 
     176 
     177        Parameter Nb; 
     178        Parameter Phib; 
     179        Parameter vb; 
     180        Parameter Lb; 
     181 
     182        Parameter Nc; 
     183        Parameter Phic; 
     184        Parameter vc; 
     185        Parameter Lc; 
     186 
     187        Parameter Nd; 
     188        Parameter Phid; 
     189        Parameter vd; 
     190        Parameter Ld; 
     191 
     192        // Constructor 
     193        RPAModel(); 
     194 
     195        // Operators to get I(Q) 
     196        double operator()(double q); 
     197        double operator()(double qx, double qy); 
     198        double calculate_ER(); 
     199        double evaluate_rphi(double q, double phi); 
     200}; 
     201 
     202 
     203class ReflModel{ 
     204public: 
     205        // Model parameters 
     206        Parameter n_layers; 
     207        Parameter scale; 
     208        Parameter thick_inter0; 
     209        Parameter func_inter0; 
     210        Parameter sld_sub0; 
     211        Parameter sld_medium; 
     212        Parameter background; 
     213 
     214        Parameter sld_flat1; 
     215        Parameter sld_flat2; 
     216        Parameter sld_flat3; 
     217        Parameter sld_flat4; 
     218        Parameter sld_flat5; 
     219        Parameter sld_flat6; 
     220        Parameter sld_flat7; 
     221        Parameter sld_flat8; 
     222        Parameter sld_flat9; 
     223        Parameter sld_flat10; 
     224 
     225        Parameter thick_inter1; 
     226        Parameter thick_inter2; 
     227        Parameter thick_inter3; 
     228        Parameter thick_inter4; 
     229        Parameter thick_inter5; 
     230        Parameter thick_inter6; 
     231        Parameter thick_inter7; 
     232        Parameter thick_inter8; 
     233        Parameter thick_inter9; 
     234        Parameter thick_inter10; 
     235 
     236        Parameter thick_flat1; 
     237        Parameter thick_flat2; 
     238        Parameter thick_flat3; 
     239        Parameter thick_flat4; 
     240        Parameter thick_flat5; 
     241        Parameter thick_flat6; 
     242        Parameter thick_flat7; 
     243        Parameter thick_flat8; 
     244        Parameter thick_flat9; 
     245        Parameter thick_flat10; 
     246 
     247        Parameter func_inter1; 
     248        Parameter func_inter2; 
     249        Parameter func_inter3; 
     250        Parameter func_inter4; 
     251        Parameter func_inter5; 
     252        Parameter func_inter6; 
     253        Parameter func_inter7; 
     254        Parameter func_inter8; 
     255        Parameter func_inter9; 
     256        Parameter func_inter10; 
     257 
     258        // Constructor 
     259        ReflModel(); 
     260 
     261        // Operators to get I(Q) 
     262        double operator()(double q); 
     263        double operator()(double qx, double qy); 
     264        double calculate_ER(); 
     265        double evaluate_rphi(double q, double phi); 
     266}; 
     267 
    151268 
    152269class SphereModel{ 
     
    767884}; 
    768885 
    769 /*** 
    770 class PolymerExclVolModel{ 
    771 public: 
    772         // Model parameters 
    773         Parameter rg; 
    774         Parameter scale; 
    775         Parameter m; 
    776         Parameter background; 
    777  
    778         // Constructor 
    779         PolymerExclVolModel(); 
    780  
    781         // Operators to get I(Q) 
    782         double operator()(double q); 
    783         double operator()(double qx, double qy); 
    784         double calculate_ER(); 
    785         double evaluate_rphi(double q, double phi); 
    786 }; 
    787 ***/ 
    788886#endif 
Note: See TracChangeset for help on using the changeset viewer.