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

Refactoring USANS functions to use root:Packages:NIST:USANS as their base to comply with canSAS proposal.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/USANS/WriteUSANSData.ipf

    r328 r404  
    1818        Variable lo,hi,dialog           //=1 will present dialog for name 
    1919         
     20        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder 
     21 
     22         
    2023        String termStr="\r\n"           //VAX uses only <CR> as terminator, but only CRLF seems to FTP correctly to VAX 
    2124        String destStr="",formatStr = "%15.6g %15.6g %15.6g %15.6g %15.6g %15.6g"+termStr 
    22         destStr = "root:"+type 
     25        destStr = USANSFolder+":"+type 
    2326         
    2427        Variable refNum,integer,realval 
     
    4548        // 
    4649        Duplicate/O qvals,dumWave 
    47         NVAR DQv=root:Globals:MainPanel:gDQv 
     50        NVAR DQv=$(USANSFolder+":Globals:MainPanel:gDQv") 
    4851        dumWave = - DQv 
    4952        /// 
     
    7275         
    7376        //tailor the output given the type of data written out... 
    74         WAVE inten_EMP=$("root:EMP:DetCts") 
     77        WAVE inten_EMP=$(USANSFolder+":EMP:DetCts") 
    7578        String samStr="",empStr="",dateStr="",samLabelStr="",paramStr="",empLevStr="",bkgLevStr="" 
    7679        String pkStr="" 
    77         NVAR TransWide = root:Globals:MainPanel:gTransWide 
    78         NVAR TransRock = root:Globals:MainPanel:gTransRock 
    79         NVAR empCts = root:Globals:MainPanel:gEmpCts 
    80         NVAR bkgCts = root:Globals:MainPanel:gBkgCts 
    81         NVAR thick = root:Globals:MainPanel:gThick 
     80        NVAR TransWide = $(USANSFolder+":Globals:MainPanel:gTransWide") 
     81        NVAR TransRock = $(USANSFolder+":Globals:MainPanel:gTransRock") 
     82        NVAR empCts = $(USANSFolder+":Globals:MainPanel:gEmpCts") 
     83        NVAR bkgCts = $(USANSFolder+":Globals:MainPanel:gBkgCts") 
     84        NVAR thick = $(USANSFolder+":Globals:MainPanel:gThick") 
    8285         
    8386        strswitch(type) 
Note: See TracChangeset for help on using the changeset viewer.