Changeset 624 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/LakeDesmearing_JB.ipf

Timestamp:

Jan 30, 2010 12:00:09 AM (13 years ago)

Author:

ajj

Message:

Implement XML writing in USANS reduction

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/LakeDesmearing_JB.ipf (modified) (5 diffs)

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

@@ -521 +521 @@
         
         SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
-        NVAR XMLO = $(USANSFolder+":Globals:gUseXMLOutput")
         
         String termStr="\r\n"
@@ -567 +566 @@
         te=S_dsm
         if( (lo!=hi) && (lo<hi))
-                redimension/N=(hi-lo+1) tq,ti,te,dumWave                //lo to hi, inclusive
+                redimension/N=(hi-lo+1) tq,ti,te,res1,res2,res3         //lo to hi, inclusive
                 tq=Q_dsm[p+lo]
                 ti=I_dsm[p+lo]
@@ -591 +590 @@
         sprintf str1,"Chi^2 = %g   PowerLaw m = %4.2f   Iterations = %d",chiFinal,m,iter
         sprintf str2,"%d box smooth passes and %d smoothing spline passes",boxPass,splinePass
-        
-        if (xmlo == 1)
-        
-                
-        
-        endif
-        
+
         
         //actually open the file
@@ -1633 +1626 @@
 
         SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+        NVAR useXMLOutput = root:Packages:NIST:gXML_Write
 
         String saveStr
@@ -1638 +1632 @@
         saveStr = CleanupName((curFile),0)              //the output filename
         //
-        WriteUSANSDesmeared(saveStr,0,0,1)                      //use the full set (lo=hi=0) and present a dialog
+
+        if (useXMLOutput == 1)  
+                WriteXMLUSANSDesmeared(saveStr,0,0,1)
+        else
+                WriteUSANSDesmeared(saveStr,0,0,1)                      //use the full set (lo=hi=0) and present a dialog
+        endif
         
         SetDataFolder root: