Changeset 917 for sans/Dev

Timestamp:

Jul 5, 2013 3:40:33 PM (10 years ago)

Author:

srkline

Message:

Modified QKK files to remove the calls to the ProgressWindow? XOP, which crashed my machine (OSX 10.8), Igor 6.3

Updated event processing to add new editing features to remove outliers

Updated help file for Event Mode.

Location:

sans/Dev/trunk

Files:

• NCNR_Help_Files/EventModeData_Help_v1.0.ihf (modified) (previous)
• NCNR_User_Procedures/Reduction/SANS/EventModeProcessing.ipf (modified) (24 diffs)
• NCNR_User_Procedures/Reduction/SANS/NCNR_DataReadWrite.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Reduction/SANS/QKK_ANSTO_Transmission.ipf (modified) (4 diffs)
• NCNR_User_Procedures/Reduction/SANS/QKK_CatVSTable.ipf (modified) (4 diffs)

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

@@ -204 +204 @@
         Button button2,pos={419,28},size={140,20},proc=ShowEventDataButtonProc,title="Show Event Data"
         Button button3,pos={419,56},size={140,20},proc=ShowBinDetailsButtonProc,title="Show Bin Details"
-        Button button4,pos={487,227},size={120,20},proc=UndoTimeSortButtonProc,title="Undo Time Sort"
         Button button5,pos={419,85},size={140,20},proc=ExportSlicesButtonProc,title="Export Slices as VAX"
         Button button6,pos={718,9},size={40,20},proc=EventModeHelpButtonProc,title="?"
+        
+        
         Button button7,pos={487,197},size={120,20},proc=AdjustEventDataButtonProc,title="Adjust Events"
         Button button8,pos={619,197},size={120,20},proc=CustomBinButtonProc,title="Custom Bins"
-        Button button1,pos={206,100},size={120,20},proc=ProcessEventLog_Button,title="Bin Event Data"
-        Button button1,fSize=12
+        Button button4,pos={487,227},size={120,20},proc=UndoTimeSortButtonProc,title="Undo Time Sort"
+        Button button18,pos={619,227},size={120,20},proc=EC_ImportWavesButtonProc,title="Import Edited"
+
         
         SetVariable setvar0,pos={208,149},size={160,16},proc=sliceSelectEvent_Proc,title="Display Time Slice"
@@ -223 +225 @@
         PopupMenu popup0,fSize=10
         PopupMenu popup0,mode=1,popvalue="Equal",value= #"\"Equal;Fibonacci;Custom;\""
+        Button button1,pos={206,100},size={120,20},fSize=12,proc=ProcessEventLog_Button,title="Bin Event Data"
 
         Button button10,pos={488,305},size={100,20},proc=SplitFileButtonProc,title="Split Big File"
@@ -463 +466 @@
         endif
         
+        // If TOF mode, process as Oscillatory -- that is, take the times as is
+        if(mode == MODE_TOF)
+                Osc_ProcessEventLog("")
+        endif
+        
         // toggle the checkbox for log display to force the display to be correct
         NVAR gLog = root:Packages:NIST:gEvent_logint
@@ -859 +867 @@
 // TODO:
 //
-// What, if anything is different about the OSC or STREAM load?
-// I think that only the processing is different. so this could be
-// consolidated into a single loader.
-//
 // ** currently, the "stream" loader uses the first data point as time=0
 //    and rescales everything to that time. "Osc" loading uses the times "as-is"
@@ -884 +888 @@
         String abortStr
         
-        Open/R/D/F=fileFilters fileref
+        Open/R/D/P=catPathName/F=fileFilters fileref
         filename = S_filename
         if(strlen(S_filename) == 0)
@@ -937 +941 @@
         endif
 
-
+// MODE_TISANE
+
+// MODE_TOF
+        if(mode == MODE_TOF)            // TOF mode - don't adjust the times, we get periodic t0 to reset t=0
+                Duplicate/O timePt rescaledTime
+                rescaledTime *= 1e-7                    //convert to seconds and that's all
+                t_longest = waveMax(rescaledTime)               //if oscillatory, won't be the last point, so get it this way
+        
+                KillWaves/Z OscSortIndex                        //to make sure that there is no old index hanging around
+        endif
 
         SetDataFolder root:
@@ -1803 +1816 @@
         dispStr += tmpStr
 
