Ignore:
Timestamp:
Feb 21, 2017 1:03:50 PM (6 years ago)
Author:
srkline
Message:

minor changes to prefix functions with "V_" to avoid conflicts with non-VSANS functions.

File:
1 edited

Legend:

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

    r1023 r1024  
    5757// make sure that data exists before passing this on... 
    5858         
    59         if(DataExists(type) > 0) 
    60                 UpdateDisplayInformation(type) 
     59        if(V_DataExists(type) > 0) 
     60                V_UpdateDisplayInformation(type) 
    6161        else 
    6262                DoAlert 0,"No data in "+type 
     
    6969// -- only checks for FR data to exist, assumes everything else is there 
    7070// -- can't use the V_get() functions, these will try to load data if it's not there! 
    71 Function DataExists(type) 
     71Function V_DataExists(type) 
    7272        String type 
    7373         
     
    8282// tol is an absolute value (since input v1 or v2 may be zero, can't reliably 
    8383// use a percentage 
    84 Function CloseEnough(v1,v2,tol) 
     84Function V_CloseEnough(v1,v2,tol) 
    8585        Variable v1, v2, tol 
    8686 
     
    460460                 
    461461                // this (in SANS) just passes directly to fRawWindowHook() 
    462                 Execute "UpdateDisplayInformation(\"RAW\")"     // plot the data in whatever folder type 
     462                Execute "V_UpdateDisplayInformation(\"RAW\")"   // plot the data in whatever folder type 
    463463                 
    464                 FakeRestorePanelsButtonClick()          //so the panels display correctly 
     464                V_FakeRestorePanelsButtonClick()                //so the panels display correctly 
    465465                // set the global to display ONLY if the load was called from here, not from the  
    466466                // other routines that load data (to read in values) 
Note: See TracChangeset for help on using the changeset viewer.