Changeset 189


Ignore:
Timestamp:
Nov 1, 2007 10:11:55 AM (15 years ago)
Author:
srkline
Message:

Added correct #includes for structure alignment

Location:
sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/lib/libFunc2D.h

    r112 r189  
    88 */ 
    99 
     10 
     11#include "XOPStructureAlignmentTwoByte.h" 
    1012 
    1113/** Structure definition for cylinder parameters  
     
    3638} CylinderParameters, *CylinderParametersPtr; 
    3739 
     40#include "XOPStructureAlignmentReset.h" 
    3841 
    3942 
     
    4447double cylinder_analytical_2D(CylinderParametersPtr pars, double q, double phi); 
    4548 
     49 
     50#include "XOPStructureAlignmentTwoByte.h" 
    4651 
    4752/** Structure definition for cylinder parameters  
     
    8893} SmearCylinderParameters, *SmearCylinderParametersPtr; 
    8994 
    90  
     95#include "XOPStructureAlignmentReset.h" 
    9196 
    9297/// 1D scattering function 
  • sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/lib/libSANSAnalysis.h

    r112 r189  
    107107double FourLevel(double dp[], double q); 
    108108 
     109// since the XOP and the library are separate chunks of compiled code 
     110// it is imperative to set ALL the structure alignments to be two-byte 
     111// rather than leave it to the whim of the compiler 
     112#include "XOPStructureAlignmentTwoByte.h" 
    109113 
    110114typedef struct { 
     
    131135} SmearCylinderParameters; 
    132136 
     137#include "XOPStructureAlignmentReset.h" 
     138 
    133139/// 1D scattering function 
    134140double cylinder_analytical_1D(CylinderParameters *pars, double q); 
Note: See TracChangeset for help on using the changeset viewer.