Changeset 9188cc1 in sasview for sansmodels/src/sans/models/c_models


Ignore:
Timestamp:
Aug 4, 2009 6:29:56 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:
8344c50
Parents:
8dc0b746
Message:

corrected bkg values for polydispersity cal and add doc

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

Legend:

Unmodified
Added
Removed

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

    r3d25331f r9188cc1  
    3131 
    3232BinaryHSModel :: BinaryHSModel() { 
    33          
     33 
    3434        l_radius     = Parameter(160.0, true); 
    3535        l_radius.set_min(0.0); 
    … …  
    6262        dp[5] = ss_sld(); 
    6363        dp[6] = solvent_sld(); 
    64         dp[7] = background(); 
    65          
     64        dp[7] = 0.0; 
     65 
    6666 
    6767        // Get the dispersion points for the large radius 
    … …  
    8080        for(int i=0; i< (int)weights_l_radius.size(); i++) { 
    8181                dp[0] = weights_l_radius[i].value; 
    82                  
     82 
    8383                // Loop over small radius weight points 
    8484                for(int j=0; j< (int)weights_s_radius.size(); j++) { 

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

    r2c4b289 r9188cc1  
    3131 
    3232BinaryHSPSF11Model :: BinaryHSPSF11Model() { 
    33          
     33 
    3434        l_radius     = Parameter(160.0, true); 
    3535        l_radius.set_min(0.0); 
    … …  
    6262        dp[5] = ss_sld(); 
    6363        dp[6] = solvent_sld(); 
    64         dp[7] = background(); 
    65          
     64        dp[7] = 0.0; 
     65 
    6666 
    6767        // Get the dispersion points for the large radius 
    … …  
    8080        for(int i=0; i< (int)weights_l_radius.size(); i++) { 
    8181                dp[0] = weights_l_radius[i].value; 
    82                  
     82 
    8383                // Loop over small radius weight points 
    8484                for(int j=0; j< (int)weights_s_radius.size(); j++) { 

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

    r27fea3f r9188cc1  
    6060        dp[3] = length(); 
    6161        dp[4] = contrast(); 
    62         dp[5] = background(); 
     62        dp[5] = 0.0; 
    6363 
    6464        // Get the dispersion points for the core radius 
    … …  
    117117        dp.length     = length(); 
    118118        dp.contrast   = contrast(); 
    119         dp.background = background(); 
     119        dp.background = 0.0; 
    120120        dp.axis_theta = axis_theta(); 
    121121        dp.axis_phi   = axis_phi(); 

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

    r5068697 r9188cc1  
    1919 * 
    2020 *      TODO: refactor so that we pull in the old sansmodels.c_extensions 
    21  *      TODO: add 2d  
     21 *      TODO: add 2d 
    2222 */ 
    2323 
    … …  
    7171        dp[7] = nlayers(); 
    7272        dp[8] = spacing(); 
    73         dp[9] = background(); 
     73        dp[9] = 0.0; 
    7474 
    7575        // Get the dispersion points for the length 
    … …  
    129129        dp.nlayers        = nlayers(); 
    130130        dp.spacing    = spacing(); 
    131         dp.background = background(); 
     131        dp.background = 0.0; 
    132132        dp.axis_theta = axis_theta(); 
    133133        dp.axis_phi   = axis_phi(); 

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

    r5068697 r9188cc1  
    6262        dp[3] = semi_axisC(); 
    6363        dp[4] = contrast(); 
    64         dp[5] = background(); 
     64        dp[5] = 0.0; 
    6565 
    6666        // Get the dispersion points for the semi axis A 

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

    r42f193a r9188cc1  
    5757        dp[3] = core_sld(); 
    5858        dp[4] = shell_sld(); 
    59         dp[5] = background(); 
     59        dp[5] = 0.0; 
    6060 
    6161 
Note: See TracChangeset for help on using the changeset viewer.