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

Timestamp:

Jul 2, 2013 2:38:09 PM (10 years ago)

Author:

srkline

Message:

Changes to the panel sizes to accommodate smaller screens on laptops. Resized some panels and reorganized some of the controls. Help files have been updated to reflect these changes.

Added function to rename raw data files by copying file on disk, then writing in the new file number to the header. Solves the ICE problem of duplicated run numbers. In NCNR_DataReadWrite. See RenumberRunNumber?

Added new functions to the EventModeProcessing? to split large files (stream mode) and decimate when they are read back in. Added features to the event editing to automatically detect steps, and to show the differential with the data. Panel has improved layout. Still in the beta phase with these new features.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• EventModeProcessing.ipf (modified) (5 diffs)
• NCNR_DataReadWrite.ipf (modified) (2 diffs)
• NCNR_Includes_v520.ipf (modified) (1 diff)
• NCNR_Utils.ipf (modified) (1 diff)
• ProtocolAsPanel.ipf (modified) (1 diff)
• Tile_2D.ipf (modified) (1 diff)
• WorkFileUtils.ipf (modified) (1 diff)

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

@@ -2762 +2762 @@
         fSplitBigFile(splitSize, baseStr)
         
+        ShowSplitFileTable()
 End
 
@@ -2863 +2864 @@
 End
 
+// allows the list of loaded files to be edited
+Function ShowSplitFileTable()
+
+        SVAR str = root:Packages:NIST:Event:gSplitFileList
+        
+        Make/O/T/N=1 root:Packages:NIST:Event:SplitFileWave
+        WAVE tw = root:Packages:NIST:Event:SplitFileWave
+        
+        List2TextWave(str,tw)
+        Edit tw
+
+        return(0)
+End
 
 
@@ -3135 +3149 @@
 End
 
-// functions that take file names as arguments so that the loading an be done in batch mode
-// for the mode of "one continuous exposure"
+// loads a list of files, decimating each chunk as it is read in
 //
 Function Stream_LoadDecim(ctrlName)
@@ -3152 +3165 @@
 
 
+// if "stream" mode is not checked - abort
+        NVAR gEventModeRadioVal= root:Packages:NIST:gEvent_mode
+        if(gEventModeRadioVal != MODE_STREAM)
+                Abort "The mode must be 'Stream' to use this function"
+                return(0)
+        endif
+
+// if the list has been edited, turn it into a list
+        WAVE/T/Z tw = root:Packages:NIST:Event:SplitFileWave
+        if(WaveExists(tw))
+                listStr = TextWave2SemiList(tw)
+        endif
+        
+        
 
         //loop through everything in the list
@@ -3180 +3207 @@
                 t_longest = waveMax(rescaledTime)               //should be the last point
                 
-// (2) do the decimation, just on timePt. Ignore rescaledTime for now   
+// (2) do the decimation, just on timePt. create rescaledTime from the decimated timePt 
                 
                 Duplicate/O timePt, timePt_dTmp

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

@@ -1945 +1945 @@
 //
 // seems to work correctly byte for byte
-// compression has bee implmented also, for complete replication of the format (n>32767 in a cell)
+// compression has been implmented also, for complete replication of the format (n>32767 in a cell)
 //
 // SRK 29JAN09
@@ -3111 +3111 @@
 
 ////////end of ProDiv() specifics
