Changeset 739

Timestamp:

Sep 14, 2010 2:09:23 PM (12 years ago)

Author:

srkline

Message:

Now, the XML writer writes out + dQv to the dQl field for each point. Since this field in the XML file identifies the data as USANS, it is used as the flag. Upon loading the global USANS_dQv is set to abs(dQv)

our old 6-column format still writes out the last three columns as -(dQv) and keys on the negative number to flag it as USANS.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/NIST_XML_v40.ipf (modified) (3 diffs)
• Reduction/USANS/USANS_Includes_v230.ipf (modified) (1 diff)
• Reduction/USANS/WriteUSANSData.ipf (modified) (1 diff)

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

@@ -131 +131 @@
                                                         endif
                                                 elseif(exists(xmlDataSetFolder+"dQl"))
-                                                        //USAS Data
+                                                        //USANS Data
                                                         Wave dQl = $(xmlDataSetFolder+"dQl")
-                                                        dQv = dQl[0]
+                                                        dQv = abs(dQl[0])
                                                 
                                                         USANS_CalcWeights(baseStr,dQv)
@@ -262 +262 @@
                                                 endif
                                         elseif(exists(xmlDataFolder+"dQl"))
-                                                //USAS Data
+                                                //USANS Data
                                                 Wave dQl = $(xmlDataFolder+"dQl")
-                                                dQv = - dQl[0]          //make it positive again
+                                                dQv = abs(dQl[0])               //make it positive again
                                         
                                                 USANS_CalcWeights(baseStr,dQv)
@@ -1048 +1048 @@
                 //Use the evil extra column for the resolution "information". Should probably switch to using slit_length in collimation.
                 Duplicate/O qw,dumWave
-                dumWave = - dQv
+                dumWave = dQv                   //written out as a positive value, since the column is identified by its label, dQl
                 
                 //Data

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

@@ -31 +31 @@
 #include "NCNR_Utils"
 #include "MultipleReduce"
+#include "WriteQIS"
 
 //AJJ for data set output?

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

@@ -240 +240 @@
         //Use the evil extra column for the resolution "information". Should probably switch to using slit_length in collimation.
         Duplicate/O qvals,dumWave
-        dumWave = - dQv
+        dumWave = dQv                   //written out as a positive value, since the column is identified by its label, dQl
         ///