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

Timestamp:

Apr 9, 2010 4:30:03 PM (13 years ago)

Author:

ajj

Message:

• Move determination of next/prev RAW filename to Facility functions (NCNR_Utils.ipf)
• Function added is GetPrevNextRawFile?()

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• Buttons.ipf (modified) (1 diff)
• NCNR_Utils.ipf (modified) (1 diff)

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

@@ -209 +209 @@
         Variable increment
 
+        Variable i
+        String filename
         //take the currently displayed RAW file (there is only one name in fileList)
         SVAR oldName = root:Packages:NIST:RAW:fileList
         
-        //get the run number
-        Variable num = GetRunNumFromFile(oldName)
-        
-        //increment
-        num += increment
-        
-        //find the next specified file by number
-        String fileName = FindFileFromRunNumber(num)
-        if(cmpstr(fileName,"")==0)
-                //null return, do nothing
-                Return(1)
-        Endif
+        print oldName
+        
+        filename = oldname
+        for (i = 0; i < abs(increment); i += 1)
+                filename = GetPrevNextRawFile(filename,increment/abs(increment))
+        endfor  
+        
+        print filename
         
         // display the specified RAW data file

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

@@ -1343 +1343 @@
         return(newList)
 End
+
+// Return the filename that represents the previous or next file.
+// Input is current filename and increment. 
+// Increment should be -1 or 1
+// -1 => previous file
+// 1 => next file
+Function/S GetPrevNextRawFile(curfilename, prevnext)
+        String curfilename
+        Variable prevnext
+
+        String filename
+        
+        //get the run number
+        Variable num = GetRunNumFromFile(curfilename)
+                
+        //find the next specified file by number
+        fileName = FindFileFromRunNumber(num+prevnext)
+
+        if(cmpstr(fileName,"")==0)
+                //null return, do nothing
+                fileName = FindFileFromRunNumber(num)
+        Endif
+
+        print "in FU "+filename
+
+        Return filename
+End