Changeset 888 for sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/LinearizedFits/LinearizedFits_v40.ipf

Timestamp:

Jan 22, 2013 4:34:14 PM (10 years ago)

Author:

srkline

Message:

Changes to utility functions to properly list the raw data from the 10m SANS (SA4)

Added a utility function to patch BS xPos in 10m data files so that they will be recognized as transmission files. ICE is currently not writing out the BS xPos to the file. This is done in batch mode, similar to what was done for the 8m SANS.

Some changes to the simulation code to permit easier scripting.

Additions to SASCALC for the 10m SANS. Dimensions from John. Still need attenuator table and flux.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/LinearizedFits/LinearizedFits_v40.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/LinearizedFits/LinearizedFits_v40.ipf

@@ -763 +763 @@
         String ctrlName
 
-        String list="",newList="",item=""
-        Variable num,ii
-        
-        //check for the path
-        PathInfo catPathName
-        if(V_Flag==0)
-                DoAlert 0, "Data path does not exist - pick the data path from the button on the FIT panel"
-                Return("")
-        Endif
-        
-        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
-        //remove VAX version numbers
-        newList = RemoveVersNumsFromList(newList)
-        //sort
-        newList = SortList(newList,";",0)
-
+        String newList=""
+//      String list="",newList="",item=""
+//      Variable num,ii
+//      
+//      //check for the path
+//      PathInfo catPathName
+//      if(V_Flag==0)
+//              DoAlert 0, "Data path does not exist - pick the data path from the button on the FIT panel"
+//              Return("")
+//      Endif
+//      
+//      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
+//      //remove VAX version numbers
+//      newList = RemoveVersNumsFromList(newList)
+//      //sort
+//      newList = SortList(newList,";",0)
+
+// Jan 2013 -- replaced with a utility function that filters out raw, div, mask, etc.
+        newList = A_ReducedDataFileList("")
+        
         return newlist
 End