Changeset e161fac in sasview for sansmodels/src/sans/models

Timestamp:

Nov 30, 2011 2:30:43 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:

890ac7f1

Parents:

6a2c931

Message:

Re #5 fixing samsmodels compilation on MSVC

File:

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

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

@@ -5 +5 @@
 #include "libSphere.h"
 #include <math.h>
+#include <stdio.h>
 
 
@@ -67 +68 @@
         double aa, Da, qDa_2, latticeScale, Zq, Fkq, Fkq_2;
 
-        double dp[5];
+  //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 psi = pars->psi * pi/180.0;
+
+  double dp[5];
         dp[0] = 1.0;
         dp[1] = pars->radius;
@@ -73 +80 @@
         dp[3] = pars->sldSolv;
         dp[4] = 0.0;
-
-        //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 psi = pars->psi * pi/180.0;
 
         aa = pars->dnn;