Changeset 476

Timestamp:

Feb 17, 2009 4:37:09 PM (14 years ago)

Author:

srkline

Message:

Tried to stop the unloading clash of GlobalFit? and SimpleGlobalFit?. The Simple fit depends on GlobalFit?, so it can't be unloaded.

SumSANSModels now automatically finds the number of coefficients, since the coefficients are always in the root: folder. Saves the users a step.

Added more windows to the analysis list in the package loader

Location:

sans/Dev/trunk

Files:

• NCNR_Help_Files/SANS_Reduction_Help_v5.10.ihf (modified) (previous)
• NCNR_User_Procedures/Analysis/Packages/GlobalFit/GlobalFit2_NCNR_v40.ipf (modified) (1 diff)
• NCNR_User_Procedures/Analysis/Packages/GlobalFit/SimpleGlobalFit_NCNR_v40.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Analysis/Packages/SumModel/SumSANSModels_v40.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Common/NCNR_Package_Loader.ipf (modified) (2 diffs)

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

@@ -1489 +1489 @@
                 DoWindow/K NewGF_GlobalFitMaskingPanel
         endif
-//      Execute/P "DELETEINCLUDE  <Global Fit 2>"
-        SVAR fileVerExt=root:Packages:NIST:SANS_ANA_EXTENSION
-        String fname="GlobalFit2_NCNR"
-        Execute/P "DELETEINCLUDE \""+fname+fileVerExt+"\""
-        Execute/P "COMPILEPROCEDURES "
-        KillDataFolder/Z root:Packages:NewGlobalFit
+        
+        //SRK - if SimpleGlobalFit is open, go ahead and kill the windows, just
+        // don't un-include the procedure files !
+        if(Exists("root:Packages:NewGlobalFit:listW") == 0)             //simple fit waves don't exist
+        
+        //      Execute/P "DELETEINCLUDE  <Global Fit 2>"
+                SVAR fileVerExt=root:Packages:NIST:SANS_ANA_EXTENSION
+                String fname="GlobalFit2_NCNR"
+                Execute/P "DELETEINCLUDE \""+fname+fileVerExt+"\""
+                Execute/P "COMPILEPROCEDURES "
+                KillDataFolder/Z root:Packages:NewGlobalFit
+        
+        endif
 end
 

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

@@ -471 +471 @@
 End
 
-static Function UnloadSimpleGlobalFit()
-        if (WinType("NewGlobalFitPanel") == 7)
+// clean up after itself, don't kill any data folder
+Function UnloadSimpleGlobalFit()
+        if (WinType("SimpGFPanel") == 7)
                 DoWindow/K SimpGFPanel
         endif
@@ -483 +484 @@
         Execute/P "DELETEINCLUDE \""+fname+fileVerExt+"\""
         Execute/P "COMPILEPROCEDURES "
-        KillDataFolder/Z root:Packages:NewGlobalFit
+        KillWaves/Z root:Packages:NewGlobalFit:listW
+        KillWaves/Z root:Packages:NewGlobalFit:selW
+        KillWaves/Z root:Packages:NewGlobalFit:titles
+        
+//      KillDataFolder/Z root:Packages:NewGlobalFit
+        
+        
 end

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/SumModel/SumSANSModels_v40.ipf

@@ -69 +69 @@
         PopupMenu popup2_0,mode=1,popvalue="Pick model 2",value= #"SumModelPopupList()"
         PopupMenu popup1_1,pos={15,98},size={173,20},title="Coef"
-        PopupMenu popup1_1,mode=1,popvalue="Pick coef for model 1",value= #"CoefPopupList()"
+        PopupMenu popup1_1,mode=1,popvalue="Pick coef for model 1",value= #"CoefPopupList()",proc=Func_1_2PopMenuProc
         PopupMenu popup2_1,pos={15,221},size={173,20},title="Coef"
-        PopupMenu popup2_1,mode=1,popvalue="Pick coef for model 2",value= #"CoefPopupList()"
+        PopupMenu popup2_1,mode=1,popvalue="Pick coef for model 2",value= #"CoefPopupList()",proc=Func_1_2PopMenuProc
         GroupBox group1,pos={5,50},size={216,107},title="Function # 1"
         SetVariable setvar1,pos={14,128},size={140,15},title="# of Parameters"
@@ -82 +82 @@
         Button button2,pos={190,23},size={25,20},proc=Sum_HelpButtonProc,title="?"
 EndMacro
+
+Function Func_1_2PopMenuProc(pa) : PopupMenuControl
+        STRUCT WMPopupAction &pa
+
+        switch( pa.eventCode )
+                case 2: // mouse up
+                        Variable popNum = pa.popNum
+                        String popStr = pa.popStr
+                        String name=pa.ctrlName
+                        Variable num=0
+                        
+                        Wave/Z coef=$("root:"+popStr)
+                        if(WaveExists(coef))
+                                num=numpnts(coef)
+                        endif
+                        
+                        
+                        if(cmpstr(name,"popup1_1")==0)          //function #1
+                                NVAR pts1 = root:Packages:NIST:SumModel:gNParMod1
+                                pts1 = num
+                        else
+                                NVAR pts2 = root:Packages:NIST:SumModel:gNParMod2
+                                pts2 = num
+                        endif
+                        
+                        break
+        endswitch
+
+        return 0
+End
 
 // show the available models

sans/Dev/trunk/NCNR_User_Procedures/Common/NCNR_Package_Loader.ipf

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
+#pragma IgorVersion=6.0
+//#pragma IndependentModule=NCNRLoader          //can't seem to get this to work properly...
 
 // load/unload courtesy of Jan Ilavsky
@@ -39 +41 @@
         SVAR gMenuStr1b = root:Packages:NCNRItemStr1b
         
-        String SANSAna_WinList = "wrapperPanel;Procedure_List;Report;"
+        String SANSAna_WinList = "wrapperPanel;Procedure_List;Report;Plot_Manager;A_FitPanel;A_FitWindow;Sum_Model_Panel;"
+        SANSAna_WinList += "NewGlobalFitPanel;SimpGFPanel;Invariant_Panel;invariant_graph;"
         strswitch(itemStr)      // string switch
                 case "Load NCNR Analysis Macros":