Ignore:
Timestamp:
Apr 7, 2010 1:02:12 PM (13 years ago)
Author:
srkline
Message:

Fixed the issue with USANS XML data not being written correctly. the structure had not been filled in completely. USANS XML is a "4-column" format with the ususal 3 plus a 4th of -dQv. The XML reader properly looks for the named entry "dQl" to identify the 4th column as USANS data, and handles it appropriately.

fixed a separate issue with reading USANS XML files. dQv was not being read in correctly, now it is.

File:
1 edited

Legend:

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

    r665 r669  
    2222         
    2323        Variable rr,gg,bb 
    24         NVAR/Z dQv = root:Packages:NIST:USANS_dQv 
     24        Variable dQv 
     25//      NVAR/Z dQv = root:Packages:NIST:USANS_dQv               //let USANS_CalcWeights set the dQv value 
    2526 
    2627                 
     
    259260                                                //USAS Data 
    260261                                                Wave dQl = $(xmlDataFolder+"dQl") 
    261                                                 dQv = dQl[0] 
     262                                                dQv = - dQl[0]          //make it positive again 
    262263                                         
    263264                                                USANS_CalcWeights(baseStr,dQv) 
     
    498499                        xmlsetAttr(fileID,"/SASroot/SASentry/SASdata/Idata["+num2istr(ii+1)+"]/Idev","","unit",NISTfile.unitsIdev)       
    499500         
    500                         xmladdnode(fileID,"/SASroot/SASentry/SASdata/Idata["+num2istr(ii+1)+"]","","Idev",num2str(NISTfile.dQl[ii]),1) 
    501                         xmlsetAttr(fileID,"/SASroot/SASentry/SASdata/Idata["+num2istr(ii+1)+"]/Idev","","unit",NISTfile.unitsdQl)                
     501                        xmladdnode(fileID,"/SASroot/SASentry/SASdata/Idata["+num2istr(ii+1)+"]","","dQl",num2str(NISTfile.dQl[ii]),1) 
     502                        xmlsetAttr(fileID,"/SASroot/SASentry/SASdata/Idata["+num2istr(ii+1)+"]/dQl","","unit",NISTfile.unitsdQl)                 
    502503                endfor 
    503504        else 
     
    634635                Variable i = 0 
    635636                do 
    636                         WAVE wv= $(StringFromList(i,S_waveNames,";")) 
     637                        WAVE/Z wv= $(StringFromList(i,S_waveNames,";")) 
    637638                        if( WaveExists(wv) == 0 ) 
    638639                                break 
Note: See TracChangeset for help on using the changeset viewer.