Changeset 915 for sans/Dev

Timestamp:

Jun 24, 2013 4:29:54 PM (10 years ago)

Author:

srkline

Message:

Changes to panels so that they fit on a low-resolution laptop screen (Nx768).

• Auto Fit
• Event Mode
• All polarization panels

In addition, Functionality was added to the event mode processing to (better) handle large files. Files can be split and either added as slices (if oscillatory) or decimated (if stream). The "tweaking" of the data stream is also a little bit more automated now, using some intelligent locating of the time steps and an overlay of the derivative.

Corrected a few bugs in file handling on the polarization panels in cases where the user canceled out of a file dialog.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Analysis/Alpha/Auto_Fit.ipf (modified) (2 diffs)
• Reduction/Polarization/Pol_FlipperPanel.ipf (modified) (10 diffs)
• Reduction/Polarization/Pol_PolarizationCorrection.ipf (modified) (13 diffs)
• Reduction/Polarization/Pol_PolarizationPanels.ipf (modified) (8 diffs)
• Reduction/SANS/EventModeProcessing.ipf (modified) (39 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Auto_Fit.ipf

@@ -316 +316 @@
 Window AutoFitPanel()
         PauseUpdate; Silent 1           // building window...
-        NewPanel /W=(685,44,1001,740) /K=1
+        NewPanel /W=(434,44,1063,422) /K=1
         DoWindow/C AutoFitPanel
         SetDrawLayer UserBack
-//      DrawText 11,418,"Point Range"
-//      DrawText 5,167,"Suffix"
-        DrawLine 8,362,287,362
-        PopupMenu popup0,pos={2,2},size={175,20},title="pick a function"
+///     DrawText 11,418,"Point Range"
+///     DrawText 5,167,"Suffix"
+//      DrawLine 8,362,287,362
+        PopupMenu popup0,pos={13,6},size={175,20},title="Pick a Function"
         PopupMenu popup0,mode=1,value= #"User_FunctionPopupList()",proc=AF_FuncPopupProc
                 
@@ -330 +330 @@
         ListBox lb userColumnResize=1,widths={200,80}
         
-//      Button DelButton,pos={245,61},size={40,20},proc=DelButtonProc,title="Del",disable=2
-        Button PathButton,pos={6,61},size={50,20},proc=PDPButton,title="Path..."
+///     Button DelButton,pos={245,61},size={40,20},proc=DelButtonProc,title="Del",disable=2
+        Button PathButton,pos={13,61},size={50,20},proc=PDPButton,title="Path..."
         Button FileListButton,pos={82,61},size={50,20},proc=FileListButtonProc,title="List"
-        CheckBox AllFilesCheck,pos={182,64},size={32,14},proc=CheckAllFiles,title="Select All Files"
+        CheckBox AllFilesCheck,pos={196,64},size={32,14},proc=CheckAllFiles,title="Select All Files"
         CheckBox AllFilesCheck,value= 0
-        ListBox guessBox,pos={24,398},size={145,208},disable=1,proc=UpdateGuessMatrixProc
+        ListBox guessBox,pos={345,102},size={145,208},disable=1,proc=UpdateGuessMatrixProc
         ListBox guessBox,frame=2,listWave=root:AutoFit:guessList
         ListBox guessBox,selWave=root:AutoFit:guessSel,mode= 2,selRow= 0
-        Button FillAllGuessButton,pos={196,406},size={50,20},disable=1,proc=FillAllGuessButtonProc,title="Fill All"
-        Button FillAllHoldButton,pos={196,406},size={50,20},disable=1,proc=FillAllHoldButtonProc,title="Fill All"
-        Button FillAllConstrButton,pos={196,406},size={50,20},proc=FillAllConstrButtonProc,title="Fill All"
-        Button FillAllRangeB,pos={196,406},size={50,20},disable=1,proc=FillAllRangeButtonProc,title="Fill All"
-        SetVariable NumParams,pos={7,34},size={150,15},proc=SetNumParamProc,title="Number of Parameters"
+        Button FillAllGuessButton,pos={517,110},size={50,20},disable=1,proc=FillAllGuessButtonProc,title="Fill All"
+        Button FillAllHoldButton,pos={517,110},size={50,20},disable=1,proc=FillAllHoldButtonProc,title="Fill All"
+        Button FillAllConstrButton,pos={517,110},size={50,20},proc=FillAllConstrButtonProc,title="Fill All"
+        Button FillAllRangeB,pos={517,110},size={50,20},disable=1,proc=FillAllRangeButtonProc,title="Fill All"
+        SetVariable NumParams,pos={13,35},size={150,15},proc=SetNumParamProc,title="Number of Parameters"
         SetVariable NumParams,limits={2,Inf,0},value= root:AutoFit:numPar
-//      CheckBox typeCheck,pos={207,31},size={32,14},title="NSE Data?",value=0
-//      SetVariable fitTol,pos={80,208},size={80,15},title="Fit Tol"
-//      SetVariable fitTol,limits={0.0001,0.1,0},value= root:AutoFit:fitTol
-        CheckBox epsilonCheck,pos={156,335},size={32,14},value=0,title="Use Epsilon Wave?"
-
-        TabControl tabC,pos={13,371},size={273,244},proc=tabProc,tabLabel(0)="Guess"
+///     CheckBox typeCheck,pos={207,31},size={32,14},title="NSE Data?",value=0
+///     SetVariable fitTol,pos={80,208},size={80,15},title="Fit Tol"
+///     SetVariable fitTol,limits={0.0001,0.1,0},value= root:AutoFit:fitTol
+        CheckBox epsilonCheck,pos={156,340},size={32,14},value=0,title="Use Epsilon Wave?"
+
+        TabControl tabC,pos={334,75},size={273,244},proc=tabProc,tabLabel(0)="Guess"
         TabControl tabC,tabLabel(1)="Hold",tabLabel(2)="Constraint",tabLabel(3)="Range",value= 0
-//      CheckBox rangeCheck,pos={92,404},size={32,14},proc=RangeCheckProc,title="All"
-//      CheckBox rangeCheck,value= 1,disable=2
-
-        SetVariable lowPt,pos={136,404},size={60,15},title="low"
-        SetVariable lowPt,limits={0,Inf,0},value= root:AutoFit:ptLow,noedit=1,disable=1
-        SetVariable highPt,pos={201,404},size={60,15},title=" to "
-        SetVariable highPt,limits={0,Inf,0},value= root:AutoFit:ptHigh,noedit=1,disable=1
-        ListBox holdBox,pos={24,398},size={145,208},disable=1,proc=UpdateHoldMatrixProc
+///     CheckBox rangeCheck,pos={92,404},size={32,14},proc=RangeCheckProc,title="All"
+///     CheckBox rangeCheck,value= 1,disable=2
+
+////    SetVariable lowPt,pos={136,404},size={60,15},title="low"
+////    SetVariable lowPt,limits={0,Inf,0},value= root:AutoFit:ptLow,noedit=1,disable=1
+////    SetVariable highPt,pos={201,404},size={60,15},title=" to "
+////    SetVariable highPt,limits={0,Inf,0},value= root:AutoFit:ptHigh,noedit=1,disable=1
+        ListBox holdBox,pos={345,102},size={145,208},disable=1,proc=UpdateHoldMatrixProc
         ListBox holdBox,frame=2,listWave=root:AutoFit:holdList
         ListBox holdBox,selWave=root:AutoFit:holdSel,mode= 2,selRow= 2
-        ListBox ConstrBox,pos={24,398},size={145,208},proc=UpdateConstrMatrixProc
+        ListBox ConstrBox,pos={345,102},size={145,208},proc=UpdateConstrMatrixProc
         ListBox ConstrBox,frame=2,listWave=root:AutoFit:ConstrList
         ListBox ConstrBox,selWave=root:AutoFit:ConstrSel,mode= 2,selRow= 2
-        ListBox RangeBox,pos={24,398},size={145,208},proc=UpdateRangeMatrixProc
+        ListBox RangeBox,pos={345,102},size={145,208},proc=UpdateRangeMatrixProc
         ListBox RangeBox,frame=2,listWave=root:AutoFit:rangeList
         ListBox RangeBox,selWave=root:AutoFit:RangeSel,mode= 2,selRow= 2
-//      Button MatrixButton,pos={12,205},size={60,20},proc=ToMatrixButtonProc,title="Matrix",disable=2
-        Button DoItButton,pos={21,632},size={80,20},proc=DoTheFitsButtonProc,title="Do the fits"
-//      Button savePathButton,pos={82,61},size={80,20},proc=SavePathButtonProc,title="Save Path..."
-        TitleBox tb1,pos={139,634},size={128,12},anchor=MC,variable=root:AutoFit:gStatus,frame=0
-        Button button0,pos={14,331},size={40,20},title="Plot",proc=LoadForGuessProc
-//      SetVariable extStr,pos={4,170},size={40,15},title=" ",value= root:AutoFit:gExt
-        
-        Button GuessCoefB,pos={198,440},size={50,20},title="Guess",proc=UseCoefAsGuess
-        Button GuessHoldB,pos={198,440},size={50,20},title="Guess",disable=1,proc=UseHoldAsGuess
-//      Button GuessConstrB,pos={198,440},size={50,20},title="Guess",disable=1,proc=UseConstraintsAsGuess
-        
-        TitleBox infoTitleBox pos={180,470},fixedSize=1,size={96,130},variable=root:AutoFit:guessStr
-        
-        ValDisplay progressValdisp,pos={113,663},size={161,7},title="00:00"
+///     Button MatrixButton,pos={12,205},size={60,20},proc=ToMatrixButtonProc,title="Matrix",disable=2
+        Button DoItButton,pos={339,336},size={80,20},proc=DoTheFitsButtonProc,title="Do the fits"
+///     Button savePathButton,pos={82,61},size={80,20},proc=SavePathButtonProc,title="Save Path..."
+        TitleBox tb1,pos={479,330},size={128,12},anchor=MC,variable=root:AutoFit:gStatus,frame=0
+        Button button0,pos={14,336},size={60,20},title="Plot",proc=LoadForGuessProc
+///     SetVariable extStr,pos={4,170},size={40,15},title=" ",value= root:AutoFit:gExt
+        
+        Button GuessCoefB,pos={519,144},size={50,20},title="Guess",proc=UseCoefAsGuess
+        Button GuessHoldB,pos={519,144},size={50,20},title="Guess",disable=1,proc=UseHoldAsGuess
+///     Button GuessConstrB,pos={198,440},size={50,20},title="Guess",disable=1,proc=UseConstraintsAsGuess
+        
+        TitleBox infoTitleBox pos={501,174},fixedSize=1,size={96,130},variable=root:AutoFit:guessStr
+        
+        ValDisplay progressValdisp,pos={446,349},size={161,7},title="00:00"
         ValDisplay progressValdisp,limits={0,root:AutoFit:endProgress,0},barmisc={0,0},value= root:AutoFit:curProgress
         
-        Button AF_DoneButton,pos={174,30},size={70,20},proc=AF_DoneButtonProc,title="Done"
-        Button AF_HelpButton,pos={260,30},size={30,20},proc=AF_HelpButtonProc,title="?"
+        Button AF_DoneButton,pos={541,8},size={70,20},proc=AF_DoneButtonProc,title="Done"
+        Button AF_HelpButton,pos={496,8},size={30,20},proc=AF_HelpButtonProc,title="?"
 
 EndMacro

sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_FlipperPanel.ipf

@@ -40 +40 @@
                 DrawFlipperPanel()
         endif
+        // be sure that the panel is onscreen
+        DoIgorMenu "Control","Retrieve Window"
 end
 
@@ -62 +64 @@
         
         PauseUpdate; Silent 1           // building window...
-        NewPanel /W=(1023,44,1832,526)/N=FlipperPanel/K=1 as "Flipper and Supermirror"
+        NewPanel /W=(250,44,1056,480)/N=FlipperPanel/K=1 as "Flipper and Supermirror"
         ModifyPanel cbRGB=(1,52428,26586)
         
-        PopupMenu popup_0,pos={32,18},size={49,20},title="Field Condition",proc=FlipperPanelPopMenuProc
+        PopupMenu popup_0,pos={13,8},size={49,20},title="Field Condition",proc=FlipperPanelPopMenuProc
         PopupMenu popup_0,mode=1,value= #"D_ConditionNameList()"
         
-        Button button_0,pos={42,310},size={100,20},proc=FlipperAverageButtonProc,title="Do Average"
-        
-        GroupBox group_0,pos={39,350},size={335,103},title="AVERAGED RESULTS",fSize=10
+        Button button_0,pos={18,288},size={100,20},proc=FlipperAverageButtonProc,title="Do Average"
+        
+        GroupBox group_0,pos={18,316},size={290,102},title="AVERAGED RESULTS",fSize=10
         GroupBox group_0,fStyle=1
-        SetVariable setvar_0,pos={49,385},size={250,15},title="Sam_depol*Psm*Pf"
+        SetVariable setvar_0,pos={33,351},size={250,15},title="Sam_depol*Psm*Pf"
         SetVariable setvar_0,fStyle=1
         SetVariable setvar_0,limits={0,0,0},value= root:Packages:NIST:Polarization:Cells:gPsmPf
-        SetVariable setvar_1,pos={49,417},size={250,15},title="Sam_depol*Psm",fStyle=1
+        SetVariable setvar_1,pos={33,383},size={250,15},title="Sam_depol*Psm",fStyle=1
         SetVariable setvar_1,limits={0,0,0},value= root:Packages:NIST:Polarization:Cells:gPsm
 //      SetVariable setvar_2,pos={560,518},size={200,13},title="Gamma (h)",fStyle=1
@@ -84 +86 @@
         
 
-        Button button_1,pos={320,17},size={120,20},proc=AddFlipperConditionButton,title="Add Condition"
-        Button button_2,pos={403,295},size={110,20},proc=ClearAllFlipperWavesButton,title="Clear Table"
-        Button button_3,pos={183,310},size={120,20},proc=ShowFlipperCalcButton,title="Show Calc"
-        Button button_4,pos={540,295},size={110,20},proc=ClearFlipperRowButton,title="Clear Row"
-        Button button_5,pos={620,18},size={30,20},proc=FlipperHelpParButtonProc,title="?"
-        Button button_6,pos={488,418},size={100,20},proc=WindowSnapshotButton,title="Snapshot"
-        Button button_7,pos={488,380},size={130,20},proc=ManualEnterPfPsmButton,title="Manual Entry"
-
+        Button button_1,pos={322,8},size={120,20},proc=AddFlipperConditionButton,title="Add Condition"
+        Button button_2,pos={482,323},size={110,20},proc=ClearAllFlipperWavesButton,title="Clear Table"
+        Button button_3,pos={330,288},size={110,20},proc=ShowFlipperCalcButton,title="Show Calc"
+        Button button_4,pos={482,288},size={110,20},proc=ClearFlipperRowButton,title="Clear Row"
+        Button button_5,pos={759,8},size={30,20},proc=FlipperHelpParButtonProc,title="?"
+        Button button_6,pos={328,358},size={110,20},proc=WindowSnapshotButton,title="Snapshot"
+        Button button_7,pos={331,323},size={110,20},proc=ManualEnterPfPsmButton,title="Manual Entry"
+
+        Button button_8,pos={615,288},size={110,20},proc=SaveFlipperPanelButton,title="Save State"
+        Button button_9,pos={615,323},size={110,20},proc=RestoreFlipperPanelButton,title="Restore State"
+        
         // table
-        Edit/W=(14,55,794,275)/HOST=# 
+        Edit/W=(14,40,794,275)/HOST=# 
         ModifyTable format=1,width=0
         RenameWindow #,T0
@@ -101 +106 @@
         return(0)
 End
+
+Function SaveFlipperPanelButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        SaveFlipperTable()
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+Function RestoreFlipperPanelButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        RestoreFlipperTable()
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
 
 // now, this does not depend on the cell, just the condition
@@ -1117 +1153 @@
         
         Variable refnum
-        String fname="CellParamSaveState.itx"
+        String fname="CellParamSaveState"
 //      WAVE w=root:testMat
         WAVE/T cellName=root:Packages:NIST:Polarization:Cells:CellName
@@ -1126 +1162 @@
         WAVE err_mu=root:Packages:NIST:Polarization:Cells:err_mu
         
-        Open/P=home refnum      //as fname              // creates a new file, or overwrites the existing file  
+        // get the full path to the new file name before creating it
+        fname = DoSaveFileDialog("Save the Cell Table",fname=fname,suffix=".itx")
+        If(cmpstr(fname,"")==0)
+                //user cancel, don't write out a file
+                Close/A
+                Abort "no data file was written"
+        Endif
+        
+        Open/P=home refnum      as fname                // creates a new file, or overwrites the existing file  
+        
         fprintf refNum,"IGOR\r"
         
@@ -1179 +1224 @@
         Variable num,ii,refnum
         
-        fname = "CellDecayPanelSaveState.itx"
+        fname = "CellDecayPanelSaveState"
         
         // get a list of the Decay waves
@@ -1186 +1231 @@
 //      print listStr
 
-        Open/P=home refnum      // as fname             // creates a new file, or overwrites the existing file  
+        // get the full path to the new file name before creating it
+        fname = DoSaveFileDialog("Save the Cell Decay Table",fname=fname,suffix=".itx")
+        If(cmpstr(fname,"")==0)
+                //user cancel, don't write out a file
+                Close/A
+                Abort "no data file was written"
+        Endif
+
+        Open/P=home refnum as fname             // creates a new file, or overwrites the existing file  
         fprintf refNum,"IGOR\r"
                         
@@ -1284 +1337 @@
         Variable num,ii,refnum
         
-        fname = "FlipperPanelSaveState.itx"
+        fname = "FlipperPanelSaveState"
         
         // get a list of the "Condition" waves
@@ -1291 +1344 @@
 //      print listStr
 
+        // get the full path to the new file name before creating it
+        fname = DoSaveFileDialog("Save the Flipper State Table",fname=fname,suffix=".itx")
+        If(cmpstr(fname,"")==0)
+                //user cancel, don't write out a file
+                Close/A
+                Abort "no data file was written"
+        Endif
+        
         Open/P=home refnum      // as fname             // creates a new file, or overwrites the existing file  
         fprintf refNum,"IGOR\r"

sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationCorrection.ipf

@@ -82 +82 @@
                 restore=Initialize_PolCorPanel()
                 PolCor_Panel()
+                
+                // be sure that the panel is onscreen
+                DoIgorMenu "Control","Retrieve Window"
+        
                 SetWindow PolCor_Panel hook(kill)=PolCorPanelHook               //to save the state when panel is killed
                 //disable the controls on other tabs
@@ -131 +135 @@
         Variable num,ii,refnum
         
-        fname = "PolCorPanelSaveState.itx"
+        fname = "PolCorPanelSaveState"
         
         // get a list of the List waves
@@ -138 +142 @@
 //      print listStr
 
+
+        // get the full path to the new file name before creating it
+        fname = DoSaveFileDialog("Save the Pol_Cor Panel State",fname=fname,suffix=".itx")
+        If(cmpstr(fname,"")==0)
+                //user cancel, don't write out a file
+                Close/A
+                Abort "no data file was written"
+        Endif
+        
+        
         Open/P=home refnum// as fname           // creates a new file, or overwrites the existing file  
         fprintf refNum,"IGOR\r"
@@ -327 +341 @@
 Window PolCor_Panel()
         PauseUpdate; Silent 1           // building window...
-        NewPanel /W=(925,44,1662,800) /K=1
+        NewPanel /W=(300,44,1036,624) /K=1 as "Polarization Correction"
         ModifyPanel cbRGB=(64349,63913,44660)
 //      ShowTools/A
         SetDrawEnv linethick= 2.00
-        DrawLine 10,510,600,510
-
-        TabControl PolCorTab,pos={15,27},size={708,401},proc=PolCorTabProc
+        DrawLine 11,427,696,427
+
+        TabControl PolCorTab,pos={15,20},size={515,360},proc=PolCorTabProc
         TabControl PolCorTab,tabLabel(0)="SAM",tabLabel(1)="EMP",tabLabel(2)="BGD"
         TabControl PolCorTab,value= 0
         
         // always visible
-        Button button0,pos={26,445},size={80,20},proc=LoadRawPolarizedButton,title="Load ..."
-        Button button1,pos={26,473},size={130,20},proc=PolCorButton,title="Pol Correct Data"
-        Button button2,pos={222,445},size={130,20},proc=ShowPolMatrixButton,title="Show Coef Matrix"
-        Button button3,pos={222,473},size={160,20},proc=ChangeDisplayedPolData,title="Change Displayed Data"
-        Button button4,pos={620,18},size={30,20},proc=PolCorHelpParButtonProc,title="?"
-        Button button12,pos={440,473},size={120,20},proc=Display4XSButton,title="Display 4 XS"
-        Button button13,pos={440,446},size={120,20},proc=ClearPolCorEntries,title="Clear Entries"
-
-
-
-        TitleBox title0,pos={100,66},size={24,24},title="\\f01UU or + +",fSize=12
-        TitleBox title1,pos={430,66},size={24,24},title="\\f01DU or - +",fSize=12
-        TitleBox title2,pos={100,250},size={25,24},title="\\f01DD or - -",fSize=12
-        TitleBox title3,pos={430,250},size={24,24},title="\\f01UD or + -",fSize=12
+        Button button0,pos={23,396},size={80,20},proc=LoadRawPolarizedButton,title="Load ..."
+        Button button1,pos={136,397},size={130,20},proc=PolCorButton,title="Pol Correct Data"
+        Button button2,pos={546,92},size={130,20},proc=ShowPolMatrixButton,title="Show Coef Matrix"
+        Button button3,pos={546,151},size={160,20},proc=ChangeDisplayedPolData,title="Change Display Data"
+        Button button4,pos={503,9},size={30,20},proc=PolCorHelpParButtonProc,title="?"
+        Button button12,pos={546,121},size={120,20},proc=Display4XSButton,title="Display 4 XS"
+        Button button13,pos={360,9},size={110,20},proc=ClearPolCorEntries,title="Clear Entries"
+
+
+        TitleBox title0,pos={100,48},size={24,24},title="\\f01UU or + +",fSize=12
+        TitleBox title1,pos={380,48},size={24,24},title="\\f01DU or - +",fSize=12
+        TitleBox title2,pos={100,210},size={25,24},title="\\f01DD or - -",fSize=12
+        TitleBox title3,pos={380,210},size={24,24},title="\\f01UD or + -",fSize=12
         
         // bits to set up reduction protocol
-        Button button5,pos={126,560},size={100,20},proc=PickDIVButton,title="set DIV file"
+        Button button5,pos={129,458},size={100,20},proc=PickDIVButton,title="set DIV file"
         Button button5,help={"This button will set the file selected in the File Catalog table to be the sensitivity file."}
-        Button button6,pos={126,590},size={100,20},proc=PickMASKButton,title="set MASK file"
+        Button button6,pos={129,482},size={100,20},proc=PickMASKButton,title="set MASK file"
         Button button6,help={"This button will set the file selected in the File Catalog table to be the mask file."}
-        Button button7,pos={126,620},size={110,20},proc=SetABSParamsButton,title="set ABS params"
+        Button button7,pos={129,506},size={110,20},proc=SetABSParamsButton,title="set ABS params"
         Button button7,help={"This button will prompt the user for absolute scaling parameters"}
-        Button button8,pos={126,650},size={150,20},proc=SetAverageParamsButtonProc,title="set AVERAGE params"
+        Button button8,pos={129,530},size={150,20},proc=SetAverageParamsButtonProc,title="set AVERAGE params"
         Button button8,help={"Prompts the user for the type of 1-D averaging to perform, as well as saving options"}
-        Button button9,pos={80,690},size={120,20},proc=ReducePolCorDataButton,title="Reduce Data"
+        Button button9,pos={581,515},size={120,20},proc=ReducePolCorDataButton,title="Reduce Data"
         Button button9,help={"Reduce PolCor data"}
-        Button button10,pos={226,690},size={120,20},proc=SavePolCorProtocolButton,title="Save Protocol"
+        Button button10,pos={581,460},size={120,20},proc=SavePolCorProtocolButton,title="Save Protocol"
         Button button10,help={"Save the PolCor protocol, within this experiment only"}
-        Button button11,pos={370,690},size={120,20},proc=RecallPolCorProtocolButton,title="Recall Protocol"
-        Button button11,help={"Recall a PolCor protocol from memory"}           
-        Button button14,pos={226,720},size={120,20},proc=ExportPolCorProtocolButton,title="Export Protocol"
+        Button button11,pos={546,333},size={120,20},proc=RecallPolCorProtocolButton,title="Recall Protocol"
+        Button button11,help={"Recall a PolCor protocol from memory"}
+        Button button14,pos={546,303},size={120,20},proc=ExportPolCorProtocolButton,title="Export Protocol"
         Button button14,help={"Export the PolCor protocol, saving it on disk"}
-        Button button15,pos={370,720},size={120,20},proc=ImportPolCorProtocolButton,title="Import Protocol"
+        Button button15,pos={546,363},size={120,20},proc=ImportPolCorProtocolButton,title="Import Protocol"
         Button button15,help={"Import a PolCor protocol from a protocol previously saved to disk"}
-                
-        SetVariable setvar0,pos={322,560},size={250,15},title="file:"
+        Button button16,pos={546,216},size={110,20},proc=SavePolCorPanelButton,title="Save State"
+        Button button16,help={"Save the state of the panel for later recall"}
+        Button button17,pos={546,245},size={110,20},proc=RestorePolCorPanelButton,title="Restore State"
+        Button button17,help={"Recall a saved state of the Pol_Cor panel"}
+                        
+        SetVariable setvar0,pos={303,458},size={250,15},title="file:"
         SetVariable setvar0,help={"Filename of the detector sensitivity file to be used in the data reduction"}
-        SetVariable setvar0,limits={-Inf,Inf,0},value= root:myGlobals:Protocols:gDIV
-        SetVariable setvar1,pos={322,590},size={250,15},title="file:"
+        SetVariable setvar0,limits={-inf,inf,0},value= root:myGlobals:Protocols:gDIV
+        SetVariable setvar1,pos={303,483},size={250,15},title="file:"
         SetVariable setvar1,help={"Filename of the mask file to be used in the data reduction"}
-        SetVariable setvar1,limits={-Inf,Inf,0},value= root:myGlobals:Protocols:gMASK
-        SetVariable setvar2,pos={322,620},size={250,15},title="parameters:"
+        SetVariable setvar1,limits={-inf,inf,0},value= root:myGlobals:Protocols:gMASK
+        SetVariable setvar2,pos={303,509},size={250,15},title="parameters:"
         SetVariable setvar2,help={"Keyword-string of values necessary for absolute scaling of data. Remaining parameters are taken from the sample file."}
-        SetVariable setvar2,limits={-Inf,Inf,0},value= root:myGlobals:Protocols:gAbsStr 
-        SetVariable setvar3,pos={322,650},size={250,15},title="parameters:"
+        SetVariable setvar2,limits={-inf,inf,0},value= root:myGlobals:Protocols:gAbsStr
+        SetVariable setvar3,pos={303,535},size={250,15},title="parameters:"
         SetVariable setvar3,help={"Keyword-string of choices used for averaging and saving the 1-D data files"}
-        SetVariable setvar3,limits={-Inf,Inf,0},value= root:myGlobals:Protocols:gAVE    
-        
-        CheckBox check0,pos={10,560},size={72,14},title="Sensitivity"
+        SetVariable setvar3,limits={-inf,inf,0},value= root:myGlobals:Protocols:gAVE
+        
+        CheckBox check0,pos={13,463},size={63,14},title="Sensitivity"
         CheckBox check0,help={"If checked, the specified detector sensitivity file will be included in the data reduction. If the file name is \"ask\", then the user will be prompted for the file"}
         CheckBox check0,value= 1
-        CheckBox check1,pos={10,590},size={72,14},title="Mask"
-        CheckBox check1,help={""}
-        CheckBox check1,value= 1
-        CheckBox check2,pos={10,620},size={72,14},title="Absolute Scale"
-        CheckBox check2,help={""}
-        CheckBox check2,value= 1
-        CheckBox check3,pos={10,650},size={72,14},title="Average and Save"
-        CheckBox check3,help={""}
-        CheckBox check3,value= 1                
-        CheckBox check4,pos={10,530},size={72,14},title="Use EMP?"
-        CheckBox check4,help={""}
-        CheckBox check4,value= 1        
-        CheckBox check5,pos={100,530},size={72,14},title="Use BGD?"
-        CheckBox check5,help={""}
-        CheckBox check5,value= 1        
-
+        CheckBox check1,pos={13,486},size={39,14},title="Mask",value= 1
+        CheckBox check2,pos={13,509},size={82,14},title="Absolute Scale",value= 1
+        CheckBox check3,pos={13,532},size={96,14},title="Average and Save",value= 1
+        CheckBox check4,pos={13,436},size={59,14},title="Use EMP?",value= 1
+        CheckBox check5,pos={103,436},size={60,14},title="Use BGD?",value= 1
         
 
 // SAM Tab      
-        PopupMenu popup_0_1,pos={230,60},size={102,20},title="Condition"
+        PopupMenu popup_0_1,pos={190,45},size={102,20},title="Condition"
         PopupMenu popup_0_1, mode=1,popvalue="none",value= #"P_GetConditionNameList()"
         // UU
-        ListBox ListBox_0_UU,pos={34,102},size={200,130},proc=PolCor_FileListBoxProc,frame=2
+        ListBox ListBox_0_UU,pos={34,80},size={200,120},proc=PolCor_FileListBoxProc,frame=2
         ListBox ListBox_0_UU,listWave=root:Packages:NIST:Polarization:ListWave_0_UU,titleWave=root:Packages:NIST:Polarization:lbTitles
         ListBox ListBox_0_UU,selWave=root:Packages:NIST:Polarization:lbSelWave_0_UU,mode= 6,selRow= 0,selCol= 0,editStyle= 2
@@ -436 +442 @@
 
         // DU
-        ListBox ListBox_0_DU,pos={368,102},size={200,130},proc=PolCor_FileListBoxProc,frame=2
+        ListBox ListBox_0_DU,pos={310,80},size={200,120},proc=PolCor_FileListBoxProc,frame=2
         ListBox ListBox_0_DU,listWave=root:Packages:NIST:Polarization:ListWave_0_DU,titleWave=root:Packages:NIST:Polarization:lbTitles
         ListBox ListBox_0_DU,selWave=root:Packages:NIST:Polarization:lbSelWave_0_DU,mode= 6,selRow= 0,selCol= 0,editStyle= 2
@@ -461 +467 @@
 
 // DD
-        ListBox ListBox_0_DD,pos={33,286},size={200,130},proc=PolCor_FileListBoxProc,frame=2
+        ListBox ListBox_0_DD,pos={33,245},size={200,120},proc=PolCor_FileListBoxProc,frame=2
         ListBox ListBox_0_DD,listWave=root:Packages:NIST:Polarization:ListWave_0_DD,titleWave=root:Packages:NIST:Polarization:lbTitles
         ListBox ListBox_0_DD,selWave=root:Packages:NIST:Polarization:lbSelWave_0_DD,mode= 6,selRow= 0,selCol= 0,editStyle= 2
@@ -486 +492 @@
         
 // UD
-        ListBox ListBox_0_UD,pos={368,286},size={200,130},proc=PolCor_FileListBoxProc,frame=2
+        ListBox ListBox_0_UD,pos={310,245},size={200,120},proc=PolCor_FileListBoxProc,frame=2
         ListBox ListBox_0_UD,listWave=root:Packages:NIST:Polarization:ListWave_0_UD,titleWave=root:Packages:NIST:Polarization:lbTitles
         ListBox ListBox_0_UD,selWave=root:Packages:NIST:Polarization:lbSelWave_0_UD,mode= 6,selRow= 0,selCol= 0,editStyle= 2
@@ -512 +518 @@
 
 // EMP Tab
-        PopupMenu popup_1_1,pos={230,60},size={102,20},title="Condition"
+        PopupMenu popup_1_1,pos={190,45},size={102,20},title="Condition"
         PopupMenu popup_1_1, mode=1,popvalue="none",value= #"P_GetConditionNameList()"  
         // UU
-        ListBox ListBox_1_UU,pos={34,102},size={200,130},proc=PolCor_FileListBoxProc,frame=2
+        ListBox ListBox_1_UU,pos={34,80},size={200,120},proc=PolCor_FileListBoxProc,frame=2
         ListBox ListBox_1_UU,listWave=root:Packages:NIST:Polarization:ListWave_1_UU,titleWave=root:Packages:NIST:Polarization:lbTitles
         ListBox ListBox_1_UU,selWave=root:Packages:NIST:Polarization:lbSelWave_1_UU,mode= 6,selRow= 0,selCol= 0,editStyle= 2
@@ -540 +546 @@
 
         // DU
-        ListBox ListBox_1_DU,pos={368,102},size={200,130},proc=PolCor_FileListBoxProc,frame=2
+        ListBox ListBox_1_DU,pos={310,80},size={200,120},proc=PolCor_FileListBoxProc,frame=2
         ListBox ListBox_1_DU,listWave=root:Packages:NIST:Polarization:ListWave_1_DU,titleWave=root:Packages:NIST:Polarization:lbTitles
         ListBox ListBox_1_DU,selWave=root:Packages:NIST:Polarization:lbSelWave_1_DU,mode= 6,selRow= 0,selCol= 0,editStyle= 2
@@ -565 +571 @@
 
 // DD
-        ListBox ListBox_1_DD,pos={33,286},size={200,130},proc=PolCor_FileListBoxProc,frame=2
+        ListBox ListBox_1_DD,pos={33,245},size={200,120},proc=PolCor_FileListBoxProc,frame=2
         ListBox ListBox_1_DD,listWave=root:Packages:NIST:Polarization:ListWave_1_DD,titleWave=root:Packages:NIST:Polarization:lbTitles
         ListBox ListBox_1_DD,selWave=root:Packages:NIST:Polarization:lbSelWave_1_DD,mode= 6,selRow= 0,selCol= 0,editStyle= 2
@@ -590 +596 @@
 
 // UD
-        ListBox ListBox_1_UD,pos={368,286},size={200,130},proc=PolCor_FileListBoxProc,frame=2
+        ListBox ListBox_1_UD,pos={310,245},size={200,120},proc=PolCor_FileListBoxProc,frame=2
         ListBox ListBox_1_UD,listWave=root:Packages:NIST:Polarization:ListWave_1_UD,titleWave=root:Packages:NIST:Polarization:lbTitles
         ListBox ListBox_1_UD,selWave=root:Packages:NIST:Polarization:lbSelWave_1_UD,mode= 6,selRow= 0,selCol= 0,editStyle= 2
@@ -618 +624 @@
 // file is necessary - this is "incorrectly" labeled as UU. I'll get around to changing this in the future...
 //
-        TitleBox title_2_UU,pos={350,100},size={400,48},title="\\f01BGD files are independent of polarization\rEnter all as UU",fSize=12
+        TitleBox title_2_UU,pos={250,100},size={400,48},title="\\f01BGD files are independent of polarization\rEnter all as UU",fSize=12
 
 
         // UU
-        ListBox ListBox_2_UU,pos={34,102},size={200,130},proc=PolCor_FileListBoxProc,frame=2
+        ListBox ListBox_2_UU,pos={34,80},size={200,120},proc=PolCor_FileListBoxProc,frame=2
         ListBox ListBox_2_UU,listWave=root:Packages:NIST:Polarization:ListWave_2_UU,titleWave=root:Packages:NIST:Polarization:lbTitles
         ListBox ListBox_2_UU,selWave=root:Packages:NIST:Polarization:lbSelWave_2_UU,mode= 6,selRow= 0,selCol= 0,editStyle= 2
@@ -722 +728 @@
 
 EndMacro
+
+Function SavePolCorPanelButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        SavePolCorPanelState()
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+Function RestorePolCorPanelButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        RestorePolCorPanelState()
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+
 
 // action procedure for the list box that allows the popup menu

sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationPanels.ipf

@@ -144 +144 @@
                 DrawCellParamPanel()
         endif
-
+        // be sure that the panel is onscreen
+        DoIgorMenu "Control","Retrieve Window"
 end
 
@@ -282 +283 @@
         
         PauseUpdate; Silent 1           // building window...
-        NewPanel /W=(775,44,1375,377)/N=CellParamPanel/K=1 as "Fundamental Cell Parameters"
+        NewPanel /W=(150,44,750,377)/N=CellParamPanel/K=1 as "Fundamental Cell Parameters"
         ModifyPanel cbRGB=(65535,49151,55704)
         ModifyPanel fixedSize=1
@@ -289 +290 @@
         Button button_0,pos={10,10},size={90,20},proc=AddCellButtonProc,title="Add Cell"
         Button button_1,pos={118,10},size={160,20},proc=SaveCellParButtonProc,title="Update Parameters"
-        Button button_2,pos={300,10},size={130,20},proc=RevertCellParButtonProc,title="Revert Parameters"
+        Button button_2,pos={118,35},size={130,20},proc=RevertCellParButtonProc,title="Revert Parameters"
         Button button_3,pos={520,10},size={35,20},proc=CellHelpParButtonProc,title="?"
 
-        
-        Edit/W=(14,55,582,318)/HOST=#
+        Button button_4,pos={324,10},size={100,20},proc=SaveCellPanelButton,title="Save State"
+        Button button_5,pos={324,35},size={100,20},proc=RestoreCellPanelButton,title="Restore State"
+        
+        Edit/W=(14,60,582,318)/HOST=#
         ModifyTable width(Point)=0
         RenameWindow #,T0
@@ -306 +309 @@
         return(0)
 End
+
+
+Function SaveCellPanelButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        SaveCellParameterTable()
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+Function RestoreCellPanelButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        RestoreCellParameterTable()
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+
+
 
 Function CellHelpParButtonProc(ba) : ButtonControl
@@ -415 +452 @@
                 DecayParamPanel()
         endif
+        // be sure that the panel is onscreen
+        DoIgorMenu "Control","Retrieve Window"
 end
 
@@ -441 +480 @@
         
         PauseUpdate; Silent 1           // building window...
-        NewPanel /W=(759,44,1572,713)/N=DecayPanel/K=1 as "Cell Decay Parameters"
+        NewPanel /W=(200,44,1013,664)/N=DecayPanel/K=1 as "Cell Decay Parameters"
         ModifyPanel cbRGB=(32768,54615,65535)
 //      Button button_3,pos={505,16},size={35,20},proc=DecayHelpParButtonProc,title="?"
-        PopupMenu popup_0,pos={32,18},size={49,20},title="Cell",proc=DecayPanelPopMenuProc
+        PopupMenu popup_0,pos={32,8},size={49,20},title="Cell",proc=DecayPanelPopMenuProc
         PopupMenu popup_0,mode=1,value= #"D_CellNameList()"
         
-        Button button_0,pos={584,365},size={70,20},proc=DecayFitButtonProc,title="Do Fit"
-        
-        GroupBox group_0,pos={550,399},size={230,149},title="FIT RESULTS",fSize=10
+        Button button_0,pos={560,294},size={70,20},proc=DecayFitButtonProc,title="Do Fit"
+        
+        GroupBox group_0,pos={560,329},size={230,149},title="FIT RESULTS",fSize=10
         GroupBox group_0,fStyle=1
-        SetVariable setvar_0,pos={560,428},size={200,13},title="muPo of 3He"
+        SetVariable setvar_0,pos={570,358},size={200,13},title="muPo of 3He"
         SetVariable setvar_0,fStyle=1,limits={0,0,0},barmisc={0,1000}
         SetVariable setvar_0,value= root:Packages:NIST:Polarization:Cells:gMuPo
-        SetVariable setvar_1,pos={560,460},size={200,13},title="Po of 3He"
+        SetVariable setvar_1,pos={570,390},size={200,13},title="Po of 3He"
         SetVariable setvar_1,fStyle=1,limits={0,0,0},barmisc={0,1000}
         SetVariable setvar_1,value= root:Packages:NIST:Polarization:Cells:gPo
-        SetVariable setvar_2,pos={560,518},size={200,13},title="Gamma (h)",fStyle=1
+        SetVariable setvar_2,pos={570,448},size={200,13},title="Gamma (h)",fStyle=1
         SetVariable setvar_2,limits={0,0,0},barmisc={0,1000}
         SetVariable setvar_2,value= root:Packages:NIST:Polarization:Cells:gGamma
-        SetVariable setvar_3,pos={560,488},size={200,15},title="T0",fStyle=1
+        SetVariable setvar_3,pos={570,418},size={200,13},title="T0",fStyle=1
         SetVariable setvar_3,limits={0,0,0},value= root:Packages:NIST:Polarization:Cells:gT0
         
 
-        Button button_1,pos={579,294},size={120,20},proc=CalcRowParamButton,title="Calculate Rows"
-        Button button_2,pos={307,18},size={110,20},proc=ClearDecayWavesButton,title="Clear Table"
-        Button button_3,pos={579,333},size={120,20},proc=ShowCalcRowButton,title="Show Calc"
-        Button button_4,pos={440,18},size={110,20},proc=ClearDecayWavesRowButton,title="Clear Row"
-        Button button_5,pos={620,18},size={40,20},proc=DecayHelpParButtonProc,title="?"
-        Button button_6,pos={620,620},size={100,20},proc=WindowSnapshotButton,title="Snapshot"
-        Button button_7,pos={620,580},size={130,20},proc=ManualEnterDecayButton,title="Manual Entry"
-        CheckBox check0,mode=0,pos={600,550},title="Overrride T0?",value=0
+        Button button_1,pos={560,262},size={120,20},proc=CalcRowParamButton,title="Calculate Rows"
+        Button button_2,pos={307,8},size={110,20},proc=ClearDecayWavesButton,title="Clear Table"
+        Button button_3,pos={560,519},size={110,20},proc=ShowCalcRowButton,title="Show Calc"
+        Button button_4,pos={440,8},size={110,20},proc=ClearDecayWavesRowButton,title="Clear Row"
+        Button button_5,pos={620,8},size={40,20},proc=DecayHelpParButtonProc,title="?"
+        Button button_6,pos={560,574},size={110,20},proc=WindowSnapshotButton,title="Snapshot"
+        Button button_7,pos={560,547},size={110,20},proc=ManualEnterDecayButton,title="Manual Entry"
+        Button button_8,pos={690,547},size={110,20},proc=SaveDecayPanelButton,title="Save State"
+        Button button_9,pos={690,574},size={110,20},proc=RestoreDecayPanelButton,title="Restore State"
+        CheckBox check0,mode=0,pos={560,480},title="Overrride T0?",value=0
 
 
         // table
-        Edit/W=(14,55,794,275)/HOST=# 
+        Edit/W=(14,35,794,240)/HOST=# 
         ModifyTable format=1,width=0
         RenameWindow #,T0
@@ -481 +522 @@
         
         // graph
-        Display/W=(15,291,540,652)/HOST=#  //root:yy vs root:xx
+        Display/W=(15,250,540,610)/HOST=#  //root:yy vs root:xx
         ModifyGraph frameStyle=2
         ModifyGraph mode=4
@@ -1422 +1463 @@
 End
 
+Function SaveDecayPanelButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        SaveCellDecayTable()
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+Function RestoreDecayPanelButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        RestoreCellDecayTable()
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
 // null condition is not right. if the loop fails, then the 
 // retStr will be ";;;;", not zero length. What's the proper test?

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

@@ -96 +96 @@
 //
 
+Static Constant MODE_STREAM = 0
+Static Constant MODE_OSCILL = 1
+Static Constant MODE_TISANE = 2
+Static Constant MODE_TOF = 3
+
 //Menu "Macros"
 //      "Split Large File",SplitBigFile()
@@ -132 +137 @@
         Variable/G root:Packages:NIST:gEvent_logint = 1
 
-        Variable/G root:Packages:NIST:gEvent_Mode = 0                           // ==0 for "stream", ==1 for Oscillatory
+        Variable/G root:Packages:NIST:gEvent_Mode = MODE_OSCILL                         // ==0 for "stream", ==1 for Oscillatory
         Variable/G root:Packages:NIST:gRemoveBadEvents = 1              // ==1 to remove "bad" events, ==0 to read "as-is"
         Variable/G root:Packages:NIST:gSortStreamEvents = 0             // ==1 to sort the event stream, a last resort for a stream of data
@@ -146 +151 @@
         Duplicate/O slicedData logslicedData
         Duplicate/O slicedData dispsliceData
+
+
+// for decimation
+        Variable/G root:Packages:NIST:Event:gDecimation = 100
+        Variable/G root:Packages:NIST:gEvent_t_longest_decimated = 0
+
+// for large file splitting
+        String/G root:Packages:NIST:Event:gSplitFileList = ""           // a list of the file names as split
         
         SetDataFolder root:
 End
 
+//
+// -- extra bits of buttons... not used
+//
+//      Button button9 title="Decimation",size={100,20},pos={490,400},proc=E_ShowDecimateButton
+//
+//      Button button11,pos={490,245},size={150,20},proc=LoadDecimateButtonProc,title="Load and Decimate"
+//      Button button12,pos={490,277},size={150,20},proc=ConcatenateButtonProc,title="Concatenate"
+//      Button button13,pos={490,305},size={150,20},proc=DisplayConcatenatedButtonProc,title="Display Concatenated"
+//      
+//      GroupBox group0 title="Manual Controls",size={185,112},pos={490,220}
+//
+//      NewPanel /W=(82,44,854,664)/N=EventModePanel/K=2
+//      DoWindow/C EventModePanel
+//      ModifyPanel fixedSize=1,noEdit =1
 Proc EventModePanel()
         PauseUpdate; Silent 1           // building window...
-        NewPanel /W=(100,50,600,840)/N=EventModePanel/K=2
+        NewPanel /W=(82,44,854,664)/N=EventModePanel/K=2
         DoWindow/C EventModePanel
         ModifyPanel fixedSize=1,noEdit =1
-        //ShowTools/A
+
         SetDrawLayer UserBack
-        Button button0,pos={10,10}, size={150,20},title="Load Event Log File",fSize=12
-        Button button0,proc=LoadEventLog_Button
-        
-        TitleBox tb1,pos={20,650},size={460,80},fSize=12
-        TitleBox tb1,variable=root:Packages:NIST:gEventDisplayString
-        
-        CheckBox chkbox1,pos={170,8},title="Oscillatory Mode?"
-        CheckBox chkbox1,variable = root:Packages:NIST:gEvent_mode
-        CheckBox chkbox3,pos={170,27},title="Remove Bad Events?"
-        CheckBox chkbox3,variable = root:Packages:NIST:gRemoveBadEvents
-        
-        Button doneButton,pos={435,12}, size={50,20},title="Done",fSize=12
-        Button doneButton,proc=EventDone_Proc
-
-        Button button2,pos={20,122},size={140,20},proc=ShowEventDataButtonProc,title="Show Event Data"
-        Button button3,pos={20,147},size={140,20},proc=ShowBinDetailsButtonProc,title="Show Bin Details"
-        Button button4,pos={175,122},size={140,20},proc=UndoTimeSortButtonProc,title="Undo Time Sort"
-        Button button5,pos={175,147},size={140,20},proc=ExportSlicesButtonProc,title="Export Slices as VAX"
-        Button button6,pos={378,13},size={40,20},proc=EventModeHelpButtonProc,title="?"
-
-        Button button7,pos={175+155,122},size={140,20},proc=AdjustEventDataButtonProc,title="Adjust Events"
-        Button button8,pos={175+155,147},size={140,20},proc=CustomBinButtonProc,title="Custom Bins"
-        
-        Button button1,pos = {10,50}, size={150,20},title="Process Data",fSize=12
-        Button button1,proc=ProcessEventLog_Button
-        SetVariable setvar1,pos={170,50},size={160,20},title="Number of slices",fSize=12,limits={1,1000,1}
-        SetVariable setvar1,value=root:Packages:NIST:gEvent_nslices
-        SetVariable setvar2,pos={330,50},size={160,20},title="Max Time (s)",fSize=12
-        SetVariable setvar2,value=root:Packages:NIST:gEvent_t_longest
-        
-        PopupMenu popup0 title="Bin Spacing",pos={150,90},value="Equal;Fibonacci;Custom;"
-        PopupMenu popup0 proc=BinTypePopMenuProc
-        
-        CheckBox chkbox2,pos={20,95},title="Log Intensity",value=1
-        CheckBox chkbox2,variable=root:Packages:NIST:gEvent_logint,proc=LogIntEvent_Proc
-        SetVariable setvar0,pos={320,90},size={160,20},title="Display Time Slice",fSize=12
-        SetVariable setvar0,limits={0,1000,1},value= root:Packages:NIST:gEvent_tsdisp
-        SetVariable setvar0,proc=sliceSelectEvent_Proc
-        Display/W=(20,180,480,640)/HOST=EventModePanel/N=Event_slicegraph
-        AppendImage/W=EventModePanel#Event_slicegraph/T root:Packages:NIST:Event:dispsliceData
-        ModifyImage/W=EventModePanel#Event_slicegraph  ''#0 ctab= {*,*,ColdWarm,0}
-        ModifyImage/W=EventModePanel#Event_slicegraph ''#0 ctabAutoscale=3
+        DrawText 479,345,"Stream Data"
+        DrawLine 563,338,731,338
+        DrawText 479,419,"Oscillatory Data"
+        DrawLine 578,411,731,411
+
+//      ShowTools/A
+        Button button0,pos={14,87},size={150,20},proc=LoadEventLog_Button,title="Load Event Log File"
+        Button button0,fSize=12
+        TitleBox tb1,pos={475,500},size={135,24},fSize=10
+        TitleBox tb1,variable= root:Packages:NIST:gEventDisplayString
+
+        CheckBox chkbox2,pos={376,151},size={81,14},proc=LogIntEvent_Proc,title="Log Intensity"
+        CheckBox chkbox2,fSize=10,variable= root:Packages:NIST:gEvent_logint
+        CheckBox chkbox3,pos={14,125},size={119,14},title="Remove Bad Events?",fSize=10
+        CheckBox chkbox3,variable= root:Packages:NIST:gRemoveBadEvents
+        
+        Button doneButton,pos={708,36},size={50,20},proc=EventDone_Proc,title="Done"
+        Button doneButton,fSize=12
+        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
+        
+        SetVariable setvar0,pos={208,149},size={160,16},proc=sliceSelectEvent_Proc,title="Display Time Slice"
+        SetVariable setvar0,fSize=10
+        SetVariable setvar0,limits={0,1000,1},value= root:Packages:NIST:gEvent_tsdisp   
+        SetVariable setvar1,pos={206,26},size={160,16},title="Number of slices",fSize=10
+        SetVariable setvar1,limits={1,1000,1},value= root:Packages:NIST:gEvent_nslices
+        SetVariable setvar2,pos={206,51},size={160,16},title="Max Time (s)",fSize=10
+        SetVariable setvar2,value= root:Packages:NIST:gEvent_t_longest
+        
+        PopupMenu popup0,pos={206,74},size={119,20},proc=BinTypePopMenuProc,title="Bin Spacing"
+        PopupMenu popup0,fSize=10
+        PopupMenu popup0,mode=1,popvalue="Equal",value= #"\"Equal;Fibonacci;Custom;\""
+
+        Button button10,pos={488,305},size={100,20},proc=SplitFileButtonProc,title="Split Big File"
+        Button button14,pos={488,350},size={130,20},proc=Stream_LoadDecim,title="Load From List"
+        SetVariable setvar3,pos={487,378},size={150,16},title="Decimation factor"
+        SetVariable setvar3,fSize=10
+        SetVariable setvar3,limits={1,inf,1},value= root:Packages:NIST:Event:gDecimation
+
+        Button button15_0,pos={488,425},size={110,20},proc=AccumulateSlicesButton,title="Add First Slice"
+        Button button16_1,pos={488,450},size={110,20},proc=AccumulateSlicesButton,title="Add Next Slice"
+        Button button17_2,pos={620,425},size={110,20},proc=AccumulateSlicesButton,title="Display Total"
+
+
+        CheckBox chkbox1_0,pos={25,34},size={69,14},title="Oscillatory",fSize=10
+        CheckBox chkbox1_0,mode=1,proc=EventModeRadioProc,value=1
+        CheckBox chkbox1_1,pos={25,59},size={53,14},title="Stream",fSize=10
+        CheckBox chkbox1_1,proc=EventModeRadioProc,value=0,mode=1
+        CheckBox chkbox1_2,pos={104,59},size={53,14},title="TISANE",fSize=10
+        CheckBox chkbox1_2,proc=EventModeRadioProc,value=0,mode=1
+        CheckBox chkbox1_3,pos={104,34},size={37,14},title="TOF",fSize=10
+        CheckBox chkbox1_3,proc=EventModeRadioProc,value=0,mode=1
+        
+        GroupBox group0_0,pos={5,5},size={174,112},title="Mode",fSize=12,fStyle=1
+        GroupBox group0_1,pos={192,5},size={192,123},title="Binning",fSize=12,fStyle=1
+        GroupBox group0_2,pos={403,5},size={173,109},title="Viewing",fSize=12,fStyle=1
+        GroupBox group0_3,pos={476,169},size={277,92},title="Editing",fSize=12,fStyle=1
+        GroupBox group0_4,pos={474,278},size={279,200},title="Big Files",fSize=12
+        GroupBox group0_4,fStyle=1
+        
+        Display/W=(10,170,460,610)/HOST=# 
+        AppendImage/T :Packages:NIST:Event:dispsliceData
+        ModifyImage dispsliceData ctab= {*,*,ColdWarm,0}
+        ModifyImage dispsliceData ctabAutoscale=3
         ModifyGraph margin(left)=14,margin(bottom)=14,margin(top)=14,margin(right)=14
         ModifyGraph mirror=2
@@ -208 +264 @@
         ModifyGraph btLen=3
         ModifyGraph tlOffset=-2
-        SetAxis/A left
+        RenameWindow #,Event_slicegraph
         SetActiveSubwindow ##
 EndMacro
 
+
+
+
+// mode selector
+//Static Constant MODE_STREAM = 0
+//Static Constant MODE_OSCILL = 1
+//Static Constant MODE_TISANE = 2
+//Static Constant MODE_TOF = 3
+//
+Function EventModeRadioProc(name,value)
+        String name
+        Variable value
+        
+        NVAR gEventModeRadioVal= root:Packages:NIST:gEvent_mode
+        
+        strswitch (name)
+                case "chkbox1_0":
+                        gEventModeRadioVal= MODE_OSCILL
+                        break
+                case "chkbox1_1":
+                        gEventModeRadioVal= MODE_STREAM
+                        break
+                case "chkbox1_2":
+                        gEventModeRadioVal= MODE_TISANE
+                        break
+                case "chkbox1_3":
+                        gEventModeRadioVal= MODE_TOF
+                        break
+        endswitch
+        CheckBox chkbox1_0,value= gEventModeRadioVal==MODE_OSCILL
+        CheckBox chkbox1_1,value= gEventModeRadioVal==MODE_STREAM
+        CheckBox chkbox1_2,value= gEventModeRadioVal==MODE_TISANE
+        CheckBox chkbox1_3,value= gEventModeRadioVal==MODE_TOF
+
+        return(0)
+End
 
 Function AdjustEventDataButtonProc(ba) : ButtonControl
@@ -363 +455 @@
         NVAR mode=root:Packages:NIST:gEvent_Mode
         
-        if(mode == 0)
+        if(mode == MODE_STREAM)
                 Stream_ProcessEventLog("")
         endif
         
-        if(mode == 1)
+        if(mode == MODE_OSCILL)
                 Osc_ProcessEventLog("")
         endif
@@ -776 +868 @@
 //
 // Would TISANE or TOF need a different loader?
-//
+//      
 Function LoadEventLog_Button(ctrlName) : ButtonControl
         String ctrlName
@@ -782 +874 @@
         NVAR mode=root:Packages:NIST:gEvent_mode
         Variable err=0
-        
-        if(mode == 0)
-                err = Stream_LoadEventLog("")
-                if(err == 1)
-                        return(0)               // user cancelled from file load
-                endif
-        endif
-        
-        if(mode == 1)
-                err = Osc_LoadEventLog("")
-                if(err == 1)
-                        return(0)               // user cancelled from file load
-                endif
-        endif
-
-        STRUCT WMButtonAction ba
-        ba.eventCode = 2
-        ShowEventDataButtonProc(ba)
-
-        return(0)
-End
-
-// for the mode of "one continuous exposure"
-//
-Function Stream_LoadEventLog(ctrlName)
-        String ctrlName
-        
-        Variable fileref
+        Variable fileref,totBytes
+        Variable fileTooLarge = 150             //limit load to 150MB
 
         SVAR filename = root:Packages:NIST:gEvent_logfile
@@ -816 +882 @@
         
         String fileFilters = "All Files:.*;Data Files (*.txt):.txt;"
+        String abortStr
         
         Open/R/D/F=fileFilters fileref
@@ -824 +891 @@
                 return(1)
         endif
+        
+/// Abort if the files are too large
+        Open/R fileref as fileName
+                FStatus fileref
+        Close fileref
+
+        totBytes = V_logEOF/1e6         //in MB
+        if(totBytes > fileTooLarge)
+                sprintf abortStr,"File is %g MB, larger than the limit of %g MB. Split and Decimate.",totBytes,fileTooLarge
+                Abort abortStr
+        endif
+        
 
 #if (exists("EventLoadWave")==4)
@@ -833 +912 @@
         SetDataFolder root:Packages:NIST:Event:
 
-tic()
+//tic()
         Wave timePt=timePt
         Wave xLoc=xLoc
         Wave yLoc=yLoc
-        CleanupTimes(xLoc,yLoc,timePt)          //remove zeroes
-        
-toc()
-
-        Duplicate/O timePt rescaledTime
-        rescaledTime = 1e-7*(timePt-timePt[0])          //convert to seconds and start from zero
-        t_longest = waveMax(rescaledTime)               //should be the last point
+        CleanupTimes(xLoc,yLoc,timePt)          //remove zeroes 
+//toc()
+        
+        
+/////
+// now do a little processing of the times based on the type of data
+//      
+        if(mode == MODE_STREAM)         // continuous "Stream" mode - start from zero
+                Duplicate/O timePt rescaledTime
+                rescaledTime = 1e-7*(timePt-timePt[0])          //convert to seconds and start from zero
+                t_longest = waveMax(rescaledTime)               //should be the last point      
+        endif
+        
+        if(mode == MODE_OSCILL)         // oscillatory 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:
 
+        STRUCT WMButtonAction ba
+        ba.eventCode = 2
+        ShowEventDataButtonProc(ba)
+
         return(0)
 End
 
-// for the mode "oscillatory"
-//
-Function Osc_LoadEventLog(ctrlName)
-        String ctrlName
-        
-        Variable fileref
-
-        SVAR filename = root:Packages:NIST:gEvent_logfile
-        NVAR nslices = root:Packages:NIST:gEvent_nslices
-        NVAR t_longest = root:Packages:NIST:gEvent_t_longest
-        
-        String fileFilters = "All Files:.*;Data Files (*.txt):.txt;"
-        
-        Open/R/D/F=fileFilters fileref
-        filename = S_filename
-                if(strlen(S_filename) == 0)
-                // user cancelled
-                DoAlert 0,"No file selected, no file loaded."
-                return(1)
-        endif
-        
-#if (exists("EventLoadWave")==4)
-        LoadEvents_XOP()
-#else
-        LoadEvents()
-#endif  
-        
-        SetDataFolder root:Packages:NIST:Event:
-
-        Wave timePt=timePt
-        Wave xLoc=xLoc
-        Wave yLoc=yLoc
-        CleanupTimes(xLoc,yLoc,timePt)          //remove zeroes
-        
-        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
-
-        SetDataFolder root:
-
-        return(0)
-End
+//// for the mode of "one continuous exposure"
+////
+//Function Stream_LoadEventLog(ctrlName)
+//      String ctrlName
+//      
+//      Variable fileref
+//
+//      SVAR filename = root:Packages:NIST:gEvent_logfile
+//      NVAR nslices = root:Packages:NIST:gEvent_nslices
+//      NVAR t_longest = root:Packages:NIST:gEvent_t_longest
+//      
+//      String fileFilters = "All Files:.*;Data Files (*.txt):.txt;"
+//      
+//      Open/R/D/F=fileFilters fileref
+//      filename = S_filename
+//      if(strlen(S_filename) == 0)
+//              // user cancelled
+//              DoAlert 0,"No file selected, no file loaded."
+//              return(1)
+//      endif
+//
+//#if (exists("EventLoadWave")==4)
+//      LoadEvents_XOP()
+//#else
+//      LoadEvents()
+//#endif        
+//
+//      SetDataFolder root:Packages:NIST:Event:
+//
+////tic()
+//      Wave timePt=timePt
+//      Wave xLoc=xLoc
+//      Wave yLoc=yLoc
+//      CleanupTimes(xLoc,yLoc,timePt)          //remove zeroes
+//      
+////toc()
+//
+//      Duplicate/O timePt rescaledTime
+//      rescaledTime = 1e-7*(timePt-timePt[0])          //convert to seconds and start from zero
+//      t_longest = waveMax(rescaledTime)               //should be the last point
+//
+//      SetDataFolder root:
+//
+//      return(0)
+//End
+//
+//// for the mode "oscillatory"
+////
+//Function Osc_LoadEventLog(ctrlName)
+//      String ctrlName
+//      
+//      Variable fileref
+//
+//      SVAR filename = root:Packages:NIST:gEvent_logfile
+//      NVAR nslices = root:Packages:NIST:gEvent_nslices
+//      NVAR t_longest = root:Packages:NIST:gEvent_t_longest
+//      
+//      String fileFilters = "All Files:.*;Data Files (*.txt):.txt;"
+//      
+//      Open/R/D/F=fileFilters fileref
+//      filename = S_filename
+//              if(strlen(S_filename) == 0)
+//              // user cancelled
+//              DoAlert 0,"No file selected, no file loaded."
+//              return(1)
+//      endif
+//      
+//#if (exists("EventLoadWave")==4)
+//      LoadEvents_XOP()
+//#else
+//      LoadEvents()
+//#endif        
+//      
+//      SetDataFolder root:Packages:NIST:Event:
+//
+//      Wave timePt=timePt
+//      Wave xLoc=xLoc
+//      Wave yLoc=yLoc
+//      CleanupTimes(xLoc,yLoc,timePt)          //remove zeroes
+//      
+//      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
+//
+//      SetDataFolder root:
+//
+//      return(0)
+//End
 
 
@@ -1015 +1159 @@
         SVAR filepathstr = root:Packages:NIST:gEvent_logfile
         SVAR dispStr = root:Packages:NIST:gEventDisplayString
+        
+        
+////    Variable decFac = 10                    //decimation factor
+////    Variable jj,keep
         
         SetDataFolder root:Packages:NIST:Event
@@ -1123 +1271 @@
         Print "num2 = ",num2    
         Print "num3 = ",num3    
-        
+
 //
 //      
@@ -1152 +1300 @@
         Make/O/U/N=(numXYevents) xLoc,yLoc
         Make/O/D/N=(numXYevents) timePt
+////    Make/O/U/N=(numXYevents/decFac) xLoc,yLoc
+////    Make/O/D/N=(numXYevents/decFac) timePt
 //      Make/O/U/N=(totBytes/4) xLoc,yLoc               //too large, trim when done (bad idea)
 //      Make/O/D/N=(totBytes/4) timePt
@@ -1174 +1324 @@
         tic()
         
-        ii = 0
+        ii = 0          //indexes the points in xLoc,yLoc,timePt
+////    keep = decFac           //keep the first point
+        
         
         Open/R fileref as filepathstr
@@ -1207 +1359 @@
                                 endif
                                 
-                                // this is the first point, be sure that ii = 0
-                                ii = 0
-                                xLoc[ii] = xval
-                                yLoc[ii] = yval
-                                
+                                // this is the first point, be sure that ii = 0, and always keep this point
+////                            if(keep==decFac)
+                                        ii = 0
+                                        xLoc[ii] = xval
+                                        yLoc[ii] = yval
+////                                    keep = 0
+////                            endif
                                 Print "At beginning of file, numBad = ",numBad
                                 break   // the next do loop processes the bulk of the file (** the next event == type 1 = MIR)
@@ -1224 +1378 @@
         
         // now read the main portion of the file.
+////    // keep is = 0 if bad points were removed, or is decFac is I need to keep the first point
         do
                 do
@@ -1229 +1384 @@
                 while(strlen(buffer) == 1)              
 
-                if (strlen(buffer) == 0)
+                if (strlen(buffer) == 0)                                // this marks the end of the file and is our only way out
                         break
                 endif
@@ -1303 +1458 @@
                                         else
                                                 // time_msw has been reset, points are good now, so keep this one
+////                                            if(keep==decFac)
+                                                        xLoc[ii] = xval
+                                                        yLoc[ii] = yval
+                                                        timePt[ii] = timeval
+                                                        
+        //                                              if(xval == 127 && yval == 0)
+        //                                                      // check bit 29
+        //                                                      bit29 = (dataval & 0x20000000)/536870912                //bit 29 only , shift by 2^29
+        //                                                      Print "XY=127,0 : bit29 = ",bit29
+        //                                              endif
+                                                        
+                                                        ii+=1
+                                                        rolloverHappened = 0
+////                                                    keep = 0
+////                                            else
+////                                                    keep += 1
+////                                            endif
+                                        endif
+                                else
+                                        // normal processing of good point, keep it
+////                                    if(keep==decFac)
                                                 xLoc[ii] = xval
                                                 yLoc[ii] = yval
                                                 timePt[ii] = timeval
-                                                
-//                                              if(xval == 127 && yval == 0)
-//                                                      // check bit 29
-//                                                      bit29 = (dataval & 0x20000000)/536870912                //bit 29 only , shift by 2^29
-//                                                      Print "XY=127,0 : bit29 = ",bit29
-//                                              endif
-                                                
+                                        
+        //                                      if(xval == 127 && yval == 0)
+        //                                              // check bit 29
+        //                                              bit29 = (dataval & 0x20000000)/536870912                //bit 29 only , shift by 2^29
+        //                                              Printf "XY=127,0 : bit29 = %u : d=%u\r",bit29,dataval
+        //                                      endif
                                                 ii+=1
-                                                rolloverHappened = 0
-                                        endif
-                                else
-                                        // normal processing of good point, keep it
-                                        xLoc[ii] = xval
-                                        yLoc[ii] = yval
-                                        timePt[ii] = timeval
-                                
-//                                      if(xval == 127 && yval == 0)
-//                                              // check bit 29
-//                                              bit29 = (dataval & 0x20000000)/536870912                //bit 29 only , shift by 2^29
-//                                              Printf "XY=127,0 : bit29 = %u : d=%u\r",bit29,dataval
-//                                      endif
-                                        ii+=1
+////                                            keep = 0
+////                                    else
+////                                            keep += 1
+////                                    endif
                                 endif
 
@@ -1366 +1531 @@
                                 endif
                                 
-                                xLoc[ii] = xval
-                                yLoc[ii] = yval
-
+////                            if(keep==decFac)                        //don't reset keep yet, do this only when ii increments
+                                        xLoc[ii] = xval
+                                        yLoc[ii] = yval
+////                            endif
+                                
                                 // don't fill in the time yet, or increment the index ii
                                 // the next event MUST be ATMIR with the MSW time bits
@@ -1390 +1557 @@
                                 
                                 // the XY position was in the previous event ATXYM
-                                timePt[ii] = timeval
+////                            if(keep == decFac)
+                                        timePt[ii] = timeval
+////                            endif
 
                                 bit29 = (dataval & 0x20000000)/536870912                //bit 29 only , shift by 2^29
@@ -1401 +1570 @@
                                         nRoll = 0
                                 endif
-                                                                
-                                ii+=1
+                                
+////                            if(keep == decFac)                      
+                                        ii+=1
+////                                    keep = 0
+////                            endif
 //                              verbose = 0
                                 break
@@ -1452 +1624 @@
         Print "Events removed (Igor) = ",numRemoved
         
-        sPrintf tmpStr,"\rBad Rollover Events = %d (%g %% of events)",numBad,numBad/numXYevents*100
+        sPrintf tmpStr,"\rBad Rollover Events = %d (%4.4g %% of events)",numBad,numBad/numXYevents*100
         dispStr += tmpStr
-        sPrintf tmpStr,"\rTotal Events Removed = %d (%g %% of events)",numRemoved,numRemoved/numXYevents*100
+        sPrintf tmpStr,"\rTotal Events Removed = %d (%4.4g %% of events)",numRemoved,numRemoved/numXYevents*100
         dispStr += tmpStr
         SetDataFolder root:
@@ -1626 +1798 @@
         Print "Events removed (XOP) = ",numRemoved
         
-        sPrintf tmpStr,"\rBad Rollover Events = %d (%g %% of events)",numBad,numBad/numXYevents*100
+        sPrintf tmpStr,"\rBad Rollover Events = %d (%4.4g %% of events)",numBad,numBad/numXYevents*100
         dispStr += tmpStr
-        sPrintf tmpStr,"\rTotal Events Removed = %d (%g %% of events)",numRemoved,numRemoved/numXYevents*100
+        sPrintf tmpStr,"\rTotal Events Removed = %d (%4.4g %% of events)",numRemoved,numRemoved/numXYevents*100
         dispStr += tmpStr
 
@@ -1949 +2121 @@
         ControlBar 100
         Button button0,pos={18,12},size={70,20},proc=EC_AddCursorButtonProc,title="Cursors"
-        Button button1,pos={153,11},size={80,20},proc=EC_AddTimeButtonProc,title="Add time"
-        Button button2,pos={153,37},size={80,20},proc=EC_SubtractTimeButtonProc,title="Subtr time"
+        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,12},size={90,20},proc=EC_SaveWavesButtonProc,title="Save Waves"
-        Button button5,pos={294,38},size={100,20},proc=EC_ImportWavesButtonProc,title="Import Waves"
-        Button button6,pos={18,39},size={80,20},proc=EC_ShowAllButtonProc,title="All Data"
-        Button button7,pos={683,9},size={30,20},proc=EC_HelpButtonProc,title="?"
+        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"
         
         SetDataFolder root:
