Changeset 762 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

Timestamp:

Oct 27, 2010 6:11:50 PM (12 years ago)

Author:

srkline

Message:

Fixing bugs associated with 2D fitting, making sure that smeared and unsmeared 2D models both fit correctly and report errors to the FitManager?.

Added "_v40" extension to the Raspberry models. These models still need to be added to the Procedure list

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf (modified) (6 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

@@ -794 +794 @@
         fitYw = NaN
         
-        Variable useRes=0,isUSANS=0,val
+        Variable useResol=0,isUSANS=0,val
         if(stringmatch(funcStr, "Smear*"))              // if it's a smeared function, need a struct
-                useRes=1
+                useResol=1
         endif
         if(dimsize(resW,1) > 4)
@@ -912 +912 @@
                         Variable chi,pt
 
-                        chi = DoGenCurveFit(useRes,useCursors,sw,fitYw,fs,funcStr,getHStr(hold),val,lolim,hilim,pt1,pt2)
+                        chi = DoGenCurveFit(useResol,useCursors,sw,fitYw,fs,funcStr,getHStr(hold),val,lolim,hilim,pt1,pt2)
                         pt = val
 
@@ -922 +922 @@
                 // so there are only three conditions to test == 1 + 3 + 3 + 1 = 8 conditions
                 
-                if(useRes && useResiduals && useTextBox)                //do it all
+                if(useResol && useResiduals && useTextBox)              //do it all
                         FuncFit/H=getHStr(hold) /NTHR=0 /TBOX=(tb) $funcStr cw, yw[pt1,pt2] /X=xw /W=sw /I=1 /E=eps /D=fitYw /C=constr /STRC=fs /R /NWOK
                         break
                 endif
                 
-                if(useRes && useResiduals)              //res + resid
+                if(useResol && useResiduals)            //res + resid
                         FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, yw[pt1,pt2] /X=xw /W=sw /I=1 /E=eps /D=fitYw /C=constr /STRC=fs /R /NWOK
                         break
@@ -933 +933 @@
 
                 
-                if(useRes && useTextBox)                //res + text
+                if(useResol && useTextBox)              //res + text
                         FuncFit/H=getHStr(hold) /NTHR=0 /TBOX=(tb) $funcStr cw, yw[pt1,pt2] /X=xw /W=sw /I=1 /E=eps /D=fitYw /C=constr /STRC=fs /NWOK
                         break
                 endif
                 
-                if(useRes)              //res only
+                if(useResol)            //res only
 //                      Print "timing test for Cylinder_PolyRadius---"
 //                      Variable t0 = stopMStimer(-2)
@@ -962 +962 @@
                 
                 
-/////   same as above, but all without useRes (no /STRC flag)
+/////   same as above, but all without useResol (no /STRC flag)
                 if(useResiduals && useTextBox)          //resid+ text
                         FuncFit/H=getHStr(hold) /NTHR=0 /TBOX=(tb) $funcStr cw, yw[pt1,pt2] /X=xw /W=sw /I=1 /E=eps /D=fitYw /C=constr /R /NWOK
@@ -1164 +1164 @@
                 Execute "ExportGizmo Clip"                      //this ALWAYS is a PICT or BMP. Gizmo windows are different...
                 LoadPict/Q/O "Clipboard",tmp_Gizmo
-                Notebook $nb scaling={50, 50}, picture={tmp_Gizmo(0, 0, 800, 600), 0, 1}, text="\r"
-        endif
-        //Notebook Report picture={Table1, 0, 0}, text="\r"
+                Notebook $nb picture={tmp_Gizmo(0, 0, 800, 600), 0, 1}, text="\r"
+        endif
         
         // show the top of the report