Changeset 715 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf

Timestamp:

Jul 6, 2010 5:17:53 PM (13 years ago)

Author:

ajj

Message:

Various ANSTO related fixes.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf (modified) (5 diffs)

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

@@ -1457 +1457 @@
         
         //lowQ menu
-        absStr = pref+ThreeDigitString(low)+ext
+        absStr = pref+RunDigitString(low)+ext
         popNum = WhichListItem(absStr,lowQPopStr,";",0)
         if(popNum == -1)
@@ -1466 +1466 @@
         
         //medQ (a different list for the popup)
-        absStr = pref+ThreeDigitString(med)+ext
+        absStr = pref+RunDigitString(med)+ext
         popNum = WhichListItem(absStr,medHiQPopStr,";",0)
         if(popNum == -1)
@@ -1477 +1477 @@
         //highQ (same pop list as medQ)
         if(hi != 0)
-                absStr = pref+ThreeDigitString(hi)+ext
+                absStr = pref+RunDigitString(hi)+ext
                 popNum = WhichListItem(absStr,medHiQPopStr,";",0)
                 if(popNum == -1)
@@ -1487 +1487 @@
                 PopupMenu popup_3,win=NSORT_Panel,mode=(1)
         endif
-End
-
-//make a three character string of the run number
-Function/S ThreeDigitString(num)
-        Variable num
-        
-        String numStr=""
-        if(num<10)
-                numStr = "00"+num2str(num)
-        else
-                if(num<100)
-                        numStr = "0"+num2str(num)
-                else
-                        numStr = num2str(num)
-                Endif
-        Endif
-        //Print "numstr = ",numstr
-        return(numstr)
 End
 
@@ -1864 +1846 @@
 end
 
-//given a filename of a SANS data filename of the form
-//TTTTTnnn.SAn_TTT_Txxx
-//returns the prefix "TTTTT" as some number of characters
-//returns "" as an invalid file prefix
-//
-// NCNR-specifc, does not really belong here - but it's a beta procedure anyhow...
-//
-Function/S GetPrefixStrFromFile(item)
-        String item
-        String invalid = ""     //"" is not a valid run prefix, since it's text
-        Variable num=-1
-        
-        //find the "dot"
-        String runStr=""
-        Variable pos = strsearch(item,".",0)
-        if(pos == -1)
-                //"dot" not found
-                return (invalid)
-        else
-                //found, skip the three characters preceeding it
-                if (pos <=3)
-                        //not enough characters
-                        return (invalid)
-                else
-                        runStr = item[0,pos-4]
-                        return (runStr)
-                Endif
-        Endif
-End
 
 ////////////////////////