Changeset 824 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Timestamp:

Jul 20, 2011 9:40:32 AM (12 years ago)

Author:

srkline

Message:

Changed 2-yukawa to have better names for the parameters, a macro to plot g(r), and to return S(q)=1000 if the calculation fails, to be more obvious.

Added a Corrlation matrix function (in Wrapper.ipf), but it's not linked anywhere yet, since I don't know yet how best to display it.

Simplified the function to list .ASC files

Added comments to the polarization panel procedures.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WorkFileUtils.ipf (modified) (2 diffs)

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

@@ -1500 +1500 @@
 //can be lots of other junk present, but this is very fast...
 //
+// -- simplified to do in a single call -- extension must be .ASC
+// - so far, only used in WorkFileMath popups, which require .ASC
+//
 Function/S ASC_FileList()
 
@@ -1511 +1514 @@
                 Return("")
         Endif
-        
-        list = IndexedFile(catpathName,-1,"????")
-        
-        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
-        list = RemoveVersNumsFromList(List)
+
+        list = IndexedFile(catpathName,-1,".ASC")
+
+
+//      list = IndexedFile(catpathName,-1,"????")
+//      
+//      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
+//      list = RemoveVersNumsFromList(List)
         //sort
         newList = SortList(List,";",0)