Changeset 607 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/WriteModelData_v40.ipf

Timestamp:

Dec 1, 2009 10:02:58 PM (13 years ago)

Author:

ajj

Message:

• Write out data file as XML
• Fix XML input
• Finished Data Arithmetic panel as replacement for Subtract_1D

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/WriteModelData_v40.ipf (modified) (6 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/WriteModelData_v40.ipf

@@ -108 +108 @@
         Prompt delim,"delimeter",popup,"tab;space;"
         Prompt term,"line termination",popup,"CR;LF;CRLF;"
-                
-        fReWrite1DData(folderStr,delim,term)
-        
+        
+        if (root:Packages:NIST:gXML_Write == 1)
+                SetDataFolder root:
+                ReWrite1DXMLData(folderStr)
+        else
+                SetDataFolder root:
+                fReWrite1DData(folderStr,delim,term)
+        endif   
 End
 
@@ -116 +121 @@
 // always asks for a file name
 // - and right now, always expect 6-column data, either SANS or USANS (re-writes -dQv)
+// - AJJ Nov 2009 : better make sure we always fake 6 columns on reading then....
 Function fReWrite1DData(folderStr,delim,term)
         String folderStr,delim,term
@@ -121 +127 @@
         String formatStr="",fullpath=""
         Variable refnum,dialog=1
+        
+        String dataSetFolderParent,basestr
         
         //setup delimeter and terminator choices
@@ -140 +148 @@
         Endif
         
+        //Abuse ParseFilePath to get path without folder name
+        dataSetFolderParent = ParseFilePath(1,folderStr,":",1,0)
+        //Abuse ParseFilePath to get basestr
+        basestr = ParseFilePath(0,folderStr,":",1,0)
+        
         //make sure the waves exist
-        SetDataFolder $("root:"+folderStr)
-        WAVE/Z qw = $(folderStr+"_q")
-        WAVE/Z iw = $(folderStr+"_i")
-        WAVE/Z sw = $(folderStr+"_s")
-        WAVE/Z resw = $(folderStr+"_res")
+        SetDataFolder $(dataSetFolderParent+basestr)
+        WAVE/Z qw = $(baseStr+"_q")
+        WAVE/Z iw = $(baseStr+"_i")
+        WAVE/Z sw = $(baseStr+"_s")
+        WAVE/Z resw = $(baseStr+"_res")
         
         if(WaveExists(qw) == 0)
@@ -179 +192 @@
         if(dialog)
                 PathInfo/S catPathName
-                fullPath = DoSaveFileDialog("Save data as",fname=folderStr+".txt")
+                fullPath = DoSaveFileDialog("Save data as",fname=baseStr+".txt")
                 If(cmpstr(fullPath,"")==0)
                         //user cancel, don't write out a file
@@ -190 +203 @@
         Open refnum as fullpath
         
-        fprintf refnum,"Modified data written from folder %s on %s\r\n",folderStr,(date()+" "+time())
+        fprintf refnum,"Modified data written from folder %s on %s\r\n",baseStr,(date()+" "+time())
         wfprintf refnum,formatStr,qw,iw,sw,sigQ,qbar,fs
         Close refnum