Changeset 710 for sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

Timestamp:

Jul 1, 2010 12:10:31 PM (13 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.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant/Invariant_v40.ipf

@@ -374 +374 @@
         endif
         
-        Variable yesGuinier=0,nume,inv
+        Variable yesGuinier=0,nume,inv,scale
         // do the extrapolation of the correct type
         ControlInfo/W=Invariant_Panel check_0           //the Guinier box
@@ -397 +397 @@
         
         if(yesGuinier)
-                Make/O/D G_coef={1000,-1000}            //input
+//              Make/O/D G_coef={1000,-1000}            //input
+                WaveStats/M=1/Q/R=[0,(nbeg-1)] iw
+                scale = V_avg
+                Make/O/D G_coef={(scale),-1000}         //input -- with a better guess for the overall scale factor, 
                 FuncFit Guinier_Fit G_coef iw[0,(nbeg-1)] /I=1 /X=qw /W=sw /D 
                 extr_lqi= Guinier_Fit(G_coef,extr_lqq)