Ignore:
Timestamp:
Jul 1, 2010 12:10:31 PM (12 years ago)
Author:
srkline
Message:

Added /Z flag to suppress errors when checking status of XML files (NIST_XML)

Added more user functions to exclude from function popup list (PlotUtilsMacro?)

Invariant extrapolation at low q Guinier now takes an inital guess for the scale of the average of the dat points that are being fit. Initial guess of the slope is still -1000.

HFIR utils updated with a better value for the beamstop position when indentifying transmission runs

SASCALC and MultiScatter_MonteCarlo updated to include the wavelength spread as part of the simulation. Also added an empirical estimate of the countrate of (combined) empty quartz cell and blocked beam scattering. Simulation done in 1D - but the results are not shown, simply reported in the command window at this point. More can be done with this in the future, as we figure out how to present this.

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

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

    r709 r710  
    11431143        Variable fileref 
    11441144         
    1145         Open/R fileref as filestr 
     1145        Open/R/Z fileref as filestr 
    11461146        FReadLine fileref,  line 
    11471147        Close fileref 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

    r639 r710  
    374374        endif 
    375375         
    376         Variable yesGuinier=0,nume,inv 
     376        Variable yesGuinier=0,nume,inv,scale 
    377377        // do the extrapolation of the correct type 
    378378        ControlInfo/W=Invariant_Panel check_0           //the Guinier box 
     
    397397         
    398398        if(yesGuinier) 
    399                 Make/O/D G_coef={1000,-1000}            //input 
     399//              Make/O/D G_coef={1000,-1000}            //input 
     400                WaveStats/M=1/Q/R=[0,(nbeg-1)] iw 
     401                scale = V_avg 
     402                Make/O/D G_coef={(scale),-1000}         //input -- with a better guess for the overall scale factor,  
    400403                FuncFit Guinier_Fit G_coef iw[0,(nbeg-1)] /I=1 /X=qw /W=sw /D  
    401404                extr_lqi= Guinier_Fit(G_coef,extr_lqq) 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r698 r710  
    10951095 
    10961096        // SANS Reduction bits 
    1097         tmp = "ASStandardFunction;Ann_1D_Graph;Avg_1D_Graph;BStandardFunction;CStandardFunction;Draw_Plot1D;MyMat2XYZ;NewDirection;SANSModelAAO_MCproto;Monte_SANS_Threaded;Monte_SANS_NotThreaded;Monte_SANS_W1;Monte_SANS_W2;Monte_SANS_W3;Monte_SANS_W4;Monte_SANS;FractionReachingDetector;" 
    1098         list = RemoveFromList(tmp, list  ,";") 
     1097        tmp = "ASStandardFunction;Ann_1D_Graph;Avg_1D_Graph;BStandardFunction;CStandardFunction;Draw_Plot1D;MyMat2XYZ;" 
     1098        list = RemoveFromList(tmp, list  ,";") 
     1099        tmp = "NewDirection;SANSModelAAO_MCproto;Monte_SANS_Threaded;Monte_SANS_NotThreaded;Monte_SANS_W1;Monte_SANS_W2;Monte_SANS_W3;Monte_SANS_W4;Monte_SANS;FractionReachingDetector;TwoLevel_EC;SmearedTwoLevel_EC;" 
     1100        list = RemoveFromList(tmp, list  ,";") 
     1101 
    10991102 
    11001103        // USANS Reduction bits 
Note: See TracChangeset for help on using the changeset viewer.