Changeset 750

Timestamp:

Oct 4, 2010 10:15:08 AM (12 years ago)

Author:

srkline

Message:

Some utility procedures were moved from NSORT to NCNR_Utilities. These changes were previously propogated to ANSTO_Utils, and now are propagated to HFIR and ILL_Util files.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• HFIR_Utils.ipf (modified) (2 diffs)
• ILL_Utils.ipf (modified) (1 diff)
• NCNR_Utils.ipf (modified) (1 diff)
• ProtocolAsPanel.ipf (modified) (1 diff)

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

@@ -236 +236 @@
 // "ABC" returned as an invalid result
 // XXXXSANS_expXX._scan1234_5678.xmp ==> "12345678"
+// -- result is an 8-character string
+//
 Function/S GetRunNumStrFromFile(item)   //,numposition)
         String item
@@ -368 +370 @@
 End
 
+
+//make an (N) character string of the run number
+//Moved to facility utils
+//
+// same scheme to get 8-character string as in GetRunNumStrFromFile(item)
+//
+Function/S RunDigitString(num)
+        Variable num
+
+        String numStr=""
+
+        //make 8 digit string from run number
+        sprintf numStr,"%08u",num
+        
+        if(strlen(numStr) > 8)
+                return("")
+        else
+                return(numstr)
+        endif
+        
+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
+//
+// HFIR writes out files with a "prefix" of the following -- since there is really no "prefix" 
+// like in the VAX scheme:
+//                      newFileName = ReplaceString(".xml",textPath[0],"")              //removes 4 chars
+//                      newFileName = ReplaceString("SANS",newFileName,"")              //removes 4 more chars = 8
+//                      newFileName = ReplaceString("exp",newFileName,"")                       //removes 3 more chars = 11
+//                      newFileName = ReplaceString("scan",newFileName,"")              //removes 4 more chars = 15, should be enough?
+//
+//
+// -- so the raw data:          BioSANS_exp9_scan1828_0001.xml
+// -- translates to:            Bio_9_1828_0001.AVE     
+//
+//
+// NCNR-specifc, does not really belong here - it's a beta procedure used for the
+// Combine Files Panel, and I'm not sure of how I'm really going to get this to work properly
+// since the .ABS file written is not of the form that NSORT->Set3NSORTFiles(low,med,hi,pref)
+// is trying to construct
+//
+// changed (Oct 2010) the naming for HFIR from ExecuteProtocol to:
+//                      newFileName = GetPrefixStrFromFile(textPath[0])+GetRunNumStrFromFile(textPath[0])
+// -- translates to:            BioSANS18280001.AVE
+//
+Function/S GetPrefixStrFromFile(item)
+        String item
+        String invalid = ""     //"" is not a valid run prefix, since it's text
+        Variable num=-1
+        
+        //find the "dash"
+        String runStr=""
+        Variable pos = strsearch(item,"_",0)
+        if(pos == -1)
+                //"dot" not found
+                return (invalid)
+        else
+                //found
+                if (pos <=3)
+                        //not enough characters
+                        return (invalid)
+                else
+                        runStr = item[0,pos-1]
+                        return (runStr)
+                Endif
+        Endif
+End
+
+
+
 //function to test a binary file to see if it is a RAW binary SANS file
 //first checks the total bytes in the file (which for raw data is 33316 bytes)

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

@@ -327 +327 @@
         
         
+//make an (N) character string of the run number
+//Moved to facility utils
+//
+// same scheme to get 6-character string as in GetRunNumStrFromFile(item)
+//
+Function/S RunDigitString(num)
+        Variable num
+        
+//      String fullName="",partialName="",item=""
+//      String numStr=""
+//      
+//      numStr = num2istr(num)
+//      // pad to 6 characters
+//      switch(strlen(numstr))  // numeric switch
+//              case 6:         // execute if case matches expression
+//                      break                                           // exit from switch
+//              case 5:
+//                      numStr = "0"+numStr
+//                      break
+//              case 4:
+//                      numStr = "00"+numStr
+//                      break
+//              case 3:
+//                      numStr = "000"+numStr
+//                      break
+//              case 2:
+//                      numStr = "0000"+numStr
+//                      break
+//              case 1:
+//                      numStr = "00000"+numStr
+//                      break                                                                                           
+//              default:                                                        // optional default expression executed
+//      endswitch
+//      
+        
+        String numStr=""
+
+        //make 6 digit string from run number
+        sprintf numStr,"%06u",num
+        
+        //Print "numstr = ",numstr
+        if(strlen(numstr) > 6)
+                return("")
+        else
+                return(numstr)
+        endif
+        
+End
+        
+        return(numstr)
+End
+
+// there is no prefix on D22 data files - they're just a run number
+//
+// so return null
+//
+// NCNR-specifc, does not really belong here - it's a beta procedure used for the
+// Combine Files Panel, and I'm not sure of how I'm really going to get this to work properly
+// since the .ABS file written is not of the form that NSORT->Set3NSORTFiles(low,med,hi,pref)
+// is trying to construct
+//
+Function/S GetPrefixStrFromFile(item)
+        String item
+        return("")
+End
 
 

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

@@ -423 +423 @@
 //returns "" as an invalid file prefix
 //
-// NCNR-specifc, does not really belong here - but it's a beta procedure anyhow...
+// NCNR-specifc, does not really belong here - but it's a beta procedure used for the
+// Combine Files Panel
 //
 Function/S GetPrefixStrFromFile(item)

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

@@ -1880 +1880 @@
                         newFileName = ReplaceString(".nx.hdf", tempFilename, "")
 #elif (exists("HFIR")==6)
-                        newFileName = ReplaceString(".xml",textPath[0],"")              //removes 4 chars
-                        newFileName = ReplaceString("SANS",newFileName,"")              //removes 4 more chars = 8
-                        newFileName = ReplaceString("exp",newFileName,"")                       //removes 3 more chars = 11
-                        newFileName = ReplaceString("scan",newFileName,"")              //removes 4 more chars = 15, should be enough?
+//                      newFileName = ReplaceString(".xml",textPath[0],"")              //removes 4 chars
+//                      newFileName = ReplaceString("SANS",newFileName,"")              //removes 4 more chars = 8
+//                      newFileName = ReplaceString("exp",newFileName,"")                       //removes 3 more chars = 11
+//                      newFileName = ReplaceString("scan",newFileName,"")              //removes 4 more chars = 15, should be enough?
+                        newFileName = GetPrefixStrFromFile(textPath[0])+GetRunNumStrFromFile(textPath[0])
 #else
                         newFileName = UpperStr(GetNameFromHeader(textPath[0]))          //NCNR data drops here, trims to 8 chars