Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_EventModeProcessing.ipf

    r1060 r1091  
    365365                case 2: // mouse up 
    366366                        // click code here 
     367                        v_tic() 
     368                        printf "Show rescaled time graph = " 
    367369                        Execute "V_ShowRescaledTimeGraph()" 
     370                        v_toc() 
    368371                        // 
     372                        v_tic() 
     373                        printf "calculate and show differential = " 
    369374                        V_DifferentiatedTime() 
     375                        v_toc() 
    370376                        // 
    371377                        break 
     
    958964         
    959965 
     966Variable t1 = ticks 
    960967        SetDataFolder root:Packages:NIST:VSANS:Event: 
    961968 
     
    10061013//       
    10071014 
    1008 //tic() 
     1015 
    10091016        Wave timePt=timePt 
    10101017        Wave xLoc=xLoc 
    10111018        Wave yLoc=yLoc 
    10121019        V_CleanupTimes(xLoc,yLoc,timePt)                //remove zeroes  
    1013 //toc() 
    10141020         
    10151021        NVAR gResol = root:Packages:NIST:VSANS:Event:gResol             //timeStep in clock frequency (Hz) 
     
    10231029//  -- the time scaling is NOT done. it is still in raw ticks. 
    10241030// 
     1031 
    10251032        if(mode == MODE_STREAM)         // continuous "Stream" mode - start from zero 
     1033        v_tic() 
     1034        printf "Duplicate wave = " 
    10261035                Duplicate/O timePt rescaledTime 
     1036        v_toc() 
     1037        v_tic() 
     1038        printf "rescale time = " 
    10271039                rescaledTime = 1*(timePt-timePt[0])             //convert to nanoseconds and start from zero 
     1040        v_toc() 
     1041        v_tic() 
     1042        printf "find wave Max = " 
    10281043                t_longest = waveMax(rescaledTime)               //should be the last point       
     1044        v_toc() 
    10291045        endif 
     1046 
    10301047         
    10311048        if(mode == MODE_OSCILL)         // oscillatory mode - don't adjust the times, we get periodic t0 to reset t=0 
     
    10511068        SetDataFolder root: 
    10521069 
     1070Variable t2 = ticks 
     1071 
    10531072        STRUCT WMButtonAction ba 
    10541073        ba.eventCode = 2 
    10551074        V_ShowEventDataButtonProc(ba) 
    10561075 
     1076Variable t3 = ticks 
     1077 
     1078        Print "load and process (s) = ",(t2-t1)/60.15 
     1079        Print "Overall including graphs (s) = ",(t3-t1)/60.15 
    10571080        return(0) 
    10581081End 
Note: See TracChangeset for help on using the changeset viewer.