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

Timestamp:

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

Author:

ajj

Message:

Modifications to NSORT to use data folder methods for dataset handling

• XML input supported
• No XML output yet, but preparation work done.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf (modified) (12 diffs)

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

@@ -12 +12 @@
 // Dec 2008 : 
 //                       Caveats - Assumes Q in /A and I in /cm
-function LoadNISTXMLData(filestr,doPlot)
-        String filestr
-        Variable doPlot
+// Takes outStr as output name. If outStr is specified then we must load only the first SASData in the firstSASEntry, 
+// since anything else doesn't make sense. This is a bit of a hack to support NSORT.
+
+
+function LoadNISTXMLData(filestr,outStr,doPlot,forceOverwrite)
+        String filestr,outStr
+        Variable doPlot,forceOverwrite
         
         
@@ -35 +39 @@
                         String xmlDataFolder,xmlDataSetFolder
                         
-                        for (i = 0; i < CountObjects(xmlReaderFolder,4); i+=1)
+                        Variable numSASEntries
+                        
+                        if(!cmpStr(outStr,""))
+                                //no outStr defined
+                                numSASEntries = CountObjects(xmlReaderFolder,4)
+                        else
+                                numSASEntries = 1
+                        endif
+                        
+                        for (i = 0; i < numSASEntries; i+=1)
                                                                 
                                 xmlDataFolder = xmlReaderFolder+GetIndexedObjName(xmlReaderFolder,4,i)+":"
-                                numDataSets = CountObjects(xmlDataFolder,4)
+                                if (!cmpstr(outstr,""))
+                                        numDataSets = CountObjects(xmlDataFolder,4)
+                                else
+                                        numDataSets = 0
+                                endif
+                                
                                 if (numDataSets > 0)
                                         //Multiple SASData sets in this SASEntry
@@ -48 +66 @@
                                         
                                                 basestr = CleanupName(getXMLDataSetTitle(xmlDataSetFolder,j),0)
+                                                
                                                 //String basestr = ParseFilePath(3, ParseFilePath(5,filestr,":",0,0),":",0,0)                           
                                                 fileName =  ParseFilePath(0,ParseFilePath(5,filestr,":",0,0),":",1,0)
@@ -57 +76 @@
                                                 //print "fileName: ",fileName
                                                 //remove the semicolon AND period from files from the VAX
+                                                print basestr
                                                 w0 = basestr + "_q"
                                                 w1 = basestr + "_i"
@@ -65 +85 @@
                                                 
                                                 if(DataFolderExists("root:"+baseStr))
+                                                        if(!forceOverwrite)
                                                                 DoAlert 1,"The data set " + basestr + " from file "+fileName+" has already been loaded. Do you want to load the new data file, overwriting the data in memory?"
                                                                 if(V_flag==2)   //user selected No, don't load the data
@@ -73 +94 @@
                                                                         return  0       //quits the macro
                                                                 endif
-                                                                SetDataFolder $("root:"+baseStr)
+                                                        endif
+                                                        SetDataFolder $("root:"+baseStr)
                                                 else
                                                         NewDataFolder/S $("root:"+baseStr)
@@ -81 +103 @@
                                                 Duplicate/O $(xmlDataSetFolder+"Isas") $w1
                                                 Duplicate/O $(xmlDataSetFolder+"Idev") $w2
-                
-                
-                                                        
+
+                                                
                                                 if (exists(xmlDataSetFolder+"Qdev"))
                                                         Wave Qsas = $(xmlDataSetFolder+"Qsas")
@@ -173 +194 @@
                                         print xmlDataFolder
                                         
-                                        basestr = CleanupName(getXMLDataSetTitle(xmlDataFolder,0),0)
+                                        //if outstr has been specified, we'll find ourselves here....
+                                        if (!cmpstr(outstr,""))
+                                                basestr = CleanupName(getXMLDataSetTitle(xmlDataFolder,0),0)
+                                        else
+                                                basestr = CleanupName(outstr,0)
+                                        endif
+                                        
                                         //String basestr = ParseFilePath(3, ParseFilePath(5,filestr,":",0,0),":",0,0)                           
                                         fileName =  ParseFilePath(0,ParseFilePath(5,filestr,":",0,0),":",1,0)
@@ -186 +213 @@
                                         
                                         if(DataFolderExists("root:"+baseStr))
+                                                if(!forceOverwrite)
                                                         DoAlert 1,"The data set " + basestr + " from file "+fileName+" has already been loaded. Do you want to load the new data file, overwriting the data in memory?"
                                                         if(V_flag==2)   //user selected No, don't load the data
@@ -194 +222 @@
                                                                 return  0       //quits the macro
                                                         endif
-                                                        SetDataFolder $("root:"+baseStr)
+                                                endif
+                                                SetDataFolder $("root:"+baseStr)
                                         else
                                                 NewDataFolder/S $("root:"+baseStr)
@@ -963 +992 @@
 End
 
+
+
+
 #else   // if( Exists("XmlOpenFile") )
         // No XMLutils XOP: provide dummy function so that IgorPro can compile dependent support code
@@ -986 +1018 @@
                 return(-6)
         end
-        
+
         Function ReWrite1DXMLData(folderStr)
                 String folderStr