Changeset 670 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf

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:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf

@@ -1290 +1290 @@
         
         list = IndexedFile(catpathName,-1,"????")
-        num=ItemsInList(list,";")
-        //print "num = ",num
-        for(ii=(num-1);ii>=0;ii-=1)
-                item = StringFromList(ii, list  ,";")
-                //simply remove all that are not raw data files (SA1 SA2 SA3)
-                if( !stringmatch(item,"*.SA1*") && !stringmatch(item,"*.SA2*") && !stringmatch(item,"*.SA3*") )
-                        if( !stringmatch(item,".*") && !stringmatch(item,"*.pxp") && !stringmatch(item,"*.DIV"))                //eliminate mac "hidden" files, pxp, and div files
-                                newlist += item + ";"
-                        endif
-                endif
-        endfor
+        
+        list = RemoveFromList(ListMatch(list,"*.SA1*",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.SA2*",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.SA3*",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,".*",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.pxp",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.DIV",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.GSP",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.MASK",";"), list, ";", 0)
+
         //remove VAX version numbers
-        newList = RemoveVersNumsFromList(newList)
+        list = RemoveVersNumsFromList(List)
         //sort
-        newList = SortList(newList,";",0)
+        newList = SortList(List,";",0)
 
         return newlist