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.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Common
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

    r994 r1091  
    44 
    55 
    6 #if( Exists("XmlOpenFile") ) 
     6//#if( exists("XmlOpenFile") && exists("NCNR_VSANS") ) 
     7#if( exists("XmlOpenFile") && exists("NCNR_VSANS") ) 
    78 
    89#include "cansasXML", version >= 1.10 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r1079 r1091  
    12051205        tmp = FunctionList("*_proto",";","KIND:10")             //prototypes 
    12061206        list = RemoveFromList(tmp, list  ,";") 
    1207          
     1207 
     1208 
    12081209        //prototypes that show up if GF is loaded 
    12091210        list = RemoveFromList("GFFitFuncTemplate", list) 
     
    13481349// from 2017-2018 VSANS reduction 
    13491350        list = RemoveFromList("V_BroadPeak_Pix2D;V_BroadPeak_Pix2D_noThread;V_CleanupTimes;V_I_BroadPeak_Pix2D;V_IndexForHistogram;V_MakeFibonacciWave;V_UpdatePix2Mat;xJointHistogram;",list,";") 
    1350                          
     1351 
     1352        tmp = FunctionList("*X_",";","KIND:10")         // dummy functions with "X_" at the end, for vsans (2018) 
     1353        list = RemoveFromList(tmp, list  ,";") 
     1354         
     1355        list = RemoveFromList("Integrate_BuiltIn;intgrnd;V_WB_testKernel;",list,";") 
     1356 
     1357                                 
    13511358        list = SortList(list) 
    13521359        return(list) 
Note: See TracChangeset for help on using the changeset viewer.