Changeset 258

Timestamp:

Feb 12, 2008 4:37:32 PM (15 years ago)

Author:

srkline

Message:

changes to method for fitting slope as data is loaded - added constraints and initial guess.

File:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/USANS_SlitSmearing_v40.ipf (modified) (4 diffs)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/USANS_SlitSmearing_v40.ipf

@@ -66 +66 @@
         String baseStr
         
-        NVAR USANS_m,USANS_slope_numpnts
+//      NVAR USANS_m,USANS_slope_numpnts
+        NVAR USANS_m = $("root:"+baseStr+":USANS_m")
+        NVAR USANS_slope_numpnts = $("root:"+baseStr+":USANS_slope_numpnts")
+
         
 //      Variable slope=-4
@@ -108 +111 @@
         Variable nend
         
-        NVAR USANS_m
+//      NVAR USANS_m
+        NVAR USANS_m = $("root:"+baseStr+":USANS_m")
         
         Wave iw = $(basestr+"_i")
@@ -144 +148 @@
         
                 Make/O/D P_coef={0,1,-4}                        //input
-        //      Make/O/T Constr={"K2<0","K2 > -20"}
+                Make/O/T Constr={"K2<0","K2 > -8"}
                 //(set background to zero and hold fixed)
-                CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw 
+                // initial guess 
+                P_coef[1] = iw[num-1]/qw[num-1]^P_coef[2]
+                
+                CurveFit/H="100" Power kwCWave=P_coef  iw[(num-1-nend),(num-1)] /X=qw /W=sw /C=constr
                 extr_hqi=P_coef[0]+P_coef[1]*extr_hqq^P_coef[2]
         
@@ -164 +171 @@
         
         SVAR basestr =  root:Packages:NIST:USANS_basestr
-        NVAR USANS_m, USANS_slope_numpnts
+        
+        NVAR USANS_m = $("root:"+baseStr+":USANS_m")
+        NVAR USANS_slope_numpnts = $("root:"+baseStr+":USANS_slope_numpnts")
         
         strswitch (ctrlName)