Changeset 669 for sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

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:

• sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf (modified) (4 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

@@ -22 +22 @@
         
         Variable rr,gg,bb
-        NVAR/Z dQv = root:Packages:NIST:USANS_dQv
+        Variable dQv
+//      NVAR/Z dQv = root:Packages:NIST:USANS_dQv               //let USANS_CalcWeights set the dQv value
 
                 
@@ -259 +260 @@
                                                 //USAS Data
                                                 Wave dQl = $(xmlDataFolder+"dQl")
-                                                dQv = dQl[0]
+                                                dQv = - dQl[0]          //make it positive again
                                         
                                                 USANS_CalcWeights(baseStr,dQv)
@@ -498 +499 @@
                         xmlsetAttr(fileID,"/SASroot/SASentry/SASdata/Idata["+num2istr(ii+1)+"]/Idev","","unit",NISTfile.unitsIdev)      
         
-                        xmladdnode(fileID,"/SASroot/SASentry/SASdata/Idata["+num2istr(ii+1)+"]","","Idev",num2str(NISTfile.dQl[ii]),1)
-                        xmlsetAttr(fileID,"/SASroot/SASentry/SASdata/Idata["+num2istr(ii+1)+"]/Idev","","unit",NISTfile.unitsdQl)               
+                        xmladdnode(fileID,"/SASroot/SASentry/SASdata/Idata["+num2istr(ii+1)+"]","","dQl",num2str(NISTfile.dQl[ii]),1)
+                        xmlsetAttr(fileID,"/SASroot/SASentry/SASdata/Idata["+num2istr(ii+1)+"]/dQl","","unit",NISTfile.unitsdQl)                
                 endfor
         else
@@ -634 +635 @@
                 Variable i = 0
                 do
-                        WAVE wv= $(StringFromList(i,S_waveNames,";"))
+                        WAVE/Z wv= $(StringFromList(i,S_waveNames,";"))
                         if( WaveExists(wv) == 0 )
                                 break