Changes in / [924a119:8fb2a94] in sasmodels

Files:

• .gitignore (modified) (1 diff)
• .travis.yml (modified) (2 diffs)
• sasmodels/kernel_iq.c (modified) (4 diffs)
• sasmodels/models/lib/gauss150.c (modified) (4 diffs)
• sasmodels/models/lib/gauss20.c (modified) (1 diff)
• sasmodels/models/lib/gauss76.c (modified) (1 diff)

.gitignore

@@ -22 +22 @@
 /example/Fit_*/
 /example/batch_fit.csv
-# Note: changes to gauss20, gauss76 and gauss150 are still tracked since they
-# are part of the repo and required by some models.
 /sasmodels/models/lib/gauss*.c

.travis.yml

@@ -6 +6 @@
     env:
     - PY=2.7
-    - DEPLOY=True
   - os: linux
     env:
@@ -52 +51 @@
   on:
     branch: master
-    condition: $DEPLOY = True
 notifications:
   slack:

sasmodels/kernel_iq.c

@@ -174 +174 @@
 static double
 qac_apply(
-    QACRotation *rotation,
+    QACRotation rotation,
     double qx, double qy,
     double *qa_out, double *qc_out)
 {
-    const double dqc = rotation->R31*qx + rotation->R32*qy;
+    const double dqc = rotation.R31*qx + rotation.R32*qy;
     // Indirect calculation of qab, from qab^2 = |q|^2 - qc^2
     const double dqa = sqrt(-dqc*dqc + qx*qx + qy*qy);
@@ -247 +247 @@
 static double
 qabc_apply(
-    QABCRotation *rotation,
+    QABCRotation rotation,
     double qx, double qy,
     double *qa_out, double *qb_out, double *qc_out)
 {
-    *qa_out = rotation->R11*qx + rotation->R12*qy;
-    *qb_out = rotation->R21*qx + rotation->R22*qy;
-    *qc_out = rotation->R31*qx + rotation->R32*qy;
+    *qa_out = rotation.R11*qx + rotation.R12*qy;
+    *qb_out = rotation.R21*qx + rotation.R22*qy;
+    *qc_out = rotation.R31*qx + rotation.R32*qy;
 }
 
@@ -454 +454 @@
   // theta, phi, dtheta, dphi are defined below in projection to avoid repeated code.
   #define BUILD_ROTATION() qac_rotation(&rotation, theta, phi, dtheta, dphi);
-  #define APPLY_ROTATION() qac_apply(&rotation, qx, qy, &qa, &qc)
+  #define APPLY_ROTATION() qac_apply(rotation, qx, qy, &qa, &qc)
   #define CALL_KERNEL() CALL_IQ_AC(qa, qc, local_values.table)
 
@@ -468 +468 @@
   local_values.table.psi = 0.;
   #define BUILD_ROTATION() qabc_rotation(&rotation, theta, phi, psi, dtheta, dphi, local_values.table.psi)
-  #define APPLY_ROTATION() qabc_apply(&rotation, qx, qy, &qa, &qb, &qc)
+  #define APPLY_ROTATION() qabc_apply(rotation, qx, qy, &qa, &qb, &qc)
   #define CALL_KERNEL() CALL_IQ_ABC(qa, qb, qc, local_values.table)
 #elif defined(CALL_IQ_XY)

sasmodels/models/lib/gauss150.c

@@ -1 @@
-// Created by Andrew Jackson on 4/23/07
-
+/*
+ *  GaussWeights.c
+ *  SANSAnalysis
+ *
+ *  Created by Andrew Jackson on 4/23/07.
+ *  Copyright 2007 __MyCompanyName__. All rights reserved.
+ *
+ */
  #ifdef GAUSS_N
  # undef GAUSS_N
@@ -10 +16 @@
  #define GAUSS_W Gauss150Wt
 
+// Note: using array size 152 so that it is a multiple of 4
 
-// Note: using array size 152 rather than 150 so that it is a multiple of 4.
-// Some OpenCL devices prefer that vectors start and end on nice boundaries.
+// Gaussians
 constant double Gauss150Z[152]={
         -0.9998723404457334,
@@ -164 +170 @@
         0.9993274305065947,
         0.9998723404457334,
-        0., // zero padding is ignored
-        0.  // zero padding is ignored
+        0.,
+        0.
 };
 
@@ -319 +325 @@
         0.0007624720924706,
         0.0003276086705538,
-        0., // zero padding is ignored
-        0.  // zero padding is ignored
+        0.,
+        0.
 };

sasmodels/models/lib/gauss20.c

@@ -1 @@
-// Created by Andrew Jackson on 4/23/07
-
+/*
+ *  GaussWeights.c
+ *  SANSAnalysis
+ *
+ *  Created by Andrew Jackson on 4/23/07.
+ *  Copyright 2007 __MyCompanyName__. All rights reserved.
+ *
+ */
  #ifdef GAUSS_N
  # undef GAUSS_N

sasmodels/models/lib/gauss76.c

@@ -1 @@
-// Created by Andrew Jackson on 4/23/07
-
+/*
+ *  GaussWeights.c
+ *  SANSAnalysis
+ *
+ *  Created by Andrew Jackson on 4/23/07.
+ *  Copyright 2007 __MyCompanyName__. All rights reserved.
+ *
+ */
  #ifdef GAUSS_N
  # undef GAUSS_N