Ignore:
Timestamp:
Nov 18, 2008 3:21:34 PM (14 years ago)
Author:
srkline
Message:

Bug fixes for some of the newly added (2008) Analysis model functions. All are tested now and should be correct.

Also included in these changes are a few bug fixes in the package loader and Correct

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/FCC_ParaCrystal_v40.ipf

    r445 r451  
    3333        Make/O/D/n=(num) xwave_FCC_ParaCrystal, ywave_FCC_ParaCrystal 
    3434        xwave_FCC_ParaCrystal =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    35         Make/O/D coef_FCC_ParaCrystal = {1,220,0.06,40,3e-6,0.} 
    36         make/o/t parameters_FCC_ParaCrystal = {"scale","Nearest Neighbor (A)","g","Sphere Radius (A)","Contrast (A-2)", "Background (cm-1)"}     
     35        Make/O/D coef_FCC_ParaCrystal = {1,220,0.06,40,3e-6,6.3e-6,0.0} 
     36        make/o/t parameters_FCC_ParaCrystal = {"scale","Nearest Neighbor (A)","distortion, g","Sphere Radius (A)","SLD sphere (A-2)","SLD solvent (A-2)", "Background (cm-1)"}   
    3737        Edit parameters_FCC_ParaCrystal, coef_FCC_ParaCrystal 
    3838         
     
    7373         
    7474        // Setup parameter table for model function 
    75         Make/O/D smear_coef_FCC_ParaCrystal = {1,220,0.06,40,3e-6,0.} 
    76         make/o/t smear_parameters_FCC_ParaCrystal = {"scale","Nearest Neighbor (A)","g","Sphere Radius (A)","Contrast (A-2)", "Background (cm-1)"} 
     75        Make/O/D smear_coef_FCC_ParaCrystal = {1,220,0.06,40,3e-6,6.3e-6,0.0} 
     76        make/o/t smear_parameters_FCC_ParaCrystal = {"scale","Nearest Neighbor (A)","distortion, g","Sphere Radius (A)","SLD sphere (A-2)","SLD solvent (A-2)", "Background (cm-1)"} 
    7777        Edit smear_parameters_FCC_ParaCrystal,smear_coef_FCC_ParaCrystal                                        //display parameters in a table 
    7878         
     
    131131         
    132132 
    133         Variable scale,Dnn,gg,Rad,contrast,background,yy,latticeScale 
     133        Variable scale,Dnn,gg,Rad,contrast,background,yy,latticeScale,sld,sldSolv 
    134134        scale = w[0] 
    135135        Dnn = w[1] //Nearest neighbor distance A 
    136136        gg = w[2] //Paracrystal distortion factor 
    137137        Rad = w[3] //Sphere radius 
    138         contrast = w[4] //SLD contrast  
    139         background = w[5]  
     138        sld = w[4] 
     139        sldSolv = w[5] 
     140        background = w[6]  
    140141                 
    141 // always calculate for type 2, FCC 
     142        contrast = sld - sldSolv 
    142143         
    143144        latticeScale = 4*(4/3)*pi*(Rad^3)/((Dnn*(2^0.5))^3) 
Note: See TracChangeset for help on using the changeset viewer.