Ignore:
Timestamp:
Sep 12, 2008 9:42:06 PM (14 years ago)
Author:
ajj
Message:

Updating USANS reduction to use PlotUtilsMacro_v40 from Analysis.

Eventually retire PlotUtils_USANS when this is tested

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

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/PlotUtilsMacro_v40.ipf

    r403 r405  
    6969        String w3,w4,w5,n3,n4,n5                        //3 extra waves to load 
    7070        SetDataFolder root:             //build sub-folders for each data set under root 
    71         Variable dQv = root:Packages:NIST:USANS_dQv 
     71         
     72        if (exists("root:Packages:NIST:USANS:Globals:MainPanel:gDQv")) 
     73                //Running from USANS reduction 
     74                Variable dQv = root:Packages:NIST:USANS:Globals:MainPanel:gDQv 
     75        endif 
     76        if(exists("root:Packages:NIST:USANS_gDQv")) 
     77                //Running from SANS Analysis 
     78                Variable dQv = root:Packages:NIST:USANS_gDQv 
     79        endif 
    7280                 
    7381        if (cmpStr(fileStr,"") == 0) 
  • sans/Dev/trunk/NCNR_User_Procedures/USANS/USANS_Includes.ipf

    r404 r405  
    1212#include "COR_Graph",version >= 2.20                     
    1313#include "Main_USANS",version >= 2.20    
    14 #include "PlotUtilsMacro_v40",version >= 2.20    
     14#include "PlotUtilsMacro_v40",version >= 2.20 
     15#include "NIST_XML_v40" 
     16#include "USANS_SlitSmearing_v40"        
    1517#include "WriteUSANSData",version >= 2.20        
    1618#include "LakeDesmearing_JB",version >= 2.20     
Note: See TracChangeset for help on using the changeset viewer.