+
+
+// JUL 2013
+// Yet another fix for an ICE issue. Here the issue is when the run number gets "magically"
+// reset during an experiment. Then there are duplicate run numbers. When procedures key on the run number,
+// the *first* file in the OS file listing is the one that's found. Simply renaming the file with a 
+// different number is not sufficient, as the file name embedded in the header must be used (typically from
+// marquee operations) where there is a disconnect between the file load and the function - leading to 
+// cases where the current data is "unknown", except for textRead.
+//
+// Hence more patching procedures to re-write files with new file names in the header and the OS.
+//
+Proc RenumberRunNumber(add)
+        Variable add
+
+        fRenumberRunNumber(add)
+
+End
+
+Proc CheckFileNames(firstFile,lastFile)
+        Variable firstFile=1,lastFile=100
+        
+        fCheckFileNames(firstFile,lastFile)
+End
+
+
+// will read the 21 character file name and put any spaces at the front of the string
+// like the VAX does. Should have absolutely no effect if there are spaces at the
+// beginning of the string, as the VAX does.
+Function fRenumberRunNumber(add)
+        Variable add
+        
+        Variable ii,numItems
+        String item,runStr,list
+        String curFile,newRunStr,newFileStr
+        String pathStr
+        PathInfo catPathName
+        pathStr = S_path
+        
+// get a list of all of the files in the folder
+        list = IndexedFile(catPathName,-1,"????")       //get all files in folder
+        numItems = ItemsInList(list,";")                //get the new number of items in the list
+
+// for each file
+        for(ii=0;ii<numItems;ii+=1)
+                curFile = StringFromList(ii, list  ,";" )
+                runStr = GetRunNumStrFromFile(curFile)
+                
+                if(cmpstr(runStr,"ABC") != 0)           // weed out error if run number can't be found
+                        newRunStr = num2str( str2num(runStr) + add )
+                        newFileStr = ReplaceString(runStr, curFile, newRunStr )
+                // change the file name on disk to have a new number (+add)
+                        Printf "Old = %s\t\tNew = %s\r",curFile,newFileStr
+                        
+                // copy the file, saving with the new name
+                        CopyFile/I=0/O/P=catPathName curFile as newFileStr
+                        
+                // change the run number in the file header to have the new number (writing just the necessary characters)
+                        WriteTextToHeader(pathStr+newFileStr,newRunStr,7)               //start at byte 7
+                endif
+                                        
+        endfor
+        
+        return(0)
+End
+
+// simple utility to read the file name stored in the file header (and the suffix)
+Function fCheckFileNames(lo,hi)
+        Variable lo,hi
+        
+        String file,fileName,suffix,fileInHdr,fileOnDisk
+        Variable ii
+        
+        for(ii=lo;ii<=hi;ii+=1)
+                file = FindFileFromRunNumber(ii)
+                if(strlen(file) != 0)
+                        fileOnDisk = ParseFilePath(0, file, ":", 1, 0)
+                        fileInHdr = getFileName(file)
+//                      suffix = getSuffix(file)
+                        printf "File %d:  File on disk = %s\t\tFile in Hdr = %s\r",ii,fileOnDisk,fileInHdr
+                else
+                        printf "run number %d not found\r",ii
+                endif
+        endfor
+        
+        return(0)
+End
+

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

@@ -127 +127 @@
         "PatchFileNameInHeader"
         "ReadFileNameInHeader"
+        "-"
+        "Renumber Run Number"
+        "Check File Names"
 //      "-"
 //      "AddALLToLayout"                        //added to tile raw 2d panel

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

@@ -994 +994 @@
 //
 // added 11/99 - uppercase and lowercase versions of the file are tried, if necessary
-// since from marquee, the filename field (textread[0]) must be used, and can be a mix of
+// since from marquee, the filename field (textread[0]) must be used, and can be a mix of                       //02JUL13
 // upper/lowercase letters, while the filename on the server (should) be all caps
 // now makes repeated calls to ValidFileString()

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

@@ -2069 +2069 @@
                 //get the XY box, if needed
                 Variable x1,x2,y1,y2,ct_err
-                String filename=tw[0],tempStr
+                String filename=tw[0],tempStr                   //02JUL13
                 PathInfo/S catPathName
                 String tempName = S_Path + FindValidFilename(filename)

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

@@ -639 +639 @@
                         fRawWindowHook()
                         WAVE/T/Z tw = $"root:Packages:NIST:RAW:textRead"        //to be sure that wave exists if no data was ever displayed
-                        newFileName= GetNameFromHeader(tw[0])
+                        newFileName= GetNameFromHeader(tw[0])           //02JUL13
                         
                         if(qxqy)

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

@@ -312 +312 @@
         WAVE integersread=$(destPath + ":integersread")
         WAVE realsread=$(destPath + ":realsread")
-        String/G $(destPath + ":fileList") = textread[0]                        //a list of names of the files in the work file (1)
+        String/G $(destPath + ":fileList") = textread[0]                        //a list of names of the files in the work file (1)             //02JUL13
         
         //apply nonlinear, Jacobian corrections ---