+
+// simply to compile a table of # XY vs # bytes
+//      Wave/Z nxy = root:numberXY
+//      Wave/Z nBytes = root:numberBytes
+//      if(WaveExists(nxy) && WaveExists(nBytes))
+//              InsertPoints 0, 1, nxy,nBytes
+//              nxy[0] = numXYevents
+//              nBytes[0] = totBytes
+//      endif
+
         SetDataFolder root:
 
@@ -2108 +2131 @@
         SetDataFolder root:Packages:NIST:Event:
         
-        Display /W=(35,44,761,533)/K=2 rescaledTime
-        DoWindow/C EventCorrectionPanel
-        ModifyGraph mode=4
-        ModifyGraph marker=19
-        ModifyGraph rgb=(0,0,0)
-        ModifyGraph msize=1
-        ErrorBars rescaledTime OFF 
-        Label left "\\Z14Time (seconds)"
-        Label bottom "\\Z14Event number"        
-        SetAxis bottom 0,0.10*numpnts(rescaledTime)             //show 1st 10% of data for speed in displaying
-        
-        ControlBar 100
-        Button button0,pos={18,12},size={70,20},proc=EC_AddCursorButtonProc,title="Cursors"
-        Button button1,pos={153,12},size={80,20},proc=EC_AddTimeButtonProc,title="Add time"
-        Button button2,pos={153,38},size={80,20},proc=EC_SubtractTimeButtonProc,title="Subtr time"
-        Button button3,pos={153,64},size={90,20},proc=EC_TrimPointsButtonProc,title="Trim points"
-        Button button4,pos={295+200,12},size={90,20},proc=EC_SaveWavesButtonProc,title="Save Waves"
-        Button button5,pos={295+200,38},size={100,20},proc=EC_ImportWavesButtonProc,title="Import Waves"
-        Button button6,pos={18,38},size={80,20},proc=EC_ShowAllButtonProc,title="All Data"
-        Button button7,pos={683,12},size={30,20},proc=EC_HelpButtonProc,title="?"
-        Button button8,pos={658,72},size={60,20},proc=EC_DoneButtonProc,title="Done"
-
-        Button button9,pos={295,12},size={110,20},proc=EC_FindStepButton_down,title="Find Step Down"
-        Button button10,pos={295,38},size={110,20},proc=EC_FindStepButton_up,title="Find Step Up"
-        Button button11,pos={295,64},size={110,20},proc=EC_DoDifferential,title="Differential"
+        if(exists("rescaledTime") == 1)
+                Display /W=(35,44,761,533)/K=2 rescaledTime
+                DoWindow/C EventCorrectionPanel
+                ModifyGraph mode=4
+                ModifyGraph marker=19
+                ModifyGraph rgb=(0,0,0)
+                ModifyGraph msize=1
+                ErrorBars rescaledTime OFF 
+                Label left "\\Z14Time (seconds)"
+                Label bottom "\\Z14Event number"        
+                SetAxis bottom 0,0.10*numpnts(rescaledTime)             //show 1st 10% of data for speed in displaying
+                
+                ControlBar 100
+                Button button0,pos={18,12},size={70,20},proc=EC_AddCursorButtonProc,title="Cursors"
+                Button button1,pos={153,12},size={80,20},proc=EC_AddTimeButtonProc,title="Add time"
+                Button button2,pos={153,38},size={80,20},proc=EC_SubtractTimeButtonProc,title="Subtr time"
+                Button button3,pos={153,64},size={90,20},proc=EC_TrimPointsButtonProc,title="Trim points"
+                Button button4,pos={295+150,12},size={90,20},proc=EC_SaveWavesButtonProc,title="Save Waves"
+                Button button5,pos={295,64},size={100,20},proc=EC_FindOutlierButton,title="Find Outlier"
+                Button button6,pos={18,38},size={80,20},proc=EC_ShowAllButtonProc,title="All Data"
+                Button button7,pos={683,12},size={30,20},proc=EC_HelpButtonProc,title="?"
+                Button button8,pos={658,72},size={60,20},proc=EC_DoneButtonProc,title="Done"
+        
+                Button button9,pos={295,12},size={110,20},proc=EC_FindStepButton_down,title="Find Step Down"
+                Button button10,pos={295,38},size={110,20},proc=EC_FindStepButton_up,title="Find Step Up"
+                Button button11,pos={295+150,38},size={110,20},proc=EC_DoDifferential,title="Differential"
+                
+                
+        else
+                DoAlert 0, "Please load some event data, then you'll have something to edit."
+        endif
         
         SetDataFolder root:
