Ignore:
Timestamp:
Aug 4, 2009 1:20:01 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:
8e91f01
Parents:
2cc633b
Message:

some corrections on dips-parameters and adding 2D cal

File:
1 edited

Legend:

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

    r2cc633b r42f193a  
    3434        core_radius     = Parameter(60.0, true); 
    3535        core_radius.set_min(0.0); 
    36         s_thickness  = Parameter(10.0); 
    37         w_thickness   = Parameter(10.0); 
     36        s_thickness  = Parameter(10.0, true); 
     37        s_thickness.set_min(0.0); 
     38        w_thickness   = Parameter(10.0, true); 
     39        w_thickness.set_min(0.0); 
    3840        core_sld   = Parameter(6.4e-6); 
    3941        shell_sld   = Parameter(4.0e-7); 
     
    6062        dp[5] = shell_sld(); 
    6163        dp[6] = n_pairs(); 
    62         dp[7] = background(); 
     64        dp[7] = 0.0; 
    6365 
    6466        // Get the dispersion points for the core radius 
Note: See TracChangeset for help on using the changeset viewer.