@@ -2100 +2276 @@
                         Wave xLoc = xLoc
                         Wave yLoc = yLoc
-                        Save/T xLoc,yLoc,timePt                 //will ask for a name
+                        Save/T xLoc,yLoc,timePt ,rescaledTime           //will ask for a name
                         
                         SetDataFolder root:
@@ -2139 +2315 @@
                         KillWaves/Z OscSortIndex
                         Wave timePt=timePt
-
-                        Duplicate/O timePt rescaledTime
-                        if(mode==0)
-                                rescaledTime = 1e-7*(timePt-timePt[0])          //convert to seconds and start from zero
-                        else
-                                rescaledTime = timePt*1e-7                                              //just take the times as-is
-                        endif
+                        Wave rescaledTime=rescaledTime
+
+//                      Duplicate/O timePt rescaledTime
+//                      if(mode==MODE_STREAM)
+//                              rescaledTime = 1e-7*(timePt-timePt[0])          //convert to seconds and start from zero
+//                      else
+//                              rescaledTime = timePt*1e-7                                              //just take the times as-is
+//                      endif
                         
                         t_longest = waveMax(rescaledTime)               //should be the last point
@@ -2208 +2385 @@
 End
 
-
-
+//upDown 5 or -5 looks for spikes +5 or -5 std deviations from mean
+Function PutCursorsAtStep(upDown)
+        Variable upDown
+        
+        SetDataFolder root:Packages:NIST:Event:
+
+        Wave rescaledTime=rescaledTime
+        Wave rescaledTime_DIF=rescaledTime_DIF
+        Variable avg,pt,zoom
+        
+        zoom = 200              //points in each direction
+        
+        WaveStats/Q rescaledTime_DIF
+        avg = V_avg
+        
+        
+        FindLevel/P/Q rescaledTime_DIF avg*upDown
+        if(V_flag==0)
+                pt = V_levelX
+                WaveStats/Q/R=[pt-zoom,pt+zoom] rescaledTime            // find the max/min y-vallues within the point range
+        else
+                Print "Level not found"
+                return(0)
+        endif
+        
+        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+2    //at the point
+        Cursor/P B rescaledTime numpnts(rescaledTime)-1         //at the end
+
+        SetDataFolder root:
+
+        return(0)
+End
+
+
+Function EC_FindStepButton_down(ctrlName) : ButtonControl
+        String ctrlName
+        
+        Variable upDown = -5
+        PutCursorsAtStep(upDown)
+
+        return(0)
+end
+
+
+Function EC_FindStepButton_up(ctrlName) : ButtonControl
+        String ctrlName
+        
+        Variable upDown = 5
+        PutCursorsAtStep(upDown)
+
+        return(0)
+end
+
+
+Function EC_DoDifferential(ctrlName) : ButtonControl
+        String ctrlName
+        
+        DifferentiatedTime()
+        DoWindow/F EventCorrectionPanel
+        
+        //if trace is not on graph, add it
+        SetDataFolder root:Packages:NIST:Event:
+
+        String list = WaveList("*_DIF", ";", "WIN:EventCorrectionPanel")
+        if(strlen(list) == 0)
+                AppendToGraph/R rescaledTime_DIF
+                ModifyGraph msize=1,rgb(rescaledTime_DIF)=(65535,0,0)
+                ReorderTraces rescaledTime,{rescaledTime_DIF}           // put the differential behind the event data
+        endif
+        SetDataFolder root:
+        return(0)
+end
 
 //////////////   Custom Bins  /////////////////////
