Ignore:
Timestamp:
Jun 29, 2009 1:51:03 PM (14 years ago)
Author:
srkline
Message:

Fixed bugs introduced in r515 concerning the back-compatibility of the kw=val strings for the
model functions. Now should work correctly when no models are loaded.

Changed integration limits on paracrystal models

Location:
sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008
Files:
2 edited

Legend:

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

    r510 r516  
    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,6.3e-6,0.0} 
     35        Make/O/D coef_FCC_ParaCrystal = {1,220,0.05,40,3e-6,6.3e-6,0.0} 
    3636        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 
     
    7373         
    7474        // Setup parameter table for model function 
    75         Make/O/D smear_coef_FCC_ParaCrystal = {1,220,0.06,40,3e-6,6.3e-6,0.0} 
     75        Make/O/D smear_coef_FCC_ParaCrystal = {1,220,0.05,40,3e-6,6.3e-6,0.0} 
    7676        make/o/t smear_param_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_param_FCC_ParaCrystal,smear_coef_FCC_ParaCrystal                                     //display parameters in a table 
     
    108108#if exists("FCC_ParaCrystalX") 
    109109        yw = FCC_ParaCrystalX(cw,xw) 
     110 
     111//// to return just Z(q), undo the form factor calculation 
     112//      Variable latticeScale 
     113//      latticeScale = 4*(4/3)*pi*(cw[3]^3)/((cw[1]*(2^0.5))^3)  
     114//       
     115//      yw /= SphereForm_FCC(cw[3],cw[4]-cw[5],xw)*latticeScale 
     116////     
    110117#else 
    111118        yw = fFCC_ParaCrystal(cw,xw) 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2008/SC_ParaCrystal_v40.ipf

    r515 r516  
    126126        Variable integral,loLim,upLim 
    127127        loLim = 0 
    128         upLim = 2*Pi 
     128        upLim = Pi/2 
    129129         
    130130        Variable/G root:gDumY=0         //root:gDumX=0 
     
    169169        // 
    170170        loLim = 0 
    171         upLim = Pi 
     171        upLim = Pi/2 
    172172 
    173173        NVAR/Z nord=root:gNordSC 
     
    213213         
    214214        retVal = temp2*SCeval(xx,yy,temp3,temp4,temp5) 
    215         retVal /=4*Pi 
     215        retVal *= 2/pi 
    216216         
    217217        return(retVal) 
Note: See TracChangeset for help on using the changeset viewer.