Ignore:
Timestamp:
Oct 10, 2008 3:46:24 PM (14 years ago)
Author:
srkline
Message:

bug fixes related to XML changes in the file loader in PlotUtilsMacro?

bug fix in Wrapper, in the error checking of coefficient wave names

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r420 r427  
    7070        SetDataFolder root:             //build sub-folders for each data set under root 
    7171         
    72         if (exists("root:Packages:NIST:USANS:Globals:MainPanel:gDQv")) 
     72        if (exists("root:Packages:NIST:USANS:Globals:MainPanel:dQv")) 
    7373                //Running from USANS reduction 
    74                 Variable dQv = root:Packages:NIST:USANS:Globals:MainPanel:gDQv 
    75         endif 
    76         if(exists("root:Packages:NIST:USANS_gDQv")) 
     74                Variable dQv = root:Packages:NIST:USANS:Globals:MainPanel:dQv 
     75        endif 
     76        if(exists("root:Packages:NIST:USANS_dQv")) 
    7777                //Running from SANS Analysis 
    78                 Variable dQv = root:Packages:NIST:USANS_gDQv 
     78                Variable dQv = root:Packages:NIST:USANS_dQv 
    7979        endif 
    8080                 
     
    9696                LoadWave/G/D/A/Q fileStr 
    9797                String fileNamePath = S_Path+S_fileName 
    98                 String basestr = ParseFilePath(3,ParseFilePath(5,fileNamePath,":",0,0),":",0,0) 
    99                 print "basestr :"+basestr 
     98//              String basestr = ParseFilePath(3,ParseFilePath(5,fileNamePath,":",0,0),":",0,0) 
     99                String baseStr = CleanupName(S_fileName,0) 
     100//              print "basestr :"+basestr 
    100101                String fileName =  ParseFilePath(0,ParseFilePath(5,filestr,":",0,0),":",1,0) 
    101                 print "filename :"+filename 
     102//              print "filename :"+filename 
    102103                Variable numCols = V_flag 
    103104                 
Note: See TracChangeset for help on using the changeset viewer.