@@ -2269 +2523 @@
         SetVariable setvar1,pos={23,13},size={160,20},title="Number of slices",fSize=12
         SetVariable setvar1,proc=CB_NumSlicesSetVarProc,value=root:Packages:NIST:gEvent_nslices
-        SetVariable setvar2,pos={24,44},size={160,20},title="Max Time (s)",fSize=12
+        SetVariable setvar2,pos={24,44},size={160,20},title="Max Time (s)",fSize=10
         SetVariable setvar2,value=root:Packages:NIST:gEvent_t_longest   
 
@@ -2505 +2759 @@
         Prompt baseStr,"File prefix, number will be appended"
         
+        
         fSplitBigFile(splitSize, baseStr)
-End
-
-Function fSplitBigFile(splitSize, baseStr)
+        
+End
+
+Function/S fSplitBigFile(splitSize, baseStr)
         Variable splitSize
         String baseStr          
@@ -2517 +2773 @@
         Variable refNum
         String str
+        SVAR listStr = root:Packages:NIST:Event:gSplitFileList
+        
+        listStr=""              //initialize output list
 
         Variable readSize=1e6           //1 MB
@@ -2522 +2781 @@
         Variable numSplit
         Variable num,ii,jj,outRef,frac
-        String thePath
+        String thePath, outStr
         
         Printf "SplitSize = %u MB\r",splitSize
