Changeset 616 for sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/Invariant

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.

File:

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

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

@@ -154 +154 @@
         
         Make/O/D G_coef={100,-100}              //input
-        FuncFit Guinier_Fit G_coef iw[0,(nbeg-1)] /X=qw /W=sw /D 
+        FuncFit Guinier_Fit G_coef iw[0,(nbeg-1)] /I=1 /X=qw /W=sw /D 
         extr_lqi= Guinier_Fit(G_coef,extr_lqq)
         
@@ -162 +162 @@
         Make/O/D P_coef={0,1,-4}                        //input
         //(set background to zero and hold fixed)
-        CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /D 
+        CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /I=1 /X=qw /W=sw /D 
         extr_hqi=P_coef[0]+P_coef[1]*extr_hqq^P_coef[2]
         
@@ -391 +391 @@
         if(yesGuinier)
                 Make/O/D G_coef={1000,-1000}            //input
-                FuncFit Guinier_Fit G_coef iw[0,(nbeg-1)] /X=qw /W=sw /D 
+                FuncFit Guinier_Fit G_coef iw[0,(nbeg-1)] /I=1 /X=qw /W=sw /D 
                 extr_lqi= Guinier_Fit(G_coef,extr_lqq)
                 
@@ -400 +400 @@
                 Make/O/D P_coef={0,1,-1}                        //input
                 //(set background to zero and hold fixed)
-                CurveFit/H="100" Power kwCWave=P_coef  iw[0,(nbeg-1)] /X=qw /W=sw /D 
+                CurveFit/H="100" Power kwCWave=P_coef  iw[0,(nbeg-1)] /I=1 /X=qw /W=sw /D 
                 extr_lqi=P_coef[0]+P_coef[1]*extr_lqq^P_coef[2]
                 //      
@@ -461 +461 @@
         if(V_Value == 1)
                 //hold the slope fixed, and the background
-                CurveFit/H="101" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /D 
+                CurveFit/H="101" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /I=1 /X=qw /W=sw /D 
         else
                 //(set background to zero and hold fixed)
-                CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /D 
+                CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /I=1 /X=qw /W=sw /D 
         endif