Changeset 59


Ignore:
Timestamp:
Mar 21, 2007 10:25:39 AM (15 years ago)
Author:
srkline
Message:

PatchFiles? now sorts the list of files, rather than the WinOS-garbled listing
NSORT has changes to Beta-only procedures, changes to avoid wave/varaible name conflicts that have shown up in Igor 6
Includes_v500 is the Beta/no Beta compile switch, left on for now before release

Location:
sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/Includes_v500.ipf

    r41 r59  
    5757// menu will appear in the menubar. 
    5858// 
    59 xMenu "SANSBeta" 
     59Menu "SANSBeta" 
    6060        "FillEMPUsingSelection" 
    6161        "GuessEveryTransFiles" 
  • sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf

    r41 r59  
    15941594///////////////////////////////////////////////////////////// 
    15951595//testing, may speed up NSORT 
    1596 Proc Set3NSORTFiles(low,med,hi,prefix) 
     1596Proc Set3NSORTFiles(low,med,hi,pref) 
    15971597        Variable low=1,med=2,hi=3 
    1598         String prefix="LIPID" 
     1598        String pref="LIPID" 
    15991599         
    16001600        //make strings from the numbers 
     
    16041604         
    16051605        //lowQ menu 
    1606         absStr = prefix+ThreeDigitString(low)+".ABS" 
     1606        absStr = pref+ThreeDigitString(low)+".ABS" 
    16071607        popNum = 1+WhichListItem(absStr,root:myGlobals:NSORT:gDataPopList,";",0) 
    16081608        PopupMenu popup_1,win=NSORT_Panel,mode=(popNum) 
    16091609        //medQ (a different list for the popup) 
    1610         absStr = prefix+ThreeDigitString(med)+".ABS" 
     1610        absStr = pref+ThreeDigitString(med)+".ABS" 
    16111611        popNum = 1+WhichListItem(absStr,root:myGlobals:NSORT:gDataPopList_3,";",0) 
    16121612        PopupMenu popup_2,win=NSORT_Panel,mode=(popNum) 
    16131613        //highQ (same pop list as medQ) 
    16141614        if(hi != 0) 
    1615                 absStr = prefix+ThreeDigitString(hi)+".ABS" 
     1615                absStr = pref+ThreeDigitString(hi)+".ABS" 
    16161616                popNum = 1+WhichListItem(absStr,root:myGlobals:NSORT:gDataPopList_3,";",0) 
    16171617                PopupMenu popup_3,win=NSORT_Panel,mode=(popNum) 
     
    17131713// 
    17141714// make the waves and table for the sets to combine 
    1715         Make/O/N=0 $"root:myGlobals:CombineTable:Low" 
    1716         Make/O/N=0 $"root:myGlobals:CombineTable:Medium" 
    1717         Make/O/N=0 $"root:myGlobals:CombineTable:High" 
     1715        Make/O/N=0 $"root:myGlobals:CombineTable:LowRun" 
     1716        Make/O/N=0 $"root:myGlobals:CombineTable:MediumRun" 
     1717        Make/O/N=0 $"root:myGlobals:CombineTable:HighRun" 
    17181718        Make/O/T/N=0 $"root:myGlobals:CombineTable:Prefix" 
    17191719        Make/O/T/N=0 $"root:myGlobals:CombineTable:SaveName" 
     
    17441744Function MakeTabletoCombine() 
    17451745 
    1746         Wave low = $"root:myGlobals:CombineTable:Low" 
    1747         Wave medium = $"root:myGlobals:CombineTable:Medium" 
    1748         Wave high = $"root:myGlobals:CombineTable:High" 
     1746        Wave low = $"root:myGlobals:CombineTable:LowRun" 
     1747        Wave medium = $"root:myGlobals:CombineTable:MediumRun" 
     1748        Wave high = $"root:myGlobals:CombineTable:HighRun" 
    17491749        Wave/T prefix = $"root:myGlobals:CombineTable:Prefix" 
    17501750        Wave/T saveName = $"root:myGlobals:CombineTable:SaveName" 
     
    18931893        Variable/G useTable=1 
    18941894         
    1895         Variable num=numpnts(low),ii,lowFile,medFile,hiFile 
     1895        Variable num=numpnts(lowRun),ii,lowFile,medFile,hiFile 
    18961896        String prefixStr = "" 
    18971897        Pathinfo catPathName 
     
    19001900        ii=0 
    19011901        do 
    1902                 lowFile = Low[ii] 
    1903                 medFile = Medium[ii] 
    1904                 hiFile = high[ii] 
     1902                lowFile = LowRun[ii] 
     1903                medFile = MediumRun[ii] 
     1904                hiFile = highRun[ii] 
    19051905                prefixStr = prefix[ii] 
    19061906                 
  • sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/PatchFiles.ipf

    r41 r59  
    1818//************************** 
    1919 
    20 //main entry rocedure for displaying the Patch Panel 
     20//main entry procedure for displaying the Patch Panel 
    2121// 
    2222Proc PatchFiles() 
     
    160160        while(ii<num)      //process all items in list 
    161161 
     162        newList = SortList(newList,";",0) 
    162163        Return(newList) 
    163164End 
Note: See TracChangeset for help on using the changeset viewer.