Changeset 1004 for sans

Timestamp:

Jul 11, 2016 2:59:08 PM (7 years ago)

Author:

srkline

Message:

changes to handle an arbitrary run number, rather than insisting on 3 or 4 digits.

fix to SANS file catalog where the last file name was cleared from the table, if there are no extra non-raw data files present. not a typical case, but it can happen.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• SANS/CatVSTable.ipf (modified) (1 diff)
• VSANS/V_PatchFiles.ipf (modified) (1 diff)
• VSANS/V_Utilities_General.ipf (modified) (4 diffs)

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

@@ -201 +201 @@
         Wave/T Filenames = $"root:myGlobals:CatVSHeaderInfo:Filenames"
         Variable lastPoint
+        
+        if(numpnts(w) == 0)
+                return(0)
+        endif
+        
         lastPoint = numpnts(Filenames)
         InsertPoints lastPoint,numpnts(w),Filenames

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_PatchFiles.ipf

@@ -438 +438 @@
                 Abort "wrong number of checkboxes GetEditedSetVarBoxes()"
         Endif
+        
         //pass all as a text wave - so only one wave has to be passed (conversion 2x, though)
         //global is set to the changed value when entered. read others directly from the control
+        
         //make sure the text label is exactly 60 characters long, to match VAX field length
         SVAR dum=root:Packages:NIST:VSANS:Globals:Patch:gPS1
-        String str60="", junk="junk" 
-        str60 = PadString(junk,60,0x20)
-        if(strlen(dum) <= 60)
-                if(strlen(dum) == 60)
-                   str60 = dum
-                else
-                   str60 = PadString(dum,60,0x20)
-                Endif
-        else
-                //too long, truncate
-                str60[0,59] = dum[0,59]
-        Endif
-        
-        wt[0] = str60
-        
+//      String str60="", junk="junk" 
+//      str60 = PadString(junk,60,0x20)
+//      if(strlen(dum) <= 60)
+//              if(strlen(dum) == 60)
+//                 str60 = dum
+//              else
+//                 str60 = PadString(dum,60,0x20)
+//              Endif
+//      else
+//              //too long, truncate
+//              str60[0,59] = dum[0,59]
+//      Endif
+//      
+//      wt[0] = str60
+        wt[0] = dum                     //with Nexus, no need to enforce 60 character field
+//      
         Variable ii
         String baseStr="PV"

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Utilities_General.ipf

@@ -504 +504 @@
 //filtered out.
 //
+//
+// -- with the run numbers incrementing from 1, there is no need to add leading zeros to the
+//    file names. simply add the number and go.
+//
 // called by Buttons.ipf and Transmission.ipf, and locally by parsing routines
 //
@@ -510 +514 @@
         
         String fullName="",partialName="",item=""
-        //get list of raw data files in folder that match "num" (add leading zeros)
-        if( (num>9999) || (num<=0) )
-                Print "error in  FindFileFromRunNumber(num), file number too large or too small"
-                Return ("")
-        Endif
-        //make a four character string of the run number
+        //get list of raw data files in folder that match "num"
+//      if( (num>9999) || (num<=0) )
+//              Print "error in  FindFileFromRunNumber(num), file number too large or too small"
+//              Return ("")
+//      Endif
         String numStr=""
-        if(num<10)
-                numStr = "000"+num2str(num)
-        else
-                if(num<100)
-                        numStr = "00"+num2str(num)
-                else
-                        if(num<1000)
-                                numstr = "0"+num2str(num)
-                        else
-                                numStr = num2str(num)
-                        endif
-                Endif
-        Endif
+        numStr = num2str(num)
+//      if(num<10)
+//              numStr = "000"+num2str(num)
+//      else
+//              if(num<100)
+//                      numStr = "00"+num2str(num)
+//              else
+//                      if(num<1000)
+//                              numstr = "0"+num2str(num)
+//                      else
+//                              numStr = num2str(num)
+//                      endif
+//              Endif
+//      Endif
         //Print "numstr = ",numstr
         
@@ -636 +640 @@
 //given a filename of a VSANS data filename of the form
 // sansNNNN.nxs.ngv
-//returns the run number "NNNN" as a STRING of FOUR characters
+//returns the run number "NNNN" as a STRING of (x) characters
+//
+// -- the run number incements from 1, so the number of digits is UNKNOWN
+// -- number starts at position [4] (the 5th character)
+// -- number ends with the character prior to the first "."
+//
 //returns "ABCD" as an invalid file number
 //
@@ -654 +663 @@
                 return (invalid)
         else
-                //found, get the four characters preceeding it
-                if (pos <= numChar-1)
+                //found, get the characters preceeding it, but still after the "sans" characters
+                if (pos-1 <= 4)
                         //not enough characters
                         return (invalid)
                 else
-                        runStr = item[pos-numChar,pos-1]
+                        runStr = item[4,pos-1]
                         return (runStr)
                 Endif