Changeset 1091 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_EventModeProcessing.ipf

Timestamp:

Mar 16, 2018 3:38:18 PM (5 years ago)

Author:

srkline

Message:

a number of changes, mostly to allow everything to compile.

added conditional compile to ensure that XML code would not be compiled if VSANS was present, since it's not XML-aware.

modified V_MainPanel to avoid conflicts with the SANS version. There still may be some functions hidden in procedures that do not have the V_ prefix yet, but these are either for functions that should point to a common file, or procedures that have been hidden from the VSANS panel

modified saving of VSANS mask files so that they can still be saved from teh deom version where home path is not defined.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_EventModeProcessing.ipf (modified) (5 diffs)

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

@@ -365 +365 @@
                 case 2: // mouse up
                         // click code here
+                        v_tic()
+                        printf "Show rescaled time graph = "
                         Execute "V_ShowRescaledTimeGraph()"
+                        v_toc()
                         //
+                        v_tic()
+                        printf "calculate and show differential = "
                         V_DifferentiatedTime()
+                        v_toc()
                         //
                         break
@@ -958 +964 @@
         
 
+Variable t1 = ticks
         SetDataFolder root:Packages:NIST:VSANS:Event:
 
@@ -1006 +1013 @@
 //      
 
-//tic()
+
         Wave timePt=timePt
         Wave xLoc=xLoc
         Wave yLoc=yLoc
         V_CleanupTimes(xLoc,yLoc,timePt)                //remove zeroes 
-//toc()
         
         NVAR gResol = root:Packages:NIST:VSANS:Event:gResol             //timeStep in clock frequency (Hz)
@@ -1023 +1029 @@
 //  -- the time scaling is NOT done. it is still in raw ticks.
 //
+
         if(mode == MODE_STREAM)         // continuous "Stream" mode - start from zero
+        v_tic()
+        printf "Duplicate wave = "
                 Duplicate/O timePt rescaledTime
+        v_toc()
+        v_tic()
+        printf "rescale time = "
                 rescaledTime = 1*(timePt-timePt[0])             //convert to nanoseconds and start from zero
+        v_toc()
+        v_tic()
+        printf "find wave Max = "
                 t_longest = waveMax(rescaledTime)               //should be the last point      
+        v_toc()
         endif
+
         
         if(mode == MODE_OSCILL)         // oscillatory mode - don't adjust the times, we get periodic t0 to reset t=0
@@ -1051 +1068 @@
         SetDataFolder root:
 
+Variable t2 = ticks
+
         STRUCT WMButtonAction ba
         ba.eventCode = 2
         V_ShowEventDataButtonProc(ba)
 
+Variable t3 = ticks
+
+        Print "load and process (s) = ",(t2-t1)/60.15
+        Print "Overall including graphs (s) = ",(t3-t1)/60.15
         return(0)
 End