Changeset 176


Ignore:
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:
3 edited

Legend:

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

    r174 r176  
    581581        endif 
    582582         
     583         
    583584        Duplicate/D/O MasterCoefs, root:Packages:NewGlobalFit:EpsilonWave 
    584585        Wave EP = root:Packages:NewGlobalFit:EpsilonWave 
    585586        Variable useEps=1               //SRK, always use epsilon, may want a better way to set these? 
     587        //Wave/T CoefListWave = root:Packages:NewGlobalFit:NewGF_CoefControlListWave 
     588        //CoefListWave[][4] = "1e-6"            // a reasonable value for epsilon 
    586589        if (FindDimLabel(CoefWave, 1, "Epsilon") == -2) 
    587590                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

    r172 r176  
    2222        "Plot Manager", Show_Plot_Manager() 
    2323        "Load Model Functions",Execute/P "INSERTINCLUDE \"SANSModelPicker\"";Execute/P "COMPILEPROCEDURES ";Execute/P "ModelPicker_Panel()" 
     24        "Write Model Data" 
    2425        "-" 
    2526        Submenu "Packages" 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/WriteModelData.ipf

    r170 r176  
    3131                DF="root:"+S_Value 
    3232                SetDataFolder $DF 
    33                 if(cmpstr(filterStr,"x*")==0)  
     33                if(cmpstr(filterStr,"x*")==0) 
    3434                        tmplist = WaveList("*_q",";","") 
     35                        tmpList += WaveList("GFitX_*",";","") 
    3536                else 
    3637                        tmplist = WaveList("smea*",";","") 
     38                        tmpList += WaveList("GFit_*",";","") 
    3739                endif 
    3840                //prepend these list items with the folder 
    3941                num=itemsinlist(tmplist) 
    40                 ii=0 
    41                 do 
    42                         newList += DF+":"+StringFromList(ii, tmpList, ";") + ";" 
    43                         ii+=1 
    44                 while(ii<num) 
    45                  
    46                 //then add to the list 
    47                 list += newList 
     42                if(num > 0) 
     43                        ii=0 
     44                        do 
     45                                newList += DF+":"+StringFromList(ii, tmpList, ";") + ";" 
     46                                ii+=1 
     47                        while(ii<num) 
     48                         
     49                        //then add to the list 
     50                        list += newList 
     51                endif 
    4852        endif 
    4953         
Note: See TracChangeset for help on using the changeset viewer.