Ignore:
Timestamp:
Dec 16, 2009 9:34:13 PM (13 years ago)
Author:
srkline
Message:

Several changes:
1) added /I=1 flag in several places (mostly the invariant) so that the error wave would be interpreted as the standard deviation, not 1/s (Jae_Hie pointed this out)
2) put error checking in ProDiv? to warn if the pixel centers are more than 5 pixels from the expected 65,65 for on-center or 105,65 for the offset (usually run at 20 cm offset)
3) commented out the line in WriteQIS that outputs 2D resolution information to QxQy? data. I just don't think it's correct yet, and the 2D resolution smearing is not ready either.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Common/Packages
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

    r570 r616  
    154154         
    155155        Make/O/D G_coef={100,-100}              //input 
    156         FuncFit Guinier_Fit G_coef iw[0,(nbeg-1)] /X=qw /W=sw /D  
     156        FuncFit Guinier_Fit G_coef iw[0,(nbeg-1)] /I=1 /X=qw /W=sw /D  
    157157        extr_lqi= Guinier_Fit(G_coef,extr_lqq) 
    158158         
     
    162162        Make/O/D P_coef={0,1,-4}                        //input 
    163163        //(set background to zero and hold fixed) 
    164         CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /D  
     164        CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /I=1 /X=qw /W=sw /D  
    165165        extr_hqi=P_coef[0]+P_coef[1]*extr_hqq^P_coef[2] 
    166166         
     
    391391        if(yesGuinier) 
    392392                Make/O/D G_coef={1000,-1000}            //input 
    393                 FuncFit Guinier_Fit G_coef iw[0,(nbeg-1)] /X=qw /W=sw /D  
     393                FuncFit Guinier_Fit G_coef iw[0,(nbeg-1)] /I=1 /X=qw /W=sw /D  
    394394                extr_lqi= Guinier_Fit(G_coef,extr_lqq) 
    395395                 
     
    400400                Make/O/D P_coef={0,1,-1}                        //input 
    401401                //(set background to zero and hold fixed) 
    402                 CurveFit/H="100" Power kwCWave=P_coef  iw[0,(nbeg-1)] /X=qw /W=sw /D  
     402                CurveFit/H="100" Power kwCWave=P_coef  iw[0,(nbeg-1)] /I=1 /X=qw /W=sw /D  
    403403                extr_lqi=P_coef[0]+P_coef[1]*extr_lqq^P_coef[2] 
    404404                //       
     
    461461        if(V_Value == 1) 
    462462                //hold the slope fixed, and the background 
    463                 CurveFit/H="101" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /D  
     463                CurveFit/H="101" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /I=1 /X=qw /W=sw /D  
    464464        else 
    465465                //(set background to zero and hold fixed) 
    466                 CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /D  
     466                CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /I=1 /X=qw /W=sw /D  
    467467        endif 
    468468         
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/LinearizedFits/LinearizedFits_v40.ipf

    r570 r616  
    519519        //if only /R used, residuals are automatically placed on graph 
    520520         
    521         CurveFit line yAxisWave(xcsr(A),xcsr(B)) /X=xAxisWave /W=yWtWave /D   
     521        CurveFit line yAxisWave(xcsr(A),xcsr(B)) /I=1 /X=xAxisWave /W=yWtWave /D   
    522522        //CurveFit line yAxisWave(xcsr(A),xcsr(B)) /X=xAxisWave /W=yWtWave  /R /D   
    523523        ModifyGraph rgb(fit_yAxisWave)=(0,0,0) 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/USANS_SlitSmearing_v40.ipf

    r570 r616  
    290290                P_coef[1] = iw[num-1]/qw[num-1]^P_coef[2] 
    291291                 
    292                 CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /C=constr 
     292                CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /I=1 /W=sw /C=constr 
    293293                extr_hqi=P_coef[0]+P_coef[1]*extr_hqq^P_coef[2] 
    294294         
Note: See TracChangeset for help on using the changeset viewer.