Changeset 59 for sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf

Timestamp:

Mar 21, 2007 10:25:39 AM (16 years ago)

Author:

srkline

Message:

PatchFiles? now sorts the list of files, rather than the WinOS-garbled listing
NSORT has changes to Beta-only procedures, changes to avoid wave/varaible name conflicts that have shown up in Igor 6
Includes_v500 is the Beta/no Beta compile switch, left on for now before release

File:

• sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf (modified) (6 diffs)

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf

@@ -1594 +1594 @@
 /////////////////////////////////////////////////////////////
 //testing, may speed up NSORT
-Proc Set3NSORTFiles(low,med,hi,prefix)
+Proc Set3NSORTFiles(low,med,hi,pref)
         Variable low=1,med=2,hi=3
-        String prefix="LIPID"
+        String pref="LIPID"
         
         //make strings from the numbers
@@ -1604 +1604 @@
         
         //lowQ menu
-        absStr = prefix+ThreeDigitString(low)+".ABS"
+        absStr = pref+ThreeDigitString(low)+".ABS"
         popNum = 1+WhichListItem(absStr,root:myGlobals:NSORT:gDataPopList,";",0)
         PopupMenu popup_1,win=NSORT_Panel,mode=(popNum)
         //medQ (a different list for the popup)
-        absStr = prefix+ThreeDigitString(med)+".ABS"
+        absStr = pref+ThreeDigitString(med)+".ABS"
         popNum = 1+WhichListItem(absStr,root:myGlobals:NSORT:gDataPopList_3,";",0)
         PopupMenu popup_2,win=NSORT_Panel,mode=(popNum)
         //highQ (same pop list as medQ)
         if(hi != 0)
-                absStr = prefix+ThreeDigitString(hi)+".ABS"
+                absStr = pref+ThreeDigitString(hi)+".ABS"
                 popNum = 1+WhichListItem(absStr,root:myGlobals:NSORT:gDataPopList_3,";",0)
                 PopupMenu popup_3,win=NSORT_Panel,mode=(popNum)
@@ -1713 +1713 @@
 //
 // make the waves and table for the sets to combine
-        Make/O/N=0 $"root:myGlobals:CombineTable:Low"
-        Make/O/N=0 $"root:myGlobals:CombineTable:Medium"
-        Make/O/N=0 $"root:myGlobals:CombineTable:High"
+        Make/O/N=0 $"root:myGlobals:CombineTable:LowRun"
+        Make/O/N=0 $"root:myGlobals:CombineTable:MediumRun"
+        Make/O/N=0 $"root:myGlobals:CombineTable:HighRun"
         Make/O/T/N=0 $"root:myGlobals:CombineTable:Prefix"
         Make/O/T/N=0 $"root:myGlobals:CombineTable:SaveName"
@@ -1744 +1744 @@
 Function MakeTabletoCombine()
 
-        Wave low = $"root:myGlobals:CombineTable:Low"
-        Wave medium = $"root:myGlobals:CombineTable:Medium"
-        Wave high = $"root:myGlobals:CombineTable:High"
+        Wave low = $"root:myGlobals:CombineTable:LowRun"
+        Wave medium = $"root:myGlobals:CombineTable:MediumRun"
+        Wave high = $"root:myGlobals:CombineTable:HighRun"
         Wave/T prefix = $"root:myGlobals:CombineTable:Prefix"
         Wave/T saveName = $"root:myGlobals:CombineTable:SaveName"
@@ -1893 +1893 @@
         Variable/G useTable=1
         
-        Variable num=numpnts(low),ii,lowFile,medFile,hiFile
+        Variable num=numpnts(lowRun),ii,lowFile,medFile,hiFile
         String prefixStr = ""
         Pathinfo catPathName
@@ -1900 +1900 @@
         ii=0
         do
-                lowFile = Low[ii]
-                medFile = Medium[ii]
-                hiFile = high[ii]
+                lowFile = LowRun[ii]
+                medFile = MediumRun[ii]
+                hiFile = highRun[ii]
                 prefixStr = prefix[ii]