Changeset 669 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/WriteUSANSData.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/Reduction/USANS/WriteUSANSData.ipf (modified) (6 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/WriteUSANSData.ipf

@@ -211 +211 @@
         
         SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        NVAR dQv = root:Packages:NIST:USANS:Globals:MainPanel:gDQv
         
         Struct NISTXMLfile nf
@@ -237 +238 @@
         Endif
         
-        //Use the evil extra column. Should probably switch to using slit_length in collimation.
+        //Use the evil extra column for the resolution "information". Should probably switch to using slit_length in collimation.
         Duplicate/O qvals,dumWave
-        NVAR DQv=$(USANSFolder+":Globals:MainPanel:gDQv")
-        dumWave = - DQv
+        dumWave = - dQv
         ///
         
@@ -254 +254 @@
         Endif
         
-        //actually open the file here
-        //Open refNum as fullpath
-        
         //Data
         Wave nf.Q = qvals
@@ -264 +261 @@
         Wave nf.Idev = sig
         nf.unitsIdev = "1/cm"
-        Wave nf.dQl = sigmaq
+        // for slit-smeared USANS, set only a 4th column to  -dQv
+        Wave nf.dQl = dumWave
         nf.unitsdQl= "1/A"
-        
-        
+
         //write out the standard header information
         //fprintf refnum,"FILE: %s\t\t CREATED: %s\r\n",textw[0],textw[1]
@@ -345 +342 @@
         //write confirmation of write operation to history area
         Print "Averaged XML File written: ", GetFileNameFromPathNoSemi(fullPath)
-        KillWaves/Z tempShortProto
+        KillWaves/Z dumWave
         Return(0)
 End
@@ -468 +465 @@
         SetDataFolder root:             //(redundant)
         
+        KillWaves/Z res1,res2,res2,ti,te,tq
+        
         Return(0)
 End