Changeset 1d115ef in sasview for src/sas/models


Ignore:
Timestamp:
Jul 26, 2015 11:41:57 AM (9 years ago)
Author:
butler
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:
44d20af
Parents:
f008ee2
Message:

fix parameter name - was scale now is FractalExp? as it should be. This
model has two scale parameters: one for the Guinier term and one for the
Lorentz term. The fractal exponent D (used in the Lorentz term) was
cofusingly labeled scale in the gui.

Location:
src/sas/models
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/models/c_extension/c_models/GelFit.cpp

    r79492222 r1d115ef  
    3434    radius = Parameter(104.0,true); 
    3535    radius.set_min(2.0); 
    36     scale = Parameter(2.0,true); 
     36    FractalExp = Parameter(2.0,true); 
    3737    background = Parameter(0.01); 
    3838} 
     
    4343    dp[0] = zeta(); 
    4444    dp[1] = radius(); 
    45     dp[2] = scale(); 
     45    dp[2] = FractalExp(); 
    4646     
    4747    if (dp[2] <= 0) 
  • src/sas/models/include/GelFit.h

    r79492222 r1d115ef  
    3333  Parameter radius; 
    3434 
    35   //  [DEFAULT]=scale= 2 
    36   Parameter scale; 
     35  //  [DEFAULT]=FractalExp= 2 
     36  Parameter FractalExp; 
    3737 
    3838  //  [DEFAULT]=background= 0.01 
Note: See TracChangeset for help on using the changeset viewer.