@@ -2530 +2789 @@
         // Open file for read.
         Open/R/Z=2/F="????"/P=$pathName refNum as fileName
-        thePath = ParseFilePath(1, fileName, ":", 1, 0)
+        thePath = ParseFilePath(1, S_fileName, ":", 1, 0)
+        Print "thePath = ",thePath
         
         // Store results from Open in a safe place.
@@ -2538 +2798 @@
         if (err == -1)
                 Print "cancelled by user."
-                return -1
+                return ("")
         endif
 
@@ -2565 +2825 @@
         Printf "frac = %u\r",frac
         
-        baseStr = "split"
+//      baseStr = "split"
         
         for(ii=0;ii<numSplit;ii+=1)
-                Open outRef as (thePath+baseStr+num2str(ii))
+                outStr = (thePath+baseStr+num2str(ii))
+//              Print "outStr = ",outStr
+                Open outRef as outStr
 
                 for(jj=0;jj<(splitSize/readSize);jj+=1)
@@ -2576 +2838 @@
 
                 Close outRef
+                listStr += outStr+";"
         endfor
 
         Make/O/B/U/N=(frac) leftover
         // ii was already incremented past the loop
-        Open outRef as (thePath+baseStr+num2str(ii))
+        outStr = (thePath+baseStr+num2str(ii))
+        Open outRef as outStr
         for(jj=0;jj<num;jj+=1)
                 FBinRead refNum,aBlob
