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


Ignore:
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r9248bf7 re9ed2de  
    2222/example/Fit_*/ 
    2323/example/batch_fit.csv 
     24# Note: changes to gauss20, gauss76 and gauss150 are still tracked since they 
     25# are part of the repo and required by some models. 
    2426/sasmodels/models/lib/gauss*.c 

  • .travis.yml

    rce8c388 r2d09df1  
    66    env: 
    77    - PY=2.7 
     8    - DEPLOY=True 
    89  - os: linux 
    910    env: 
    … …  
    5152  on: 
    5253    branch: master 
     54    condition: $DEPLOY = True 
    5355notifications: 
    5456  slack: 

  • sasmodels/kernel_iq.c

    r2a7e20e rec8d4ac  
    174174static double 
    175175qac_apply( 
    176     QACRotation rotation, 
     176    QACRotation *rotation, 
    177177    double qx, double qy, 
    178178    double *qa_out, double *qc_out) 
    179179{ 
    180     const double dqc = rotation.R31*qx + rotation.R32*qy; 
     180    const double dqc = rotation->R31*qx + rotation->R32*qy; 
    181181    // Indirect calculation of qab, from qab^2 = |q|^2 - qc^2 
    182182    const double dqa = sqrt(-dqc*dqc + qx*qx + qy*qy); 
    … …  
    247247static double 
    248248qabc_apply( 
    249     QABCRotation rotation, 
     249    QABCRotation *rotation, 
    250250    double qx, double qy, 
    251251    double *qa_out, double *qb_out, double *qc_out) 
    252252{ 
    253     *qa_out = rotation.R11*qx + rotation.R12*qy; 
    254     *qb_out = rotation.R21*qx + rotation.R22*qy; 
    255     *qc_out = rotation.R31*qx + rotation.R32*qy; 
     253    *qa_out = rotation->R11*qx + rotation->R12*qy; 
     254    *qb_out = rotation->R21*qx + rotation->R22*qy; 
     255    *qc_out = rotation->R31*qx + rotation->R32*qy; 
    256256} 
    257257 
    … …  
    454454  // theta, phi, dtheta, dphi are defined below in projection to avoid repeated code. 
    455455  #define BUILD_ROTATION() qac_rotation(&rotation, theta, phi, dtheta, dphi); 
    456   #define APPLY_ROTATION() qac_apply(rotation, qx, qy, &qa, &qc) 
     456  #define APPLY_ROTATION() qac_apply(&rotation, qx, qy, &qa, &qc) 
    457457  #define CALL_KERNEL() CALL_IQ_AC(qa, qc, local_values.table) 
    458458 
    … …  
    468468  local_values.table.psi = 0.; 
    469469  #define BUILD_ROTATION() qabc_rotation(&rotation, theta, phi, psi, dtheta, dphi, local_values.table.psi) 
    470   #define APPLY_ROTATION() qabc_apply(rotation, qx, qy, &qa, &qb, &qc) 
     470  #define APPLY_ROTATION() qabc_apply(&rotation, qx, qy, &qa, &qb, &qc) 
    471471  #define CALL_KERNEL() CALL_IQ_ABC(qa, qb, qc, local_values.table) 
    472472#elif defined(CALL_IQ_XY) 

  • sasmodels/models/lib/gauss150.c

    r74768cb r99b84ec  
    1 /* 
    2  *  GaussWeights.c 
    3  *  SANSAnalysis 
    4  * 
    5  *  Created by Andrew Jackson on 4/23/07. 
    6  *  Copyright 2007 __MyCompanyName__. All rights reserved. 
    7  * 
    8  */ 
     1// Created by Andrew Jackson on 4/23/07 
     2 
    93 #ifdef GAUSS_N 
    104 # undef GAUSS_N 
    … …  
    1610 #define GAUSS_W Gauss150Wt 
    1711 
    18 // Note: using array size 152 so that it is a multiple of 4 
    1912 
    20 // Gaussians 
     13// Note: using array size 152 rather than 150 so that it is a multiple of 4. 
     14// Some OpenCL devices prefer that vectors start and end on nice boundaries. 
    2115constant double Gauss150Z[152]={ 
    2216        -0.9998723404457334, 
    … …  
    170164        0.9993274305065947, 
    171165        0.9998723404457334, 
    172         0., 
    173         0. 
     166        0., // zero padding is ignored 
     167        0.  // zero padding is ignored 
    174168}; 
    175169 
    … …  
    325319        0.0007624720924706, 
    326320        0.0003276086705538, 
    327         0., 
    328         0. 
     321        0., // zero padding is ignored 
     322        0.  // zero padding is ignored 
    329323}; 

  • sasmodels/models/lib/gauss20.c

    r74768cb r99b84ec  
    1 /* 
    2  *  GaussWeights.c 
    3  *  SANSAnalysis 
    4  * 
    5  *  Created by Andrew Jackson on 4/23/07. 
    6  *  Copyright 2007 __MyCompanyName__. All rights reserved. 
    7  * 
    8  */ 
     1// Created by Andrew Jackson on 4/23/07 
     2 
    93 #ifdef GAUSS_N 
    104 # undef GAUSS_N 

  • sasmodels/models/lib/gauss76.c

    r74768cb r99b84ec  
    1 /* 
    2  *  GaussWeights.c 
    3  *  SANSAnalysis 
    4  * 
    5  *  Created by Andrew Jackson on 4/23/07. 
    6  *  Copyright 2007 __MyCompanyName__. All rights reserved. 
    7  * 
    8  */ 
     1// Created by Andrew Jackson on 4/23/07 
     2 
    93 #ifdef GAUSS_N 
    104 # undef GAUSS_N 
Note: See TracChangeset for help on using the changeset viewer.