@@ -2159 +2188 @@
 End
 
+// updates the longest time (as does every operation of adjusting the data)
+//
 Function EC_AddTimeButtonProc(ba) : ButtonControl
         STRUCT WMButtonAction &ba
@@ -2181 +2212 @@
                         MultiThread rescaledTime[lo,hi] += rollTime
 
+                        // updates the longest time (as does every operation of adjusting the data)
+                        NVAR t_longest = root:Packages:NIST:gEvent_t_longest
+                        t_longest = waveMax(rescaledTime)
                         
                         SetDataFolder root:
@@ -2213 +2247 @@
                         MultiThread rescaledTime[lo,hi] -= rollTime
 
+                        // updates the longest time (as does every operation of adjusting the data)
+                        NVAR t_longest = root:Packages:NIST:gEvent_t_longest
+                        t_longest = waveMax(rescaledTime)
+                        
                         SetDataFolder root:
                         
@@ -2250 +2288 @@
                         
                         printf "Points %g to %g have been deleted in rescaledTime, timePt, xLoc, and yLoc\r",ptA,ptB
+                        
+                        // updates the longest time (as does every operation of adjusting the data)
+                        NVAR t_longest = root:Packages:NIST:gEvent_t_longest
+                        t_longest = waveMax(rescaledTime)
+                        
                         SetDataFolder root:
                         
@@ -2331 +2374 @@
                         dispStr = tmpStr
         
+                        SetDataFolder root:
                         break
                 case -1: // control being killed
@@ -2397 +2441 @@
         zoom = 200              //points in each direction
         
-        WaveStats/Q rescaledTime_DIF
+        WaveStats/M=1/Q rescaledTime_DIF
         avg = V_avg
         
@@ -2426 +2470 @@
 
 
+// find the max (or min) of the rescaled time set
+// and place both cursors there
+Function fFindOutlier()
+
+        SetDataFolder root:Packages:NIST:Event:
+
+        Wave rescaledTime=rescaledTime
+        Variable avg,pt,zoom,maxPt,minPt,maxVal,minVal
+        
+        zoom = 200              //points in each direction
+        
+        WaveStats/M=1/Q rescaledTime
+        maxPt = V_maxLoc
+        minPt = V_minLoc
+        avg = V_avg
+        maxVal = abs(V_max)
+        minVal = abs(V_min)
+
+        
+        pt = abs(maxVal - avg) > abs(minVal - avg) ? maxPt : minPt
+        
+//      Variable loLeft,hiLeft, loBottom,hiBottom
+//      loLeft = V_min*0.98             //+/- 2%
+//      hiLeft = V_max*1.02
+        
+//      SetAxis left loLeft,hiLeft
+//      SetAxis bottom pnt2x(rescaledTime,pt-zoom),pnt2x(rescaledTime,pt+zoom)
+        
+        Cursor/P A rescaledTime pt              //at the point
+        Cursor/P B rescaledTime pt              //at the same point
+
+        SetDataFolder root:
+
+
+        return(0)
+End
+
 Function EC_FindStepButton_down(ctrlName) : ButtonControl
         String ctrlName
@@ -2445 +2526 @@
 end
 
+// if the Trim button section is uncommented, it's "Zap outlier"
+//
+Function EC_FindOutlierButton(ctrlName) : ButtonControl
+        String ctrlName
+        
+        fFindOutlier()
+//
+//      STRUCT WMButtonAction ba
+//      ba.eventCode = 2
+//
+//      EC_TrimPointsButtonProc(ba)
+
+        return(0)
+end
 
 Function EC_DoDifferential(ctrlName) : ButtonControl
@@ -2771 +2866 @@
 
         String fileName=""              // File name, partial path, full path or "" for dialog.
-        String pathName=""
         Variable refNum
         String str
@@ -2789 +2883 @@
         
         // Open file for read.
-        Open/R/Z=2/F="????"/P=$pathName refNum as fileName
+        Open/R/Z=2/F="????"/P=catPathName refNum as fileName
         thePath = ParseFilePath(1, S_fileName, ":", 1, 0)
         Print "thePath = ",thePath
@@ -2839 +2933 @@
 
                 Close outRef
-                listStr += outStr+";"
+//              listStr += outStr+";"
+                listStr += baseStr+num2str(ii)+";"
         endfor
 
@@ -2854 +2949 @@
 
         Close outRef
-        listStr += outStr+";"
-
+//      listStr += outStr+";"
+        listStr += baseStr+num2str(ii)+";"
 
         FSetPos refNum,V_logEOF
