Changeset 563 for sans/Dev/trunk

Timestamp:

Sep 30, 2009 3:15:59 PM (13 years ago)

Author:

ajj

Message:

Updating XML reader to match output of non-xml loader. Now creates sq,qb and fs waves as well as res wave.

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

@@ -32 +32 @@
                         Variable np
                         
-                        String w0,w1,w2,basestr,fileName
+                        String w0,w1,w2,w3,w4,w5,basestr,fileName
                         String xmlDataFolder,xmlDataSetFolder
                         
@@ -61 +61 @@
                                                 w1 = basestr + "_i"
                                                 w2 = basestr + "_s"
+                                                w3 = basestr + "sq"
+                                                w4 = basestr + "qb"
+                                                w5 = basestr + "fs"
                                                 
                                                 if(DataFolderExists("root:"+baseStr))
@@ -85 +88 @@
                                                         Wave Qsas = $(xmlDataSetFolder+"Qsas")
                                                         Wave Qdev = $(xmlDataSetFolder+"Qdev")
-                                                
+                                                        
+                                                        Duplicate/O Qdev, $w3
                                                 // make a resolution matrix for SANS data
                                                          np=numpnts($w0)
@@ -95 +99 @@
                                                         if(exists(xmlDataSetFolder+"Qmean"))
                                                                 Wave Qmean = $(xmlDataSetFolder+"Qmean")
+                                                                Duplicate/O Qmean,$w4
                                                                 reswave[][1] = Qmean[p]         //qBar
                                                         endif
                                                         if(exists(xmlDataSetFolder+"Shadowfactor"))
                                                                 Wave Shadowfactor = $(xmlDataSetFolder+"Shadowfactor")
+                                                                Duplicate/O Shadowfactor, $w5
                                                                 reswave[][2] = Shadowfactor[p]          //fShad
                                                         endif