Ignore:
Timestamp:
Oct 19, 2010 1:16:24 PM (12 years ago)
Author:
srkline
Message:

Adding Yun Liu's 2-Yukawa structure factor to both the library and the XOP. Ideally it would be consolidated to the libStructureFactor files, but there are a lot of files, and labeling them as such seems less confusing.

Currently functions correctly on Mac, still needs to be compiled on Win.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/XOP_Dev/SANSAnalysis/XOP/SANSAnalysis.r

    r592 r756  
    840840                        NT_FP64,                                        /* double precision x */ 
    841841                }, 
     842                "OneYukawaX",                                           /* function name */ 
     843                F_UTIL | F_EXTERNAL,                                    // the one and two-Yukawa are different than other fitting functions 
     844                NT_FP64,                                                                // they are inherently AAO, and due to memory usage, likely can't be threaded. 
     845                {                                                                               // so they are NOT declared threadsafe 
     846                        NT_FP64 + WAVE_TYPE,                    /* double precision wave (coefficient wave) */ 
     847                        NT_FP64 + WAVE_TYPE,                    /* double precision wave (Q wave) */ 
     848                        NT_FP64 + WAVE_TYPE,                    /* double precision wave (SQ wave - returned) */ 
     849                }, 
     850                 
     851                "TwoYukawaX",                                           /* function name */ 
     852                F_UTIL | F_EXTERNAL,                                    // the one and two-Yukawa are different than other fitting functions 
     853                NT_FP64,                                                                // they are inherently AAO, and due to memory usage, likely can't be threaded.           
     854                {                                                                               // so they are NOT declared threadsafe 
     855                        NT_FP64 + WAVE_TYPE,                    /* double precision wave (coefficient wave) */ 
     856                        NT_FP64 + WAVE_TYPE,                    /* double precision wave (Q wave) */ 
     857                        NT_FP64 + WAVE_TYPE,                    /* double precision wave (SQ wave - returned) */ 
     858                }, 
     859         
     860         
    842861 
    843862 
Note: See TracChangeset for help on using the changeset viewer.