Ignore:
Timestamp:
Apr 8, 2010 1:28:21 PM (13 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/WorkFileUtils.ipf

    r668 r670  
    13881388         
    13891389        list = IndexedFile(catpathName,-1,"????") 
    1390         num=ItemsInList(list,";") 
    1391         //print "num = ",num 
    1392         for(ii=(num-1);ii>=0;ii-=1) 
    1393                 item = StringFromList(ii, list  ,";") 
    1394                 //simply remove all that are not raw data files (SA1 SA2 SA3) 
    1395                 if( !stringmatch(item,"*.SA1*") && !stringmatch(item,"*.SA2*") && !stringmatch(item,"*.SA3*") ) 
    1396                         if( !stringmatch(item,".*") && !stringmatch(item,"*.pxp") && !stringmatch(item,"*.DIV"))                //eliminate mac "hidden" files, pxp, and div files 
    1397                                 if(!stringmatch(item,"*.AVE") && !stringmatch(item,"*.ABS")) 
    1398                                         newlist += item + ";" 
    1399                                 endif 
    1400                         endif 
    1401                 endif 
    1402         endfor 
     1390         
     1391        list = RemoveFromList(ListMatch(list,"*.SA1*",";"), list, ";", 0) 
     1392        list = RemoveFromList(ListMatch(list,"*.SA2*",";"), list, ";", 0) 
     1393        list = RemoveFromList(ListMatch(list,"*.SA3*",";"), list, ";", 0) 
     1394        list = RemoveFromList(ListMatch(list,".*",";"), list, ";", 0) 
     1395        list = RemoveFromList(ListMatch(list,"*.pxp",";"), list, ";", 0) 
     1396        list = RemoveFromList(ListMatch(list,"*.DIV",";"), list, ";", 0) 
     1397        list = RemoveFromList(ListMatch(list,"*.GSP",";"), list, ";", 0) 
     1398        list = RemoveFromList(ListMatch(list,"*.MASK",";"), list, ";", 0) 
     1399 
    14031400        //remove VAX version numbers 
    1404         newList = RemoveVersNumsFromList(newList) 
     1401        list = RemoveVersNumsFromList(List) 
    14051402        //sort 
    1406         newList = SortList(newList,";",0) 
     1403        newList = SortList(List,";",0) 
    14071404 
    14081405        return newlist 
Note: See TracChangeset for help on using the changeset viewer.