@@ -3115 +3210 @@
 
 
-
+// unused, old testing procedure
 Function LoadDecimateButtonProc(ctrlName) : ButtonControl
         String ctrlName
@@ -3158 +3253 @@
         SVAR filename = root:Packages:NIST:gEvent_logfile
         NVAR t_longest = root:Packages:NIST:gEvent_t_longest
-        
+
         SVAR listStr = root:Packages:NIST:Event:gSplitFileList
-
         NVAR t_longest_dec = root:Packages:NIST:gEvent_t_longest_decimated
         NVAR decimation = root:Packages:NIST:Event:gDecimation
 
+        String pathStr
+        PathInfo catPathName
+        pathStr = S_Path
 
 // if "stream" mode is not checked - abort
@@ -3176 +3273 @@
         if(WaveExists(tw))
                 listStr = TextWave2SemiList(tw)
+        else
+                ShowSplitFileTable()
+                DoAlert 0,"Enter the file names in the table, then click 'Load From List' again."
+                return(0)
         endif
         
@@ -3186 +3287 @@
         for(ii=0;ii<num;ii+=1)
 
-// (1) load the file            
-                filename = StringFromList(ii, listStr  ,";")
+// (1) load the file, prepending the path               
+                filename = pathStr + StringFromList(ii, listStr  ,";")
                 
 

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

@@ -2058 +2058 @@
         
         // fill the last bits of the header information
-        err = SimulationVAXHeader(type)
+        err = SimulationVAXHeader(type)         //if the type != 'SAS', this function does nothing
+        
         if (err == -1)
                 Abort "no sample label entered - no file written"                       // User did not fill in header correctly/completely
@@ -2454 +2455 @@
         String folder
 
-        if(cmpstr(folder,"SAS")!=0)             //if not the SAS folder passed in, get out now, and return 1
+        if(cmpstr(folder,"SAS")!=0)             //if not the SAS folder passed in, get out now, and return 1 (-1 is the error condition)
                 return(1)
         endif

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

@@ -367 +367 @@
 
                 do
-                        Execute  "ProgressWindow spin"
+//                      Execute  "ProgressWindow spin"
                         xpath_config = xpath_SampleEnv + "/config[" + num2str(jj) + "]" //there may be multiple config per report
 
@@ -733 +733 @@
         variable FilesAreMissing = 0
 
-        Execute "ProgressWindow open, text=\"Loading Table...\""
+//      Execute "ProgressWindow open, text=\"Loading Table...\""
         
         ii = 0
@@ -741 +741 @@
                 emp_fname = S_path + EMP_Filenames[ii]
 
-                Execute "ProgressWindow text=\"Loading Table...\n" + S_Filenames[ii] + "\""
+//              Execute "ProgressWindow text=\"Loading Table...\n" + S_Filenames[ii] + "\""
                 
                 InsertPoints ii,1,S_Labels
@@ -816 +816 @@
                 
                 ii+=1
-                Execute  "ProgressWindow percent=" + Num2Str(100*ii/lastPoint)
+//              Execute  "ProgressWindow percent=" + Num2Str(100*ii/lastPoint)
                 
         while(ii<lastPoint)
         
-        Execute "ProgressWindow close"
+//      Execute "ProgressWindow close"
         
         if (FilesAreMissing)

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

@@ -145 +145 @@
         ii=0
         
-        Execute "ProgressWindow open, text=\"Loading Table...\""
+//      Execute "ProgressWindow open, text=\"Loading Table...\""
         
         Make/T/O/N=0 notRAWlist
@@ -165 +165 @@
                         Endif
                 else
-                        Execute "ProgressWindow text=\"Loading Table...\n" + tempName + "\""
+//                      Execute "ProgressWindow text=\"Loading Table...\n" + tempName + "\""
                 
                         //prepend path to tempName for read routine 
@@ -184 +184 @@
                 
                 ii+=1
-                Execute  "ProgressWindow percent=" + Num2Str(100*ii/numitems)
+//              Execute  "ProgressWindow percent=" + Num2Str(100*ii/numitems)
                 
         while(ii<numitems)
@@ -192 +192 @@
         AppendNotRAWFiles(notRAWlist)   
         KillWaves/Z notRAWlist
-        Execute "ProgressWindow close"
+//      Execute "ProgressWindow close"
 //
 //      Print "Total time (s) = ",(ticks - t1)/60.15