Ignore:
Timestamp:
Nov 21, 2011 4:52:25 PM (13 years ago)
Author:
Mathieu Doucet <doucetm@…>
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:
1810613
Parents:
afea8fe
Message:

Re #4 Fixed warnings

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/sans/models/libigor/libSphere.c

    r3a084629 r34c2649  
    653653} 
    654654 
     655/* 
    655656static double 
    656657LogNormal_distr(double sig, double mu, double pt) 
     
    672673        return(retval); 
    673674} 
     675*/ 
    674676 
    675677// scattering from a core shell sphere with a (Schulz) polydisperse core and constant ratio (shell thickness)/(core radius) 
     
    12201222} 
    12211223 
     1224/* 
    12221225static double 
    12231226SchulzPoint(double x, double avg, double zz) { 
     
    12451248    return -tmp+log(2.5066282746310005*ser/x); 
    12461249} 
     1250*/ 
    12471251 
    12481252double 
     
    12621266        // variables are: 
    12631267        //[0] scale factor 
    1264         //[1] radius of core [] 
    1265         //[2] SLD of the core   [-2] 
    1266         //[3] thickness of the shell    [] 
     1268        //[1] radius of core [ï¿œ] 
     1269        //[2] SLD of the core   [ï¿œ-2] 
     1270        //[3] thickness of the shell    [ï¿œ] 
    12671271        //[4] SLD of the shell 
    12681272        //[5] SLD of the solvent 
     
    13051309        f += vol*bes*contr; 
    13061310         
    1307         // normalize to particle volume and rescale from [-1] to [cm-1] 
     1311        // normalize to particle volume and rescale from [ï¿œ-1] to [cm-1] 
    13081312        f2 = f*f/vol*1.0e8; 
    13091313         
     
    13211325        // variables are: 
    13221326        //[0] scale factor 
    1323         //[1] radius of core [] 
    1324         //[2] SLD of the core   [-2] 
    1325         //[3] thickness of shell 1 [] 
     1327        //[1] radius of core [ï¿œ] 
     1328        //[2] SLD of the core   [ï¿œ-2] 
     1329        //[3] thickness of shell 1 [ï¿œ] 
    13261330        //[4] SLD of shell 1 
    1327         //[5] thickness of shell 2 [] 
     1331        //[5] thickness of shell 2 [ï¿œ] 
    13281332        //[6] SLD of shell 2 
    13291333        //[7] SLD of the solvent 
     
    13791383         
    13801384                 
    1381         // normalize to particle volume and rescale from [-1] to [cm-1] 
     1385        // normalize to particle volume and rescale from [ï¿œ-1] to [cm-1] 
    13821386        f2 = f*f/vol*1.0e8; 
    13831387         
     
    13951399        // variables are: 
    13961400        //[0] scale factor 
    1397         //[1] radius of core [] 
    1398         //[2] SLD of the core   [-2] 
    1399         //[3] thickness of shell 1 [] 
     1401        //[1] radius of core [ï¿œ] 
     1402        //[2] SLD of the core   [ï¿œ-2] 
     1403        //[3] thickness of shell 1 [ï¿œ] 
    14001404        //[4] SLD of shell 1 
    1401         //[5] thickness of shell 2 [] 
     1405        //[5] thickness of shell 2 [ï¿œ] 
    14021406        //[6] SLD of shell 2 
    14031407        //[7] thickness of shell 3 
     
    14671471        f += vol*bes*contr; 
    14681472                 
    1469         // normalize to particle volume and rescale from [-1] to [cm-1] 
     1473        // normalize to particle volume and rescale from [ï¿œ-1] to [cm-1] 
    14701474        f2 = f*f/vol*1.0e8; 
    14711475         
     
    14831487        // variables are: 
    14841488        //[0] scale factor 
    1485         //[1] radius of core [] 
    1486         //[2] SLD of the core   [-2] 
    1487         //[3] thickness of shell 1 [] 
     1489        //[1] radius of core [ï¿œ] 
     1490        //[2] SLD of the core   [ï¿œ-2] 
     1491        //[3] thickness of shell 1 [ï¿œ] 
    14881492        //[4] SLD of shell 1 
    1489         //[5] thickness of shell 2 [] 
     1493        //[5] thickness of shell 2 [ï¿œ] 
    14901494        //[6] SLD of shell 2 
    14911495        //[7] thickness of shell 3 
     
    15701574         
    15711575                 
    1572         // normalize to particle volume and rescale from [-1] to [cm-1] 
     1576        // normalize to particle volume and rescale from [ï¿œ-1] to [cm-1] 
    15731577        f2 = f*f/vol*1.0e8; 
    15741578         
     
    19972001        bes = 3.0*(sin(x*radius)-x*radius*cos(x*radius))/(x*x*x)/(radius*radius*radius); 
    19982002        vol = 4.0*pi/3.0*radius*radius*radius; 
    1999         f = vol*bes*delrho      ;       // [=]  
     2003        f = vol*bes*delrho      ;       // [=] ï¿œ 
    20002004        // normalize to single particle volume, convert to 1/cm 
    20012005        f2 = f * f / vol * 1.0e8;               // [=] 1/cm 
Note: See TracChangeset for help on using the changeset viewer.