Changeset 755


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

Added new model with Yun Liu's TwoYukawa? structure factor. A one-yukawa version is also added, but only in the XOP. Note that the SQ calculation is AAO and NOT threadsafe, unlike all other fitting functions. The SQ calculation has not yet been added to any form factors.

Corrected Fractal_PolyCore to return P*S rather than just P.

Only allow a 2D simulation to be saved inn 2D VAX format if it is RAW counts, not absolute rescaled data. Otherwise the DP values are mangled on conversion to VAX integers. In the future, the data may be "unscaled" if there is an outcry.

Location:
sans/Dev/trunk/NCNR_User_Procedures
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2009/Fractal_PolyCore_v40.ipf

    r714 r755  
    163163        sq += 1 
    164164        //combine and return 
    165         //ans = pq*sq + bkg 
    166         ans = pq +bkg 
     165        ans = pq*sq + bkg 
     166        //ans = pq +bkg 
    167167         
    168168        return (ans) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf

    r746 r755  
    11501150 
    11511151         
     1152        //first, check to be sure that the data is RAW counts before trying to save the VAX format 
     1153        // the easy answer is to abort, but I possibly could unscale the data and get back to integer 
     1154        // counts. 
     1155        NVAR isRAW = root:Packages:NIST:SAS:gRawCounts 
     1156        if(! isRAW) 
     1157                Abort "The simulation must be in RAW counts for it to be saved as RAW VAX format" 
     1158        endif 
     1159         
    11521160        // if default parameters were passed in, use them 
    11531161        // if not, set them to "bad" values so that the user will be prompted later      
Note: See TracChangeset for help on using the changeset viewer.