Changeset 732 for sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

Timestamp:

Sep 10, 2010 5:50:17 PM (12 years ago)

Author:

srkline

Message:

some changes to the XML and the DataSetHandling? to get closer to a functional batch conversion panel. Functionality is mmostly there with these changes. Still to be done is to verify that all of the proper information is being re-written to the converted files.

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

@@ -565 +565 @@
 end
 
+//
+// !!! nf.Sample_ID is not set correctly here, since it's not read in from the NIST 6-col data file
+// and SASprocessnote does not get set either!
+//
 Function convertNISTtoNISTXML(fileStr)
         String fileStr
@@ -639 +643 @@
                         
                 endif
-                
-                //Tidy up
-                Variable i = 0
-                do
-                        WAVE/Z wv= $(StringFromList(i,S_waveNames,";"))
-                        if( WaveExists(wv) == 0 )
-                                break
-                        endif
-                        KillWaves wv
-                        i += 1
-                while (1)       // exit is via break statement
-
         
         endif   //6-col data
@@ -666 +658 @@
 
         writeNISTXML(outfileName, nf)
+
+        //Tidy up AFTER we're all done, since STRUCT points to wave0,wave1, etc.
+        Variable i = 0
+        do
+                WAVE/Z wv= $(StringFromList(i,S_waveNames,";"))
+                if( WaveExists(wv) == 0 )
+                        break
+                endif
+                KillWaves wv
+                i += 1
+        while (1)       // exit is via break statement
 
 end
@@ -695 +698 @@
                 if (stringmatch(buffer,"*FIRST File LABEL:*") == 1)
                         NISTfile.title = TrimWS(StringFromList(1,buffer, ":"))
-                elseif(stringmatch(buffer,"*LABEL:*") == 1)
+                endif
+                if(stringmatch(buffer,"*LABEL:*") == 1)
                         NISTfile.title = TrimWS(StringFromList(1,buffer, ":"))
+                endif
+                if(stringmatch(buffer,"NSORT*") == 1)
+                        NISTfile.title = buffer
                 endif