Changeset 176

Timestamp:

Oct 1, 2007 4:32:12 PM (15 years ago)

Author:

srkline

Message:

Added the Write Model Data item back to the SANS Models menu, and it now will filter and find the "GFit" generated fits that are deposited in each data folder.

Location:

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00

Files:

• Packages/GlobalFit/GlobalFit2_NCNR.ipf (modified) (1 diff)
• SA_includes_v301.ipf (modified) (1 diff)
• WriteModelData.ipf (modified) (1 diff)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/GlobalFit/GlobalFit2_NCNR.ipf

@@ -581 +581 @@
         endif
         
+        
         Duplicate/D/O MasterCoefs, root:Packages:NewGlobalFit:EpsilonWave
         Wave EP = root:Packages:NewGlobalFit:EpsilonWave
         Variable useEps=1               //SRK, always use epsilon, may want a better way to set these?
+        //Wave/T CoefListWave = root:Packages:NewGlobalFit:NewGF_CoefControlListWave
+        //CoefListWave[][4] = "1e-6"            // a reasonable value for epsilon
         if (FindDimLabel(CoefWave, 1, "Epsilon") == -2)
                 EP = abs(MasterCoefs*1e-4) + 1e-10              //SRK

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/SA_includes_v301.ipf

@@ -22 +22 @@
         "Plot Manager", Show_Plot_Manager()
         "Load Model Functions",Execute/P "INSERTINCLUDE \"SANSModelPicker\"";Execute/P "COMPILEPROCEDURES ";Execute/P "ModelPicker_Panel()"
+        "Write Model Data"
         "-"
         Submenu "Packages"

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/WriteModelData.ipf

@@ -31 +31 @@
                 DF="root:"+S_Value
                 SetDataFolder $DF
-                if(cmpstr(filterStr,"x*")==0) 
+                if(cmpstr(filterStr,"x*")==0)
                         tmplist = WaveList("*_q",";","")
+                        tmpList += WaveList("GFitX_*",";","")
                 else
                         tmplist = WaveList("smea*",";","")
+                        tmpList += WaveList("GFit_*",";","")
                 endif
                 //prepend these list items with the folder
                 num=itemsinlist(tmplist)
-                ii=0
-                do
-                        newList += DF+":"+StringFromList(ii, tmpList, ";") + ";"
-                        ii+=1
-                while(ii<num)
-                
-                //then add to the list
-                list += newList
+                if(num > 0)
+                        ii=0
+                        do
+                                newList += DF+":"+StringFromList(ii, tmpList, ";") + ";"
+                                ii+=1
+                        while(ii<num)
+                        
+                        //then add to the list
+                        list += newList
+                endif
         endif