Changeset 495 for sans/Dev

Timestamp:

Apr 29, 2009 2:31:07 PM (14 years ago)

Author:

srkline

Message:

Added a procedure file that does the necessary wrapping for GenCurveFit?, since it's not a perfect drop-in replacement for FuncFit?. Required modification of the FitWrapper? to switch to GenCurveFit? as needed.
Switch between regular L-M and GenOp? using a menu item.a (sets a gobal)
Still ridiculously slow to use.
Can't yet be used with global fitting. Would be a real pain to implement. Can't imagine how slow that would be to use...

Bug fixes in PatchFiles? (default button for filter type) and Correct (use tolerance of +/- 0.01 pixel for determining of what is a "mismatch" of the beam centers. Problem cropped up with ICE, but should be fixed anyways)

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Analysis/Packages/GeneticOptimization (added)
• Analysis/Packages/GeneticOptimization/NCNR_GenFitUtils.ipf (added)
• Analysis/Packages/GlobalFit/SimpleGlobalFit_NCNR_v40.ipf (modified) (2 diffs)
• Analysis/Packages/Wrapper_v40.ipf (modified) (9 diffs)
• Analysis/SA_includes_v400.ipf (modified) (2 diffs)
• Reduction/SANS/Correct.ipf (modified) (2 diffs)
• Reduction/SANS/PatchFiles.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GlobalFit/SimpleGlobalFit_NCNR_v40.ipf

@@ -113 +113 @@
         ListBox list0 widths={30,50,80,80}
         
-        Button button_0,pos={344,13},size={100,20},title="Do Fit"
+        Button button_0,pos={344,13},size={100,20},title="Do The Fit"
         Button button_0 proc=SGF_DoFitButtonProc
         Button button_1,pos={369,173},size={50,20},proc=SaveCheckStateButtonProc,title="Save"
         Button button_2,pos={429,173},size={70,20},proc=RestoreCheckStateButtonProc,title="Restore"
+        Button button_3,pos={500,13},size={100,20},proc=SGFitHelpButtonProc,title="Help"
         
         Edit/W=(14,174,348,495)/HOST=# 
@@ -124 +125 @@
         
 EndMacro
+
+//open the Help file for the Simple Global Fit
+Function SGFitHelpButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        DisplayHelpTopic/Z/K=1 "Simple Global Fit"
+                        if(V_flag !=0)
+                                DoAlert 0,"The Simple Global Fit Help file could not be found"
+                        endif
+                        break
+        endswitch
+
+        return 0
+End
+
 
 // save the state of the checkboxes

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

@@ -24 +24 @@
         Variable/G root:Packages:NIST:USANSUseTrap = 0
         Variable/G root:Packages:NIST:USANS_dQv = 0.117
-        
+        Variable/G root:Packages:NIST:gUseGenCurveFit = 0                       //set to 1 to use genetic optimization
+                        
         //Ugly. Put this here to make sure things don't break
         String/G root:Packages:NIST:gXMLLoader_Title
@@ -217 +218 @@
         
         // MOTOFIT/GenFit bits
-        tmp = "GEN_allatoncefitfunc;GEN_fitfunc;GetCheckBoxesState;MOTO_GFFitAllAtOnceTemplate;MOTO_GFFitFuncTemplate;MOTO_NewGF_SetXWaveInList;MOTO_NewGlblFitFunc;MOTO_NewGlblFitFuncAllAtOnce;"
+        tmp = "GEN_allatoncefitfunc;GEN_fitfunc;GetCheckBoxesState;MOTO_GFFitAllAtOnceTemplate;MOTO_GFFitFuncTemplate;MOTO_NewGF_SetXWaveInList;MOTO_NewGlblFitFunc;MOTO_NewGlblFitFuncAllAtOnce;GeneticFit_UnSmearedModel;GeneticFit_SmearedModel;"
         list = RemoveFromList(tmp, list  ,";")
 
@@ -758 +759 @@
         fitYw = NaN
         
-        Variable useRes=0
+        Variable useRes=0,isUSANS=0,val
         if(stringmatch(funcStr, "Smear*"))              // if it's a smeared function, need a struct
                 useRes=1
         endif
-        
+        if(dimsize(resW,1) > 4)
+                isUSANS=1
+        endif
         // do not construct constraints for any of the coefficients that are being held
         // -- this will generate an "unknown error" from the curve fitting
@@ -793 +796 @@
         Variable pt1,pt2,newN,mPt1,mPt2
         String noteStr
-        if(useCursors && (dimsize(resW,1) > 4) )
+        if(useCursors && isUSANS )
                 //where are the cursors, and what is the status of the current matrix?
                 if(pcsr(A) > pcsr(B))
@@ -814 +817 @@
                 Wave trimResW=$(DF+folderStr+"_res"+"t")        //put the trimmed resW in the struct for the fit!
                 Wave fs.resW=trimResW
