Changeset 476 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GlobalFit

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/NCNR_User_Procedures/Analysis/Packages/GlobalFit

Files:

• GlobalFit2_NCNR_v40.ipf (modified) (1 diff)
• SimpleGlobalFit_NCNR_v40.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