Changeset 6e24633 in sasview for sansmodels


Ignore:
Timestamp:
Nov 30, 2011 1:57:40 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:
6a2c931
Parents:
50ac11d
Message:

Re #5 fixing samsmodels compilation on MSVC

File:
1 edited

Legend:

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

    r4628e31 r6e24633  
    133133        double answer; 
    134134        double dp[7]; 
     135  //convert angle degree to radian 
     136  double pi = 4.0*atan(1.0); 
     137  double theta = pars->theta * pi/180.0; 
     138  double phi = pars->phi * pi/180.0; 
    135139 
    136140        dp[0] = pars->scale; 
     
    141145        dp[5] = pars->sld_solv; 
    142146        dp[6] = pars->background; 
    143  
    144         //convert angle degree to radian 
    145         double pi = 4.0*atan(1.0); 
    146         double theta = pars->theta * pi/180.0; 
    147         double phi = pars->phi * pi/180.0; 
    148147 
    149148        //double Pi = 4.0*atan(1.0); 
     
    162161    // The following test should always pass 
    163162    if (fabs(cos_val)>1.0) { 
    164         printf("cyl_ana_2D: Unexpected error: cos(alpha)>1\n"); 
    165163        return 0; 
    166164    } 
Note: See TracChangeset for help on using the changeset viewer.