Ignore:
Timestamp:
Apr 15, 2010 6:41:29 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:
8426622
Parents:
2339249f
Message:

updated sld parameters according to the changes in NIST lib: missed it in the last commit

Location:
sansmodels/src/sans/models/c_extensions
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/c_extensions/triaxial_ellipsoid.c

    r3c102d4 r13eb1c4  
    1818 */ 
    1919double triaxial_ellipsoid_analytical_1D(TriaxialEllipsoidParameters *pars, double q) { 
    20         double dp[6]; 
     20        double dp[7]; 
    2121 
    2222        // Fill paramater array 
     
    2525        dp[2] = pars->semi_axisB; 
    2626        dp[3] = pars->semi_axisC; 
    27         dp[4] = pars->contrast; 
    28         dp[5] = pars->background; 
     27        dp[4] = pars->sldEll; 
     28        dp[5] = pars->sldSolv; 
     29        dp[6] = pars->background; 
    2930 
    3031        // Call library function to evaluate model 
     
    133134 
    134135        // Multiply by contrast^2 
    135         answer *= pars->contrast*pars->contrast; 
     136        answer *= (pars->sldEll- pars->sldSolv)*(pars->sldEll- pars->sldSolv); 
    136137 
    137138        //normalize by cylinder volume 
  • sansmodels/src/sans/models/c_extensions/triaxial_ellipsoid.h

    r27972c1d r13eb1c4  
    2424    //  [DEFAULT]=semi_axisC=400.0 [A] 
    2525    double semi_axisC; 
    26     /// Contrast [1/A^(2)] 
    27     //  [DEFAULT]=contrast=5.3e-6 [1/A^(2)] 
    28     double contrast; 
     26    /// sldEll [1/A^(2)] 
     27    //  [DEFAULT]=sldEll=1.0e-6 [1/A^(2)] 
     28    double sldEll; 
     29    /// sldSolv [1/A^(2)] 
     30    //  [DEFAULT]=sldSolv=6.3e-6 [1/A^(2)] 
     31    double sldSolv; 
    2932        /// Incoherent Background [1/cm] 0.00 
    3033        //  [DEFAULT]=background=0.0 [1/cm] 
Note: See TracChangeset for help on using the changeset viewer.