Ignore:
Timestamp:
Apr 8, 2010 1:28:21 PM (12 years ago)
Author:
srkline
Message:

Corrections to NSORT and CombineFiles? to work with XML i/o.

CombineFiles? table hook now is properly active only in the upper table.

Some file filtering functions have been streamlined, but are still somewhat redundant, and could be consolidated. These are whenever listing of reduced files is requested (filter out what is known to be something else)

Commented out print statements from XML reader.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf

    r644 r670  
    12901290         
    12911291        list = IndexedFile(catpathName,-1,"????") 
    1292         num=ItemsInList(list,";") 
    1293         //print "num = ",num 
    1294         for(ii=(num-1);ii>=0;ii-=1) 
    1295                 item = StringFromList(ii, list  ,";") 
    1296                 //simply remove all that are not raw data files (SA1 SA2 SA3) 
    1297                 if( !stringmatch(item,"*.SA1*") && !stringmatch(item,"*.SA2*") && !stringmatch(item,"*.SA3*") ) 
    1298                         if( !stringmatch(item,".*") && !stringmatch(item,"*.pxp") && !stringmatch(item,"*.DIV"))                //eliminate mac "hidden" files, pxp, and div files 
    1299                                 newlist += item + ";" 
    1300                         endif 
    1301                 endif 
    1302         endfor 
     1292         
     1293        list = RemoveFromList(ListMatch(list,"*.SA1*",";"), list, ";", 0) 
     1294        list = RemoveFromList(ListMatch(list,"*.SA2*",";"), list, ";", 0) 
     1295        list = RemoveFromList(ListMatch(list,"*.SA3*",";"), list, ";", 0) 
     1296        list = RemoveFromList(ListMatch(list,".*",";"), list, ";", 0) 
     1297        list = RemoveFromList(ListMatch(list,"*.pxp",";"), list, ";", 0) 
     1298        list = RemoveFromList(ListMatch(list,"*.DIV",";"), list, ";", 0) 
     1299        list = RemoveFromList(ListMatch(list,"*.GSP",";"), list, ";", 0) 
     1300        list = RemoveFromList(ListMatch(list,"*.MASK",";"), list, ";", 0) 
     1301 
    13031302        //remove VAX version numbers 
    1304         newList = RemoveVersNumsFromList(newList) 
     1303        list = RemoveVersNumsFromList(List) 
    13051304        //sort 
    1306         newList = SortList(newList,";",0) 
     1305        newList = SortList(List,";",0) 
    13071306 
    13081307        return newlist 
Note: See TracChangeset for help on using the changeset viewer.