@@ -2589 +2853 @@
 
         Close outRef
+        listStr += outStr+";"
 
 
@@ -2594 +2859 @@
         Close refNum
         
-        
-        return 0
+        KillWaves/Z aBlob,leftover
+        return(listStr)
 End
 
@@ -2601 +2866 @@
 
 //// save the sliced data, and accumulate slices
-//
-// need some way of ensuring that the slices match up since I' blindly adding them together.
-//
-//
-// 
+//  *** this works with sliced data -- that is data that has been PROCESSED
+//
+// need some way of ensuring that the slices match up since I'm blindly adding them together. 
 //
 // mode = 0             wipe out the old accumulated, copy slicedData to accumulatedData
 // mode = 1             add current slicedData to accumulatedData
 // mode = 2             copy accumulatedData to slicedData in preparation of export or display
-// mode = 3             sing a song, dance a dance
-//
+// mode = 3             unused...
+//
+//      "Split Large File",SplitBigFile()
+//      "Accumulate First Slice",AccumulateSlices(0)
+//      "Add Current Slice",AccumulateSlices(1)
+//      "Display Accumulated Slices",AccumulateSlices(2)        
+//
+Function AccumulateSlicesButton(ctrlName) : ButtonControl
+        String ctrlName
+        
+        Variable mode
+        mode = str2num(ctrlName[strlen(ctrlName)-1])
+//      Print "mode=",mode
+        AccumulateSlices(mode)
+        
+        return(0)
+End
+
 Function AccumulateSlices(mode)
         Variable mode
