Changeset 6e24633 in sasview

Timestamp:

Nov 30, 2011 1:57:40 PM (12 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:

• sansmodels/src/sans/models/c_extensions/barbell.c (modified) (3 diffs)

sansmodels/src/sans/models/c_extensions/barbell.c

@@ -133 +133 @@
         double answer;
         double dp[7];
+  //convert angle degree to radian
+  double pi = 4.0*atan(1.0);
+  double theta = pars->theta * pi/180.0;
+  double phi = pars->phi * pi/180.0;
 
         dp[0] = pars->scale;
@@ -141 +145 @@
         dp[5] = pars->sld_solv;
         dp[6] = pars->background;
-
-        //convert angle degree to radian
-        double pi = 4.0*atan(1.0);
-        double theta = pars->theta * pi/180.0;
-        double phi = pars->phi * pi/180.0;
 
         //double Pi = 4.0*atan(1.0);
@@ -162 +161 @@
     // The following test should always pass
     if (fabs(cos_val)>1.0) {
-        printf("cyl_ana_2D: Unexpected error: cos(alpha)>1\n");
         return 0;
     }