Changeset 129


Ignore:
Timestamp:
Jul 25, 2007 5:05:04 PM (15 years ago)
Author:
srkline
Message:

Correcting typos found during initial testing of the modified functions

Location:
sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/GaussSpheres.ipf

    r128 r129  
    8383End 
    8484 
    85 Function fGaussPolySphere(w,x) : FitFunc 
     85Function fGaussPolySphere(w,xx) : FitFunc 
    8686        wave w 
    87         variable x 
     87        variable xx 
    8888         
    8989        Variable scale,rad,pd,sig,rho,rhos,bkg,delrho 
     
    147147         
    148148        summ = 0.0              // initialize integral 
    149         Make/O/N=1 tmp_w 
     149        Make/O/N=1 tmp_yw,tmp_xw 
     150        tmp_xw[0] = xx 
    150151        for(ii=0;ii<nord;ii+=1) 
    151152                // calculate Gauss points on integration interval (r-value for evaluation) 
     
    153154                sphere_temp[1] = zi 
    154155                // calculate sphere scattering 
    155                 SphereForm(sphere_temp,tmp_w,x)         // AAO calculation, one point 
    156                 yy = gauWt[ii] *  Gauss_distr(sig,rad,zi) * tmp_w[0] 
     156                SphereForm(sphere_temp,tmp_yw,tmp_xw)           // AAO calculation, one point 
     157                yy = gauWt[ii] *  Gauss_distr(sig,rad,zi) * tmp_yw[0] 
    157158                yy *= 4*pi/3*zi*zi*zi           //un-normalize by current sphere volume 
    158159                 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LamellarPS_HG.ipf

    r128 r129  
    6464        ModifyTable width(parameters_LamellarPS_HG)=160 
    6565         
    66         Variable/G root:g_LamellarPS_HS 
     66        Variable/G root:g_LamellarPS_HG 
    6767        g_LamellarPS_HG := LamellarPS_HG(coef_LamellarPS_HG, ywave_LamellarPS_HG,xwave_LamellarPS_HG) 
    6868        Display ywave_LamellarPS_HG vs xwave_LamellarPS_HG 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/LogNormalSphere.ipf

    r128 r129  
    8585// 76 points is slower, but reccommended to remove high-q oscillations 
    8686// 
    87 Function fLogNormalPolySphere(w,x): FitFunc 
     87Function fLogNormalPolySphere(w,xx): FitFunc 
    8888        wave w 
    89         variable x 
     89        variable xx 
    9090         
    9191        Variable scale,rad,sig,rho,rhos,bkg,delrho,mu,r3 
     
    153153         
    154154        summ = 0.0              // initialize integral 
    155         Make/O/N=1 tmp_w 
     155        Make/O/N=1 tmp_yw,tmp_xw 
     156        tmp_xw[0] = xx 
    156157        for(ii=0;ii<nord;ii+=1) 
    157158                // calculate Gauss points on integration interval (r-value for evaluation) 
     
    159160                sphere_temp[1] = zi 
    160161                // calculate sphere scattering 
    161                 SphereForm(sphere_temp,tmp_w,x)                 //AAO calculation, one point wave 
    162                 yy = gauWt[ii] *  LogNormal_distr(sig,mu,zi) * tmp_w[0] 
     162                SphereForm(sphere_temp,tmp_yw,tmp_xw)                   //AAO calculation, one point wave 
     163                yy = gauWt[ii] *  LogNormal_distr(sig,mu,zi) * tmp_yw[0] 
    163164                yy *= 4*pi/3*zi*zi*zi           //un-normalize by current sphere volume 
    164165                 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/NewModels_2006/SchulzSpheres_and_Struct.ipf

    r128 r129  
    422422        Duplicate/O xw tmp_sch_SHS_PQ,tmp_sch_SHS_SQ 
    423423        SchulzSpheres(form_sch_SHS,tmp_sch_SHS_PQ,xw) 
    424         StickyHS_Struct(struct_sch_SHS,tmp_sch_SHS_PQ,xw) 
     424        StickyHS_Struct(struct_sch_SHS,tmp_sch_SHS_SQ,xw) 
    425425        yw = tmp_sch_SHS_PQ * tmp_sch_SHS_SQ 
    426426        yw *= w[0] 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Power_Law_model.ipf

    r127 r129  
    1717        Edit parameters_Power_Law, coef_Power_Law 
    1818        Variable/G root:g_Power_Law 
    19         g_Power_Law  := Power_Law_Model(coef_Power_Law, ywave_Power_Law xwave_Power_Law) 
     19        g_Power_Law  := Power_Law_Model(coef_Power_Law, ywave_Power_Law, xwave_Power_Law) 
    2020//      ywave_Power_Law  := Power_Law_Model(coef_Power_Law, xwave_Power_Law) 
    2121        Display ywave_Power_Law vs xwave_Power_Law 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/StackedDiscs.ipf

    r127 r129  
    2929        make/o/t parameters_scyl = {"scale","Disc Radius (A)","Core Thickness (A)","Layer Thickness (A)","Core SLD (A^-2)","Layer SLD (A^-2)","Solvent  SLD(A^-2)","# of Stacking","GSD of d-Spacing","incoh. bkg (cm^-1)"} 
    3030        Edit parameters_scyl,coef_scyl 
     31         
    3132        Variable/G root:g_scyl 
    3233        g_scyl := StackedDiscs(coef_scyl,ywave_scyl,xwave_scyl) 
     
    8485        yw = StackedDiscsX(cw,xw) 
    8586#else 
    86         yw = fStackedDiscs(cw,yw) 
     87        yw = fStackedDiscs(cw,xw) 
    8788#endif 
    8889        return(0) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/UniformEllipsoid.ipf

    r127 r129  
    7272         
    7373#if exists("EllipsoidFormX") 
    74         yw = EllipsoidFormX(cw,yw) 
     74        yw = EllipsoidFormX(cw,xw) 
    7575#else 
    7676        yw = fEllipsoidForm(cw,xw) 
Note: See TracChangeset for help on using the changeset viewer.