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

Timestamp:

Dec 13, 2012 11:58:20 AM (10 years ago)

Author:

srkline

Message:

Changed the TISANE button on the main panel to be "Event Data"

Added commands to the SANS menu for event mode data, inlcluding opening the panels and splitting large files.

fixed a bug in the reloading of previously adjusted data where oscillatory data would be rescaled to the first event time. Now there is no rescaling of the time.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• EventModeProcessing.ipf (modified) (8 diffs)
• MainPanel.ipf (modified) (2 diffs)
• Menu.ipf (modified) (1 diff)

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

@@ -96 +96 @@
 //
 
-Menu "Macros"
-        "Split Large File",SplitBigFile()
-        "Accumulate First Slice",AccumulateSlices(0)
-        "Add Current Slice",AccumulateSlices(1)
-        "Display Accumulated Slices",AccumulateSlices(2)        
-End
+//Menu "Macros"
+//      "Split Large File",SplitBigFile()
+//      "Accumulate First Slice",AccumulateSlices(0)
+//      "Add Current Slice",AccumulateSlices(1)
+//      "Display Accumulated Slices",AccumulateSlices(2)        
+//End
 
 
@@ -770 +770 @@
 // 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"
+//    from the file, trusting the times to be correct.
 //
 // Would TISANE or TOF need a different loader?
@@ -2119 +2123 @@
                         endif
                         
+                        NVAR mode = root:Packages:NIST:gEvent_Mode                              // ==0 for "stream", ==1 for Oscillatory
                         // clear out the old sort index, if present, since new data is being loaded
                         KillWaves/Z OscSortIndex
@@ -2124 +2129 @@
 
                         Duplicate/O timePt rescaledTime
-                        rescaledTime = 1e-7*(timePt-timePt[0])          //convert to seconds and start from zero
+                        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
+                        
                         t_longest = waveMax(rescaledTime)               //should be the last point
+                        
         
                         fileStr = ParseFilePath(0, filepathstr, ":", 1, 0)
@@ -2476 +2487 @@
 //
 
-Macro SplitBigFile(splitSize, baseStr)
+Proc SplitBigFile(splitSize, baseStr)
         Variable splitSize = 100
         String baseStr="split"
@@ -2587 +2598 @@
 // mode = 1             add current slicedData to accumulatedData
 // mode = 2             copy accumulatedData to slicedData in preparation of export or display
-// mode = 3             sing a song
+// mode = 3             sing a song, dance a dance
 //
 Function AccumulateSlices(mode)
@@ -2596 +2607 @@
         switch(mode)    
                 case 0:
+                        DoAlert 0,"The current data has been copied to the accumulated set. You are now ready to add more data."
                         KillWaves/Z accumulatedData
                         Duplicate/O slicedData accumulatedData          
                         break
                 case 1:
+                        DoAlert 0,"The current data has been added to the accumulated data. You can add more data."
                         Wave acc=accumulatedData
                         Wave cur=slicedData
@@ -2605 +2618 @@
                         break
                 case 2:
+                        DoAlert 0,"The accumulated data is now the display data and is ready for display or export."
                         Duplicate/O accumulatedData slicedData          
                         break

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

@@ -227 +227 @@
 End
 
-Proc TISANE_MainButtonProc(ctrlName) : ButtonControl
-        String ctrlName
-        
-        if(exists("Show_TISANE_Panel")==0)
+//Proc TISANE_MainButtonProc(ctrlName) : ButtonControl
+//      String ctrlName
+//      
+//      if(exists("Show_TISANE_Panel")==0)
+//              // procedure file was not loaded
+//              DoAlert 0,"This operation is not available in this set of macros"
+//      else
+//              Show_TISANE_Panel()
+//      endif
+//      
+//End
+
+Proc Event_MainButtonProc(ctrlName) : ButtonControl
+        String ctrlName
+        
+        if(exists("Show_Event_Panel")==0)
                 // procedure file was not loaded
                 DoAlert 0,"This operation is not available in this set of macros"
         else
-                Show_TISANE_Panel()
+                Show_Event_Panel()
         endif
         
@@ -355 +367 @@
         Button MainButton_3f,pos={150,120},size={110,20},title="WorkFile Math",proc=WorkMath_MainButtonProc
         Button MainButton_3f,help={"Perfom simple math operations on workfile data"}
-        Button MainButton_3g,pos={150,180},size={100,20},title="TISANE",proc=TISANE_MainButtonProc
+        Button MainButton_3g,pos={150,180},size={100,20},title="Event Data",proc=Event_MainButtonProc
         Button MainButton_3g,help={"Manipulate TISANE Timeslice data"}
         

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

@@ -44 +44 @@
                 "Bin QxQy Data to 1D",BinQxQy_to_1D()
         End
+        Submenu "Event Processing"
+                "Event Mode Process Panel",Show_Event_Panel()
+                "Adjust Events",ShowEventCorrectionPanel()
+                "Create Custom Bins",Show_CustomBinPanel()
+                "-"
+                "Split Large File",SplitBigFile()
+                "Accumulate First Slice",AccumulateSlices(0)
+                "Add Current Slice",AccumulateSlices(1)
+                "Display Accumulated Slices",AccumulateSlices(2)        
+        End
         "-"
         "NCNR Preferences",Show_Preferences_Panel()