-
+        endif
+        if(useCursors)
+                //find the points so that genetic optimization can use them
+                if(pcsr(A) > pcsr(B))
+                        pt1 = pcsr(B)
+                        pt2 = pcsr(A)
+                else
+                        pt1 = pcsr(A)
+                        pt2 = pcsr(B)
+                endif
         endif
                 
@@ -821 +833 @@
         Variable/G V_FitQuitReason=0            //0=ok,1=maxiter,2=user stop,3=no chisq decrease
 
-        
+        NVAR useGenCurveFit = root:Packages:NIST:gUseGenCurveFit
 // don't use the auto-destination with no flag, it doesn't appear to work correctly
 // dispatch the fit
@@ -834 +846 @@
         do
 //              Variable t0 = stopMStimer(-2)           // corresponding print is at the end of the do-while loop (outside)
+
+
+                if(useGenCurveFit)
+                
+#if !(exists("GenCurveFit"))
+                        // XOP not available
+                        useGenCurveFit = 0
+                        Abort "Genetic Optimiztion XOP not available. Reverting to normal optimization."        
+#endif
+                        //send everything to a function, to reduce the clutter
+                        // useEps and useConstr are not needed
+                        // pass the structure to get the current waves, including the trimmed USANS matrix
+                        Variable chi,pt
+
+                        chi = DoGenCurveFit(useRes,useCursors,sw,fitYw,fs,funcStr,getHStr(hold),val,lolim,hilim,pt1,pt2)
+                        pt = val
+
+                        break
+                        
+                endif
+                
                 
                 if(useRes && useEps && useCursors && useConstr)         //do it all
@@ -940 +973 @@
         String traces=TraceNameList("", ";", 1 )                //"" as first parameter == look on the target graph
         if(strsearch(traces,"FitYw",0) == -1)
-                AppendToGraph FitYw vs xw
+                if(useGenCurveFit && useCursors)
+                        WAVE trimX = trimX
+                        AppendtoGraph fitYw vs trimX
+                else
+                        AppendToGraph FitYw vs xw
+                endif
         else
                 RemoveFromGraph FitYw
-                AppendToGraph FitYw vs xw
+                if(useGenCurveFit && useCursors)
+                        WAVE trimX = trimX
+                        AppendtoGraph fitYw vs trimX
+                else
+                        AppendToGraph FitYw vs xw
+                endif
         endif
         ModifyGraph lsize(FitYw)=2,rgb(FitYw)=(0,0,0)
@@ -950 +993 @@
         
         // report the results (to the panel?)
+        if(useGenCurveFit)
+                V_chisq = chi
+                V_npnts = pt
+        endif
         print "V_chisq = ",V_chisq
         print cw

sans/Dev/trunk/NCNR_User_Procedures/Analysis/SA_includes_v400.ipf

@@ -16 +16 @@
 #include "PlotUtilsMacro_v40"                   version>=4.00
 #include "PlotManager_v40"                              version>=4.00
+#include "NCNR_GenFitUtils"                     // April 2009, compiles OK if XOP not present
 
 #include "USANS_SlitSmearing_v40"
@@ -39 +40 @@
                 "Determine Invariant",Execute/P "INSERTINCLUDE \"Invariant_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "Make_Invariant_Panel()"
                 "Do Linear Fits",Execute/P "INSERTINCLUDE \"LinearizedFits_v40\"";Execute/P "COMPILEPROCEDURES ";Execute/P "A_OpenFitPanel()"
+                GenOpFlagEnable()+"Genetic Optimization Enabled", Init_GenOp()
+                GenOpFlagDisable()+"Genetic Optimization Disabled", UnSet_GenOp()
         End
         "-"

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Correct.ipf

@@ -895 +895 @@
         noadd_mat = 1           //initialize to 1
         
-        If((xshift != 0) || (yshift != 0))
+        If((abs(xshift) >= 0.01) || (abs(yshift) >= 0.01))                      //APR09 - change tolerance to handle ICE "precision"
                 DoAlert 1,"Do you want to ignore the beam center mismatch?"
                 if(V_flag==1)           //yes -> just go on
@@ -901 +901 @@
                         yshift=0
                 endif
+        else
+                // "mismatch" is simply a python type conversion error
+                xshift=0
+                yshift=0
         endif
         

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/PatchFiles.ipf

@@ -81 +81 @@
         Variable/G root:myGlobals:Patch:gPV19 = 0
         Variable/G root:myGlobals:Patch:gTransCts = 0
-        Variable/G root:myGlobals:Patch:gRadioVal = 0
+        Variable/G root:myGlobals:Patch:gRadioVal = 1
 End
 
@@ -301 +301 @@
         ControlUpdate PatchPopup
         PopupMenu PatchPopup,mode=1
+        ShowHeaderButtonProc("SHButton")
 End