@@ -2640 +2919 @@
         return(0)
 end
+
+
+////////////////////////////////////////////
+//
+// Panel and procedures for decimation
+//
+////////////////////////////////////////////
+
+//Function E_ShowDecimateButton(ctrlName) : ButtonControl
+//      String ctrlName
+//
+//      DoWindow/F DecimatePanel
+//      if(V_flag ==0)
+//              Execute "DecimatePanel()"
+//      endif
+//End
+//
+//
+//Proc DecimatePanel() //: Panel
+//      
+//      PauseUpdate; Silent 1           // building window...
+//      NewPanel /W=(1602,44,1961,380)/K=1
+////    ShowTools/A
+//      Button button0,pos={29,15},size={100,20},proc=SplitFileButtonProc,title="Split Big File"
+//      SetVariable setvar0,pos={182,55},size={150,15},title="Decimation factor",fsize=10
+//      SetVariable setvar0,limits={1,inf,1},value= root:Packages:NIST:Event:gDecimation
+//      Button button1,pos={26,245},size={150,20},proc=LoadDecimateButtonProc,title="Load and Decimate"
+//      Button button2,pos={25,277},size={150,20},proc=ConcatenateButtonProc,title="Concatenate"
+//      Button button3,pos={25,305},size={150,20},proc=DisplayConcatenatedButtonProc,title="Display Concatenated"
+//      Button button4,pos={29,52},size={130,20},proc=Stream_LoadDecim,title="Load From List"
+//      
+//      GroupBox group0 title="Manual Controls",size={185,112},pos={14,220}
+//EndMacro
+
+
+Function SplitFileButtonProc(ctrlName) : ButtonControl
+        String ctrlName
+
+        Execute "SplitBigFile()"
+End
+
+
+// show all of the data
+//
+Proc ShowDecimatedGraph()
+
+        DoWindow/F DecimatedGraph
+        if(V_flag == 0)
+                PauseUpdate; Silent 1           // building window...
+                String fldrSav0= GetDataFolder(1)
+                SetDataFolder root:Packages:NIST:Event:
+                Display /W=(25,44,486,356)/K=1/N=DecimatedGraph rescaledTime_dec
+                SetDataFolder fldrSav0
+                ModifyGraph mode=4
+                ModifyGraph marker=19
+                ModifyGraph rgb(rescaledTime_dec)=(0,0,0)
+                ModifyGraph msize=1
+                ErrorBars rescaledTime_dec OFF 
+                Label left "\\Z14Time (seconds)"
+                Label bottom "\\Z14Event number"
+                ShowInfo
+        endif
+        
+EndMacro
+
+// data has NOT been processed
+//
+// so work with x,y,t, and rescaled time
+// variables -- t_longest
+Function ConcatenateButtonProc(ctrlName) : ButtonControl
+        String ctrlName
+        
+        DoAlert 1,"Is this the first file?"
+        Variable first = V_flag
+        
+        fConcatenateButton(first)
+        
+        return(0)
+End
+
+Function fConcatenateButton(first)
+        Variable first
+
+
+        SetDataFolder root:Packages:NIST:Event:
+
+        Wave timePt_dTmp=timePt_dTmp
+        Wave xLoc_dTmp=xLoc_dTmp
+        Wave yLoc_dTmp=yLoc_dTmp
+        Wave rescaledTime_dTmp=rescaledTime_dTmp
+        
+        NVAR t_longest_dec = root:Packages:NIST:gEvent_t_longest_decimated
+        NVAR t_longest = root:Packages:NIST:gEvent_t_longest
+        
+        
+        if(first==1)            //1==yes, 2==no
+                //then copy the files over, adjusting the time to start from zero
+                // rescaledTime starts from zero (set by the loader)
+
+                timePt_dTmp -= timePt_dTmp[0]                   //subtract the first value
+                
+                Duplicate/O timePt_dTmp timePt_dec
+                Duplicate/O xLoc_dTmp xLoc_dec
+                Duplicate/O yLoc_dTmp yLoc_dec
+                Duplicate/O rescaledTime_dTmp rescaledTime_dec
+                
+                t_longest_dec = t_longest
+        
+        else
+                // concatenate the files + adjust the time
+                Wave timePt_dec=timePt_dec
+                Wave xLoc_dec=xLoc_dec
+                Wave yLoc_dec=yLoc_dec
+                Wave rescaledTime_dec=rescaledTime_dec
+
+                // adjust the times -- assuming they add
+                // rescaledTime starts from zero (set by the loader)
+                //
+                //
+                rescaledTime_dTmp += rescaledTime_dec[numpnts(rescaledTime_dec)-1]
+                rescaledTime_dTmp += abs(rescaledTime_dec[numpnts(rescaledTime_dec)-1] - rescaledTime_dec[numpnts(rescaledTime_dec)-2])
+                
+                timePt_dTmp -= timePt_dTmp[0]                   //subtract the first value      
+                
+                timePt_dTmp += timePt_dec[numpnts(timePt_dec)-1]                // offset by the last point
+                timePt_dTmp += abs(timePt_dec[numpnts(timePt_dec)-1] - timePt_dec[numpnts(timePt_dec)-2])               // plus delta so there's not a flat step
+                
+                Concatenate/NP/O {timePt_dec,timePt_dTmp}, tmp
+                Duplicate/O tmp timePt_dec
+                
+                Concatenate/NP/O {xLoc_dec,xLoc_dTmp}, tmp
+                Duplicate/O tmp xLoc_dec
+                
+                Concatenate/NP/O {yLoc_dec,yLoc_dTmp}, tmp
+                Duplicate/O tmp yLoc_dec
+                
+                Concatenate/NP/O {rescaledTime_dec,rescaledTime_dTmp}, tmp
+                Duplicate/O tmp rescaledTime_dec
+                
+
+                KillWaves tmp
+
+                t_longest_dec = rescaledTime_dec[numpnts(rescaledTime_dec)-1]
+
+        endif
+        
+        
+        SetDataFolder root:
+        
+        return(0)
+
+End
+
+Function DisplayConcatenatedButtonProc(ctrlName) : ButtonControl
+        String ctrlName
+
+        //copy the files over to the display set for processing
+        SetDataFolder root:Packages:NIST:Event:
+
+        Wave timePt_dec=timePt_dec
+        Wave xLoc_dec=xLoc_dec
+        Wave yLoc_dec=yLoc_dec
+        Wave rescaledTime_dec=rescaledTime_dec
+                
+        NVAR t_longest_dec = root:Packages:NIST:gEvent_t_longest_decimated
+        NVAR t_longest = root:Packages:NIST:gEvent_t_longest
+        
+        Duplicate/O timePt_dec timePt
+        Duplicate/O xLoc_dec xLoc
+        Duplicate/O yLoc_dec yLoc
+        Duplicate/O rescaledTime_dec rescaledTime
+        
+        t_longest = t_longest_dec       
+        
+        SetDataFolder root:
+        
+        return(0)
+
+End
+
+
+
+
+Function LoadDecimateButtonProc(ctrlName) : ButtonControl
+        String ctrlName
+
+        LoadEventLog_Button("")
+        
+        // now decimate
+        SetDataFolder root:Packages:NIST:Event:
+
+        Wave timePt=timePt
+        Wave xLoc=xLoc
+        Wave yLoc=yLoc
+        NVAR t_longest_dec = root:Packages:NIST:gEvent_t_longest_decimated
+
+        NVAR decimation = root:Packages:NIST:Event:gDecimation
+
+
+        Duplicate/O timePt, timePt_dTmp
+        Duplicate/O xLoc, xLoc_dTmp
+        Duplicate/O yLoc, yLoc_dTmp
+        Resample/DOWN=(decimation)/N=1 timePt_dTmp
+        Resample/DOWN=(decimation)/N=1 xLoc_dTmp
+        Resample/DOWN=(decimation)/N=1 yLoc_dTmp
+
+
+        Duplicate/O timePt_dTmp rescaledTime_dTmp
+        rescaledTime_dTmp = 1e-7*(timePt_dTmp - timePt_dTmp[0])         //convert to seconds and start from zero
+        t_longest_dec = waveMax(rescaledTime_dTmp)              //should be the last point
+
+        SetDataFolder root:
+
+        
+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"
+//
+Function Stream_LoadDecim(ctrlName)
+        String ctrlName
+        
+        Variable fileref
+
+        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
+
+
+
+        //loop through everything in the list
+        Variable num,ii
+        num = ItemsInList(listStr)
+        
+        for(ii=0;ii<num;ii+=1)
+
+// (1) load the file            
+                filename = StringFromList(ii, listStr  ,";")
+                
+
+#if (exists("EventLoadWave")==4)
+                LoadEvents_XOP()
+#else
+                LoadEvents()
+#endif  
+
+                SetDataFolder root:Packages:NIST:Event:                 //LoadEvents sets back to root:
+
+                Wave timePt=timePt
+                Wave xLoc=xLoc
+                Wave yLoc=yLoc
+                CleanupTimes(xLoc,yLoc,timePt)          //remove zeroes
+
+                Duplicate/O timePt rescaledTime
+                rescaledTime = 1e-7*(timePt-timePt[0])          //convert to seconds and start from zero
+                t_longest = waveMax(rescaledTime)               //should be the last point
+                
+// (2) do the decimation, just on timePt. Ignore rescaledTime for now   
+                
+                Duplicate/O timePt, timePt_dTmp
+                Duplicate/O xLoc, xLoc_dTmp
+                Duplicate/O yLoc, yLoc_dTmp
+                Resample/DOWN=(decimation)/N=1 timePt_dTmp
+                Resample/DOWN=(decimation)/N=1 xLoc_dTmp
+                Resample/DOWN=(decimation)/N=1 yLoc_dTmp
+        
+        
+                Duplicate/O timePt_dTmp rescaledTime_dTmp
+                rescaledTime_dTmp = 1e-7*(timePt_dTmp - timePt_dTmp[0])         //convert to seconds and start from zero
+                t_longest_dec = waveMax(rescaledTime_dTmp)              //should be the last point
+                
+
+// (3) concatenate
+                fConcatenateButton(ii+1)                //passes 1 for the first time, >1 each other time
+        
+        endfor
+
+////            Now that everything is decimated and concatenated, create the rescaled time wave
+//      SetDataFolder root:Packages:NIST:Event:                 //LoadEvents sets back to root:
+//      Wave timePt_dec = timePt_dec
+//      Duplicate/O timePt_dec rescaledTime_dec
+//      rescaledTime_dec = 1e-7*(timePt_dec - timePt_dec[0])            //convert to seconds and start from zero
+//      t_longest_dec = waveMax(rescaledTime_dec)               //should be the last point
+        
+        DisplayConcatenatedButtonProc("")
+        
+        SetDataFolder root:
+
+        return(0)
+End
+
+/////////////////////////////////////