Changeset 683

Timestamp:

Apr 12, 2010 11:03:04 AM (12 years ago)

Author:

srkline

Message:

Updated version of HFIR_DataReadWrite.ipf from Jae Hie.

Updated the initialization of the templates from other facilities to remove the NCNR_Package_Loader.ipf since they are by definition incompatible.

Forward/Back? incrementing of the run number (as for the 2D display) has been moved to the Facility_Utils.ipf for all facilities and for the template.

Location:

sans/Dev/trunk

Files:

• NCNR_SANS_Utilities/Other_Facilities/HFIR_Reduction_v5.2.pxt (modified) (previous)
• NCNR_User_Procedures/Reduction/SANS/ANSTO_Utils.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/SANS/Buttons.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Reduction/SANS/FACILITY_Utils.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/SANS/HFIR_DataReadWrite.ipf (modified) (93 diffs)
• NCNR_User_Procedures/Reduction/SANS/HFIR_Includes_v520.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/SANS/HFIR_Utils.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/SANS/ILL_Utils.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/SANS/Initialize.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ANSTO_Utils.ipf

@@ -869 +869 @@
         return("Function Empty")
 End
+
+// Return the filename that represents the previous or next file.
+// Input is current filename and increment. 
+// Increment should be -1 or 1
+// -1 => previous file
+// 1 => next file
+Function/S GetPrevNextRawFile(curfilename, prevnext)
+        String curfilename
+        Variable prevnext
+
+        String filename
+        
+        //get the run number
+        Variable num = GetRunNumFromFile(curfilename)
+                
+        //find the next specified file by number
+        fileName = FindFileFromRunNumber(num+prevnext)
+
+        if(cmpstr(fileName,"")==0)
+                //null return, do nothing
+                fileName = FindFileFromRunNumber(num)
+        Endif
+
+//      print "in FU "+filename
+
+        Return filename
+End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Buttons.ipf

@@ -214 +214 @@
         SVAR oldName = root:Packages:NIST:RAW:fileList
         
-        print oldName
+//      print oldName
         
         filename = oldname
@@ -221 +221 @@
         endfor  
         
-        print filename
+//      print filename
         
         // display the specified RAW data file

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/FACILITY_Utils.ipf

@@ -703 +703 @@
         return("Function Empty")
 End
+
+
+// Return the filename that represents the previous or next file.
+// Input is current filename and increment. 
+// Increment should be -1 or 1
+// -1 => previous file
+// 1 => next file
+Function/S GetPrevNextRawFile(curfilename, prevnext)
+        String curfilename
+        Variable prevnext
+
+        String filename
+        
+        //get the run number
+        Variable num = GetRunNumFromFile(curfilename)
+                
+        //find the next specified file by number
+        fileName = FindFileFromRunNumber(num+prevnext)
+
+        if(cmpstr(fileName,"")==0)
+                //null return, do nothing
+                fileName = FindFileFromRunNumber(num)
+        Endif
+
+//      print "in FU "+filename
+
+        Return filename
+End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/HFIR_DataReadWrite.ipf

@@ -41 +41 @@
         PathInfo/S catPathName          //should set the next dialog to the proper path...
         //get the filename, then read it in
-        filename = PromptForPath(msgStr)                //in SANS_Utils.ipf
+        filename = PromptForPath(msgStr)//in SANS_Utils.ipf
+        
         //check for cancel from dialog
         if(strlen(filename)==0)
@@ -77 +78 @@
                 DoAlert 0, errorMsg
                 //Clean up waves...
-                KillWaves/Z M_listAttr, nsList,W_xmlcontentnodes
+                //KillWaves/Z M_listAttr, nsList,W_xmlcontentnodes
                 return(1)               //Do not change.
         endif
@@ -87 +88 @@
 //      fRawWindowHook()
         SetDataFolder root:
-        //Clean up waves...
-        KillWaves/Z M_listAttr, nsList,W_xmlcontentnodes
         
         Print "Time to load and display (s) = ",(ticks-t1)/60.15
@@ -138 +137 @@
         refNum = XmlOpenFile(filename)  
         if (refNum < 0)
+                XmlCloseFile(refNum,0)
                 //print "\r  ==> Failed: Not a standard xml file format."
                 return (-2)                             //Not a xml file. Do nothing...
@@ -154 +154 @@
         ///////////////////////////////////////////////////////////////////////////////////////////////\/\/\/\ from P. R. Jemian
         
-        //temp list of ns
-        Make/T/N=(1)/O nsList
-        nsList[0] = "1.1" 
-        
         // Check if  it is the SPICE version = 1.1
-        Variable  item,i
-        String thislocation,ns = ""
-
-        for (item = 0; item < DimSize(nsList, 0); item += 1)            // loop over all possible namespaces
-                XMLlistAttr(refNum, "/SPICErack", nsList[item])
-                wave/T M_listAttr
-        
-                for (i = 0; i < DimSize(M_listAttr,0); i+=1)                    // loop over all available attributes
-                        // Expect the required hfir XML header (will fail if "schemalocation" is not found)
-                        if ( CmpStr(  LowerStr(M_listAttr[i][1]),  LowerStr("SPICE_version") ) == 0 )
-                                thisLocation = HFIR_TrimWS(M_listAttr[i][2])
-                                if ( StringMatch(thisLocation, nsList[item] + "*") )
-                                        ns = nsList[item]                       
-                                                
-                                        Break   // found it!
-                                endif
-                        endif
-                endfor
-                if (strlen(ns))
-                        Break           
-                endif
-        endfor
-
-        if (StringMatch(ns,"1.1") <1)
+        String ns_ver = "1.1"
+        Variable ns = 0
+        ns = str2num(XMLstrFmXpath(refNum, "//SPICErack/@SPICE_version","",""))
+        
+        // older version        
+        if (ns <1.1)
                 //errorMsg = filename + ": This SPICE version is not supported"
                 XmlCloseFile(refNum,0)
-                KillWaves/Z M_listAttr, nsList,W_xmlcontentnodes
                 SetDataFolder root:
                 return (-4)
         endif
-        
         
         //this function is for reading in RAW data only, so it will always put data in RAW folder
@@ -218 +194 @@
         //data =0
         
-//      Print "Time to open (s) = ",(ticks-t1)/60.15
-
         //ORNL HFIR SANS DATA
-        String tempheadhfir
-        tempheadhfir = ""
-        
-        ReadHFIRSansRaw(refNum,curFolder,tempheadhfir) 
-       
-        i=0
-        do      
-                //Take the file name from "actual file name", not from the header: (JC found some cases that those are different.)
-                //This DOLOOP can be removed where the problem is solved....
-                textw[0]=stringfromlist(i,filename,":") 
-                if (stringmatch(textw[0],"*.xml")>0)                    
-                        break
-                endif
-                i +=1
-        while (1)
-        
+        String tempheadhfir =""
+       ReadHFIRSansRaw(refNum,curFolder,tempheadhfir) 
+
+       //Take the file name from "actual file name", not from the header: (JC found some cases that those are different.)
+       //This  can be removed where the problem is solved....
+       textw[0]=GetFName(filename,  1)
+
+        SetDataFolder curPath
+        String/G fileList = textw[0]
         //return the data folder to root
         SetDataFolder root:
-        //clean up - get rid of w = $"root:Packages:NIST:RAW:tempGBWave0"
-        KillWaves/Z M_listAttr, nsList,W_xmlcontentnodes
-        
-        XMLclosefile(refNum, 0)
+
         Return 0
 
@@ -256 +220 @@
 //
 //
+
 Proc ReadWork_DIV()
-//      Silent 1
         
         String fname = PromptForPath("Select detector sensitivity file")
@@ -265 +229 @@
         NewImage/F/K=1/S=2 $waveStr             //this is an experimental IGOR operation
         ModifyImage '' ctab= {*,*,YellowHot,0}
-        //Display;AppendImage $waveStr
-        
-        //change the title string to WORK.DIV, rather than PLEXnnn_TST_asdfa garbage
+
         String/G root:Packages:NIST:DIV:fileList = "WORK.DIV"
         
         SetDataFolder root:             //(redundant)
-//      Silent 0
 End
 
@@ -325 +286 @@
         refNum = XmlOpenFile(fname)     
         if (refNum < 0)
+                XMLclosefile(refNum, 0)
                 return 0                                //Not a xml file. Do nothing...
         endif
+        
         //ORNL HFIR SANS DATA
-        String tempheadhfir
-        tempheadhfir = ""
+        String tempheadhfir =""
        ReadHFIRSansRaw(refNum,cur_folder,tempheadhfir) 
-       Variable i=0
-       do       
-        //Take the file name from "actual file name", not from the header: (JC found some cases that those are different.)
-        textw[0]=stringfromlist(i,fname,":") 
-        if (stringmatch(textw[0],"*.xml")>0)                    
-                break
-        endif
-        i +=1
-       while (1)
-
-        //divide the FP data by 4 if read from a PC (not since GBLoadWave update)
-        //if(cmpstr("Macintosh",IgorInfo(2)) == 0)
-                //do nothing
-        //else
-                //either Windows or Windows NT
-                //data /= 4
-        //endif
+
+        //Take the file name from "actual file name", not from the header: (JC found some cases that those are different.)
+       //This  can be removed where the problem is solved....
+       textw[0]=GetFName(fname,  1)
         
         //keep a string with the filename in the DIV folder
         String/G $(curPath + ":fileList") = textw[0]
 
-        XMLclosefile(refNum, 0)
         //return the data folder to root
         SetDataFolder root:
@@ -417 +365 @@
         
         KillWaves/Z temp0 
-        
+        Close/A
         //return the data folder to root
         SetDataFolder root:
@@ -494 +442 @@
         formatStr="FILE: %s CREATED: %s"
         sscanf hdr[0],formatStr,tempStr,junkStr
-//      Print tempStr
-//      Print junkStr
+
         String/G $("root:"+destFolder+":fileList") = tempStr
         textw[0] = tempStr              //filename
         textw[1] = junkStr              //run date-time
         
-        //file label = hdr[1]
         tempStr = hdr[1]
         tempStr = tempStr[0,strlen(tempStr)-2]          //clean off the last LF
-//      Print tempStr
+
         textW[6] = tempStr      //sample label
         
@@ -515 +461 @@
         String fname, wantedterm                                //full path:name, term name
         
-        
         String str = ""
         Variable refNum,i
         
-        //actually open the file
+        //check the ext.
         if (stringmatch(fname,"*.xml") <1)
                 //print "Failed: Not a *.xml file."
@@ -528 +473 @@
         if (refNum < 0)
                 //print "Failed: Not a xml file."
+                XmlCloseFile(refNum,0)
                 return (str)                            //Not a xml file. Do nothing...
         endif
 
         //ORNL HFIR SANS strings meta DATA
-        if (stringmatch("filename",wantedterm)>0)
-                i=0
-        do      
-                //Get the file name from "actual file name", not from the header: (JC found some cases that those are different.)
-                //This DOLOOP can be removed when the problem is solved....
-                str=stringfromlist(i,fname,":") 
-                if (stringmatch(str,"*.xml")>0 && stringmatch(stringfromlist(i+1,fname,":"),"")>0)                      
-                        break
-                endif
-                i +=1
-        while (1)
+        if (stringmatch("*filename",wantedterm)>0)
+                str =GetFName(fname,  1)
         else
                 str=ReadSFromHHead(refNum,wantedterm)  //Get it from the header.
@@ -549 +486 @@
         //return the data folder to root
         //SetDataFolder root:
-        XMLclosefile(refNum, 0)
                 
         return(str)
@@ -560 +496 @@
         String fname
         
-        return(getStringFromHeader(fname,"suffix"))             //!!!!!!!!!!!!!!!!!!!!!!!!!
+        return(getStringFromHeader(fname,"//suffix"))           //!!!!!!!!!!!!!!!!!!!!!!!!!
 End
 
@@ -568 +504 @@
         String fname
         
-        return(getStringFromHeader(fname,"assoc_suffix"))               //!!!!!!!!!!!!!!!!!!!!!!!!!
+        return(getStringFromHeader(fname,"//assoc_suffix"))             //!!!!!!!!!!!!!!!!!!!!!!!!!
 End
 
@@ -575 +511 @@
         String fname
         
-        return(getStringFromHeader(fname,"Scan_Title"))
+        return(getStringFromHeader(fname,"//Header/Scan_Title"))
 End
 
@@ -582 +518 @@
         String fname
  
-        return(getStringFromHeader(fname,"start_time"))
+        return(getStringFromHeader(fname,"//SPICErack/@start_time"))
 End
 
@@ -588 +524 @@
 Function/S getIsTrans(fname)
         String fname
-        return(getStringFromHeader(fname,"Transmission"))
+        return(getStringFromHeader(fname,"//Header/Transmission"))
 End
 
@@ -598 +534 @@
         Variable refNum
         
-        //actually open the file
         if (stringmatch(fname,"*.xml") <1)
                 //print "Failed: Not a *.xml file."
@@ -609 +544 @@
                 return 0                                //Not a xml file. Do nothing...
         endif
-        
+
         //ORNL HFIR SANS strings meta DATA
        vresult=ReadVFromHHead(refNum,wantedterm,unit) 
-       
-        //return the data folder to root
-        //SetDataFolder root:
-        XMLclosefile(refNum, 0)
         
         return(vresult)
@@ -624 +555 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"monitor",""))
+        return(getRealValueFromHeader(fname,"//Counters/monitor",""))
 end
 
@@ -631 +562 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"monitor",""))  //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!??
+        return(getRealValueFromHeader(fname,"//Counters/monitor",""))  //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!??
 end
 
@@ -638 +569 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"psd",""))   //Need to check!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        return(getRealValueFromHeader(fname,"//Counters/psd",""))   //Need to check!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 end
 
@@ -645 +576 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"attenuation","percent")) //in unit of percents
+        return(getRealValueFromHeader(fname,"//Motor_Positions/attenuation","percent")) //in unit of percents
 end
 
@@ -651 +582 @@
 Function getSampleTrans(fname)
         String fname
-        return(getRealValueFromHeader(fname,"Transmission_for_Sample",""))
+        return(getRealValueFromHeader(fname,"//Transmission_for_Sample",""))
 end
 
@@ -658 +589 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"Box_Counts",""))           
+        return(getRealValueFromHeader(fname,"//Box_Counts",""))                 
 end
 
@@ -665 +596 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"detector","")) //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        return(getRealValueFromHeader(fname,"//Counters/detector","")) //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 end
 
@@ -672 +603 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"Sample_Thickness","cm"))
+        return(getRealValueFromHeader(fname,"//Header/Sample_Thickness","cm"))
 end
 
@@ -686 +617 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"temp","C")) 
+        return(getRealValueFromHeader(fname,"//Parameter_Positions/tsample","C"))   
 end
 
@@ -693 +624 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"magnetic_field","G"))
+        return(getRealValueFromHeader(fname,"//magnetic_field","G"))
 end
 
@@ -700 +631 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"beam_center_x_pixel",""))
+        return(getRealValueFromHeader(fname,"//Header/beam_center_x_pixel",""))
 end
 
@@ -707 +638 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"beam_center_y_pixel",""))
+        return(getRealValueFromHeader(fname,"//Header/beam_center_y_pixel",""))
 end
 
@@ -714 +645 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"sample_det_dist","m"))
+        return(getRealValueFromHeader(fname,"//Motor_Positions/sample_det_dist","m"))
 end
 
@@ -721 +652 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"detector_trans","cm"))  //cm:  HFIR mm
+        return(getRealValueFromHeader(fname,"//Motor_Positions/detector_trans","cm"))  //cm:  HFIR mm
 end
 
@@ -728 +659 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"beam_trap_size","mm"))  //check if this beamstop diameter?
+        return(getRealValueFromHeader(fname,"//Motor_Positions/beam_trap_size","mm"))  //check if this beamstop diameter?
 end
 
@@ -735 +666 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"source_aperture_size","mm"))
+        return(getRealValueFromHeader(fname,"//Header/source_aperture_size","mm"))
 end
 
@@ -742 +673 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"sample_aperture_size","mm"))
+        return(getRealValueFromHeader(fname,"//Header/sample_aperture_size","mm"))
 end
 
@@ -749 +680 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"source_distance","m")) //unit=m   :hfir = mm
+        return(getRealValueFromHeader(fname,"//Header/source_distance","m")) //unit=m   :hfir = mm
 end
 
@@ -756 +687 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"wavelength", "A"))
+        return(getRealValueFromHeader(fname,"//Header/wavelength", "A"))
 end
 
@@ -763 +694 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"wavelength_spread",""))
+        return(getRealValueFromHeader(fname,"//Header/wavelength_spread",""))
 end
 
@@ -777 +708 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"x_mm_per_pixel","mm"))
+        return(getRealValueFromHeader(fname,"//Header/x_mm_per_pixel","mm"))
 end
 
@@ -784 +715 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"y_mm_per_pixel","mm"))
+        return(getRealValueFromHeader(fname,"//Header/y_mm_per_pixel","mm"))
 end
 
@@ -792 +723 @@
         Variable mtime
         
-        mtime = getRealValueFromHeader(fname,"time","")
+        mtime = getRealValueFromHeader(fname,"//Counters/time","")
         if (mtime == 0)
-                mtime = 1               //get rid of a singular for calculating a rate.
+                mtime = 1               //get rid of a singular for calculating a rate in case.
         endif 
         return(mtime)
@@ -808 +739 @@
         Variable vresult
         
-        //actually open the file
         if (stringmatch(fname,"*.xml") <1)
                 //print "Failed: Not a *.xml file."
@@ -814 +744 @@
         endif
         //actually open the file
-        refNum = XmlOpenFile(fname)     
+        refNum = XmlOpenFile(fname)
+        XMLclosefile(refNum, 0)
         if (refNum < 0)
                 //print "Failed: Not a xml file."
@@ -822 +753 @@
         //ORNL HFIR SANS strings meta DATA
        vresult=ReadVFromHHead(refNum,wanted, "") 
-        
-        //return the data folder to root
-        //SetDataFolder root:
-        XMLclosefile(refNum, 0)
                 
         return(0)
@@ -841 +768 @@
         Variable lambdaFromFile, fileVar, junkVal
         lambdaFromFile = 6.0
+
         Open/R/P=catPathName fileVar as tempName
         FReadLine fileVar, junkString
@@ -876 +804 @@
         
         // return your bounding box coordinates or default values of 0
-        x1=getRealValueFromHeader(fname,"XYBox_x1","")
-        x2=getRealValueFromHeader(fname,"XYBox_x2","")
-        y1=getRealValueFromHeader(fname,"XYBox_y1","")
-        y2=getRealValueFromHeader(fname,"XYBox_y2","")
+        x1=getRealValueFromHeader(fname,"//XYBox_x1","")
+        x2=getRealValueFromHeader(fname,"//XYBox_x2","")
+        y1=getRealValueFromHeader(fname,"//XYBox_y1","")
+        y2=getRealValueFromHeader(fname,"//XYBox_y2","")
         
         if (x1 == -1 || x2 == -1 || y1 == -1 || y2 == -1)
@@ -907 +835 @@
         sprintf y2str, "%d", y2
 
-        WriteHFIRHead(fname,x1str,"XYBox_x1" ,"")       
-        WriteHFIRHead(fname,x2str,"XYBox_x2" ,"") 
-        WriteHFIRHead(fname,y1str,"XYBox_y1" ,"") 
-        WriteHFIRHead(fname,y2str,"XYBox_y2" ,"") 
+        WriteHFIRHead(fname,x1str,"/SPICErack/XYBox_x1" ,"")    
+        WriteHFIRHead(fname,x2str,"/SPICErack/XYBox_x2" ,"") 
+        WriteHFIRHead(fname,y1str,"/SPICErack/XYBox_y1" ,"") 
+        WriteHFIRHead(fname,y2str,"/SPICErack/XYBox_y2" ,"") 
         
         return(0)
@@ -922 +850 @@
                 
         
-        WriteHFIRHead(fname,suffix,"assoc_suffix" ,"text") 
+        WriteHFIRHead(fname,suffix,"/SPICErack/assoc_suffix" ,"text") 
         return(0)
 end
@@ -993 +921 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 Function ReadHFIRSansRaw(refNum,curFolder,tempheadhfir)
-        Variable refNum
-        String curFolder,tempheadhfir
+    Variable refNum
+    String curFolder,tempheadhfir
       
         String curPath="root:Packages:NIST:"+curFolder
@@ -1008 +936 @@
         Variable ind,i,j,centerdata=1
         Variable pixnumx=0,pixnumy=0
-        String val = ""// numerical and text values
-        Variable value,t1=ticks
+        String val = "", pix_num = ""// numerical and text values
+        Variable value = 0.0,t1=ticks
+        String unitstr =""      //unit string
 
         //Initialize wave values         
-        //   data=1
          realw=0
          intw=0
@@ -1033 +961 @@
          //textw[2]="RAW"      //????
   
-        //if (stringmatch(tempheadhfir,"Number_of_X_Pixels")>0 || stringmatch(tempheadhfir,"Number_of_Y_Pixels")>0)
-                XMLlistAttr(refNum,"/SPICErack/Data/Detector","")
-                WAVE/T M_listAttr
-                for (i = 0; i<DimSize(M_listAttr,0);i+=1)
-                        if ( Strsearch(M_listAttr[i][1],"type",0) !=-1)   //find INT32[xxx,xxx]
-                                pixnumy=Str2num(StringFromList(0,StringFromList(1,M_listAttr[i][2] ,","),"]"))   
-                                pixnumx=Str2num(StringFromList(1,StringFromList(0,M_listAttr[i][2] ,","),"["))
-                                Variable/G root:myGlobals:gNPixelsX=pixnumx
-                                Variable/G root:myGlobals:gNPixelsY=pixnumy     
-                                SetDataFolder curPath
-                          break
-                        endif
-                endfor    
-        //endif
 //      Print "Time to list attributes (s) = ",(ticks-t1)/60.15
-        
-        XMLelemlist(refNum)
-        WAVE/T W_ElementList
 //      Print "Time to list elements (s) = ",(ticks-t1)/60.15
 
-        for (ind = 0; ind<DimSize(W_ElementList,0); ind +=1)
-                        String unitstr =""                                                              //unit string
-                        tempheadhfir = W_ElementList[ind][3]
-                        
-                        //Find unit if exists. If no unit is found, unit convertor will do nothing.
-                        XMLlistAttr(refNum,W_ElementList[ind][0],"")
-                        WAVE/T M_listAttr
-                        for (i = 0; i < DimSize( M_listAttr,0); i+=1)
-                                if (stringmatch(M_listAttr[i][1],"units") >0)
-                                        unitstr = M_listAttr[i][2]
-                                        break
-                                endif
-                        endfor
-                        
-                        //Find string or values.
-                        XMLwaveFmXpath(refNum,W_ElementList[ind][0],""," \t\n\r")
-                        WAVE/T M_xmlContent
-                        
-                        if (DimSize(M_xmlContent, 0)==0)                //For NULL content
-                                Make/O/T /N=1 M_xmlContent                      
-                                M_xmlContent = ""
-                        endif   
-                        
-                        val =  M_xmlContent[0]
-                        
-                        sscanf val, "%f", value
-                        
+        // Get and set the number of pixels from the line just above data.
+        pix_num = XMLstrFmXpath(refNum,"//Data/Detector/@type","","")
+        pixnumx=Str2num(StringFromList(0,StringFromList(1,pix_num ,","),"]"))   
+        pixnumy=Str2num(StringFromList(1,StringFromList(0,pix_num ,","),"["))
+        Variable/G root:myGlobals:gNPixelsX=pixnumx
+        Variable/G root:myGlobals:gNPixelsY=pixnumy     
+        SetDataFolder curPath
+
                         //******Below deleted since HFIR prefers to use <Data type="INT32[xxx,xxx]" for pixnumbers
                         //********Leave the following lines in case they change the policy.
@@ -1091 +983 @@
                         //       SetDataFolder curPath
                         // Note for units: If in-unit is null, out will be unity.
-                        if  (stringmatch(tempheadhfir,"Scan_Title")>0)
-                                for (i = 1; i < DimSize(M_xmlContent,0);i +=1)
-                                        val += " " + M_xmlContent[i]
-                                endfor                  
-                                textw[6] = val
-                        // fake values to get valid deadtime and detector constants
-                        //
-                        //textw[9]=detTyp+"  "          //6 characters 4+2 spaces
-                        //textw[3]="[NGxSANS00]"        //11 chars, NGx will return default values for atten trans, deadtime... 
-                        elseif  (stringmatch(tempheadhfir,"Users")>0)
-                                for (i = 1; i < DimSize(M_xmlContent,0);i +=1)
-                                        val += " " + M_xmlContent[i]
-                                endfor                  
-                                textw[3] = val                          //ToDo: Define
-                        elseif  (stringmatch(tempheadhfir,"Instrument")>0)
-                                for (i = 1; i < DimSize(M_xmlContent,0);i +=1)
-                                        val += " " + M_xmlContent[i]
-                                endfor                  
-                                textw[9] = val                          //ToDo: Define
-                        elseif  (stringmatch(tempheadhfir,"Transmission_for_Sample")>0)
-                                if (value <= 0)
-                                        value = 1               //HFIR default = -1 while NIST package not working if it is <=0: Set default =1. <=NOT good!!!
-                                endif
-                                realw[4] = unit_convert(value,unitstr,"")
-                        elseif  (stringmatch(tempheadhfir,"attenuation")>0)
-                                realw[3] = unit_convert(value,unitstr,"percent")
-                        elseif  (stringmatch(tempheadhfir,"tsample")>0) 
-                                realw[8] = unit_convert(value,unitstr,"C")
-                        elseif  (stringmatch(tempheadhfir,"monitor")>0)
-                                realw[0] =unit_convert(value,unitstr,"")
-                        elseif  (stringmatch(tempheadhfir,"Sample_Thickness")>0)
-                                realw[5]  =unit_convert(value,unitstr,"cm")
-                        elseif  (stringmatch(tempheadhfir,"psd")>0)
-                                realw[2] = unit_convert(value,unitstr,"")    ////Need to check!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-                        elseif  (stringmatch(tempheadhfir,"x_mm_per_pixel")>0)
-                                realw[10] = unit_convert(value,unitstr,"mm")
-                        elseif  (stringmatch(tempheadhfir,"y_mm_per_pixel")>0)
-                                realw[13] =  unit_convert(value,unitstr,"mm")
-                                Variable/G root:myGlobals:PixelResDefault = unit_convert(realw[13],"mm","cm") //back to cm unit for this default value??!!
-                                SetDataFolder curPath
-                        elseif  (stringmatch(tempheadhfir,"beam_center_x_pixel")>0)
-                                realw[16] = unit_convert(value,unitstr,"")
-                        elseif  (stringmatch(tempheadhfir,"beam_center_y_pixel")>0)
-                                realw[17] =unit_convert(value,unitstr,"")
-                        elseif  (stringmatch(tempheadhfir,"beam_trap_size")>0) //what is the beam trap diameter???
-                                realw[21] = unit_convert(value,unitstr,"mm")
-                        elseif  (stringmatch(tempheadhfir,"sample_det_dist")>0)
-                                realw[18] = unit_convert(value,unitstr,"m")
-                        elseif  (stringmatch(tempheadhfir,"time")>0)
-                                intw[1] =unit_convert(value,unitstr,"sec") //Not supported. Assumed in "sec"
-                                intw[2] = intw[1] //???
-                        elseif  (stringmatch(tempheadhfir,"source_aperture_size")>0) //diameter???
-                                realw[23]  = unit_convert(value,unitstr,"mm")
-                        elseif  (stringmatch(tempheadhfir,"sample_aperture_size")>0) //diameter???
-                                realw[24]= unit_convert(value,unitstr,"mm")
+                        textw[6] = XMLstrFmXpath(refNum,"//Header/Scan_Title","","")
+                
+                        textw[3] = XMLstrFmXpath(refNum,"//Header/Users","","")         //ToDo: Define   
                                 
-                        //The units of the source_distance is treated special...
-                        elseif  (stringmatch(tempheadhfir,"source_distance")>0)
-                                if (strlen(unitstr)==0) 
-                                        unitstr = "mm" //Give mm unit since no unit is provided from the file. ///This needs to be corrected soon!!!!
-                                endif
-                                realw[25] =value*length_unit_convert(unitstr,"m") //Unit's Not provided from the file but it is in mm.
-                                
-                        elseif  (stringmatch(tempheadhfir,"wavelength")>0)
-                                realw[26] =unit_convert(value,unitstr,"a")
-                        elseif  (stringmatch(tempheadhfir,"wavelength_spread")>0)
-                                realw[27] =unit_convert(value,unitstr,"")
-                        elseif  (stringmatch(tempheadhfir,"Detector")>0)
-                              SetDataFolder curPath
-                              NVAR pixnumx1= root:myGlobals:gNPixelsX                        
-                              NVAR pixnumy1= root:myGlobals:gNPixelsY
-                              Variable pixnx = pixnumx1, pixny = pixnumy1
-                              realw[20] = realw[10]*pixnx/10                    // physical detector width  in cm  // ToDo: Need to check for ypix size???
-                                Make/O/N=(pixnumx1*pixnumy1) $(curPath+":data")
-                                WAVE  data=$(curPath+":data")
-                                //set the globals to the detector dimensions (pixels)
-                                Redimension/N=(pixnx,pixny) data                        //ORNL pixnums are given from the data file
-                                Variable intens = 0
-                                for (i=0;i<pixnx;i+=1)
-                                        for  (j=0;j<pixny;j+=1)
-                                                sscanf M_xmlContent[j+i*pixny],"%i", intens
-                                                data[i][j]=intens
-                                        endfor
+                        textw[9] = XMLstrFmXpath(refNum,"//Header/Instrument","","")                            //ToDo: Define
+                        
+                        value = ValfromUnit(refNum,"//Transmission_for_Sample","")
+                        if (value <= 0)
+                                value = 1               //HFIR default = -1 while NIST package not working if it is <=0: Set default =1. <=NOT good!!!
+                        endif
+                        realw[4] = value
+                        
+                        realw[3] = ValfromUnit(refNum,"//Motor_Positions/attenuation","percent") 
+                        realw[8] = ValfromUnit(refNum,"//Parameter_Positions/tsample","C") 
+                        realw[0] = ValfromUnit(refNum,"//Counters/monitor","") 
+                        realw[5] = ValfromUnit(refNum,"//Header/Sample_Thickness","cm") 
+                        realw[2] = ValfromUnit(refNum,"//Counters/psd","")       ////Need to check!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+                        realw[10] = ValfromUnit(refNum,"//Header/x_mm_per_pixel","mm")  
+                        realw[13] = ValfromUnit(refNum,"//Header/y_mm_per_pixel","mm")  
+                        Variable/G root:myGlobals:PixelResDefault = unit_convert(realw[13],"mm","cm") //back to cm unit for this default value??!!
+                        SetDataFolder curPath
+                        
+                        realw[16] = ValfromUnit(refNum,"//Header/beam_center_x_pixel","")  
+                        realw[17] = ValfromUnit(refNum,"//Header/beam_center_y_pixel","")  
+                        realw[21] = ValfromUnit(refNum,"//Motor_Positions/beam_trap_size","mm")    //what is different from the beam trap diameter in the file???
+                        realw[18] = ValfromUnit(refNum,"//Motor_Positions/sample_det_dist","m") 
+                        intw[1]  = ValfromUnit(refNum,"//Counters/time","sec")     //Not supported. Assumed in "sec"
+                        intw[2] = intw[1] //???
+                        realw[23]  = ValfromUnit(refNum,"//Header/source_aperture_size","mm")      //diameter???
+                        realw[24]  = ValfromUnit(refNum,"//Header/sample_aperture_size","mm")      //diameter???
+                        realw[25]  = ValfromUnit(refNum,"//Header/source_distance","m")         
+                        realw[26]  = ValfromUnit(refNum,"//Header/wavelength","a")      
+                        realw[27]  = ValfromUnit(refNum,"//Header/wavelength_spread","")        
+                        
+                        //Set pixel numbers 
+                        //SetDataFolder curPath
+                        NVAR pixnumx1= root:myGlobals:gNPixelsX                      
+                        NVAR pixnumy1= root:myGlobals:gNPixelsY
+                        Variable pixnx = pixnumx1, pixny = pixnumy1
+                        realw[20] = realw[10]*pixnx/10.0                        // physical detector width  in cm  // ToDo: Need to check for ypix size???
+                        
+                        //prepare to get data
+                        Make/O/N=(pixnumx1*pixnumy1) $(curPath+":data")
+                        WAVE  data=$(curPath+":data")
+                        //set the globals to the detector dimensions (pixels)
+                        Redimension/N=(pixnx,pixny) data                        //ORNL pixnums are given from the data file
+                        Variable intens = 0
+        
+                        // Read 2d data
+                        XMLwaveFmXpath(refNum,"/SPICErack/Data/Detector",""," \t\n\r")
+                        WAVE/T M_xmlContent
+                        for (i=0;i<pixnx;i+=1)
+                                for  (j=0;j<pixny;j+=1)
+                                        sscanf M_xmlContent[j+i*pixny],"%i", intens
+                                        data[i][j]=intens
                                 endfor
-                        endif
+                        endfor
+                        
+
                         
                         ///////unit test 1/2//////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1183 +1049 @@
                         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 
-       endfor
-       
-//      Print "Time to loop over elements (s) = ",(ticks-t1)/60.15
-
-       //If the data is a sensitivity scan, normalize so that the average =1.
-       print curFolder
-        if (stringmatch(curFolder,"DIV") >0)
-                WaveStats/Z/Q data
-                data /= V_avg
-        endif
-        //keep a string with the filename in the RAW folder
+
+
+          //If the data is a sensitivity data, need to be narmalize so that the average over the detector should be 1.
+         If (stringmatch(curFolder, "DIV") >0)
+                //Variable V_avg
+                 WaveStats/Z/Q data
+                data /= V_avg
+          endif
+                        
+
+        //keep a string of the filename in the RAW folder
         
         Variable strpos
-        WAVE/T M_listAttr
-        XMLlistAttr(refNum,"/SPICErack","")
-
-        for (i = 0; i<DimSize(M_listAttr,0);i+=1)
-                  if ( Strsearch(M_listAttr[i][1],"filename",0) !=-1)   //find file name
-                       textw[0]=M_listAttr[i][2]     //filename
-
-                  elseif (Strsearch(M_listAttr[i][1],"start_time",0) !=-1) 
-                       textw[1]=M_listAttr[i][2]                //Date and Time
-                                                        
-                       textw[5]=StringFromList(0,textw[1]," ")                                                //Date
-                  endif
-        endfor    
-        String/G $(curPath+":FileList") = textw[0]
+                
+        textw[0] = RemoveAllSpaces(XMLstrFmXpath(refNum,"//SPICErack/@filename","","") )    //////ShortFileName(RemoveAllSpaces(XMLstrFmXpath(refNum,"//SPICErack/@filename","","") )  )         // file name
+        textw[1] =   XMLstrFmXpath(refNum,"//SPICErack/@start_time","","")              //Date and Time
+        textw[5]=StringFromList(0,textw[1]," ")                                                                         //Date
+        
+        //String/G $(curPath+":FileList") = textw[0]
         
         ///////unit test 2/2//////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1224 +1082 @@
         //endfor
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        
+        // We have everything from file: Need to close the file soon as possible
+        XMLclosefile(refNum, 0) 
         SetDataFolder curPath
-        
-//      Print "Time to exit reader (s) = ",(ticks-t1)/60.15
-                
-//      Killwaves/Z nsList,M_listAttr,M_xmlContent,W_ElementList,M_listXPath,W_xmlcontentnodes
-        return(0)
-        
+        Killwaves/Z M_listXPath
+End
+
+/// Get real value in NIST unit ///////////////////////////////////////////////////////////////////////////////////////////////////
+Function ValfromUnit(refNum,wantedterm,NISTunit)
+        Variable refNum    //FileID
+        String wantedterm,NISTunit  //Xpath, value in string, unit from HFIR, unit from NIST
+        
+        String val="", unitstr=""
+        Variable value = 0.0 
+        //SetDataFolder curPath ////????????/
+        
+        val =   XMLstrFmXpath(refNum,wantedterm,"","")
+        unitstr =  RemoveAllSpaces(XMLstrFmXpath(refNum,wantedterm+"/@units","",""))
+        
+        //The units of the source_distance is treated special...
+        if (stringmatch(wantedterm,"*source_distance")>0 )
+                if  (strlen(unitstr)==0)
+                        unitstr = "mm"          //Give mm unit since no unit is provided from the file. ///This needs to be corrected soon!!!!
+                 endif
+        endif
+        //String to double
+        sscanf val, "%f", value
+        Variable data
+        data = unit_convert(value,unitstr,NISTunit)
+
+        return data
 End
 
@@ -1246 +1126 @@
         String  ntype = ""
         String savedDataFolder = GetDataFolder(1)
-        //Default for transmission rate (between 0 to 1): HFIR not provide this as a Float number???? ==>make one
-        if (stringmatch(wantedterm,"Transmission_for_Sample")>0)
+        //Default for transmission rate (between 0 to 1): HFIR not provide this as a Float number???? ==>make one: if exist, read it below.
+        if (stringmatch(wantedterm,"//Transmission_for_Sample")>0)
                 vresult=1               
         endif
         
-        XMLelemlist(refNum)
-        WAVE/T W_ElementList
-
-        for (ind = 0; ind<DimSize(W_ElementList,0); ind +=1)
-                String unitstr = "",tempheadhfir="", val=""
-                tempheadhfir=W_ElementList[ind][3]
-                        
-                //Find the value
-                XMLwaveFmXpath(refNum,W_ElementList[ind][0],""," \t\n\r")
-                WAVE/T M_xmlContent
-                val =  M_xmlContent[0]
-
-                if  (stringmatch("",wantedterm)>0)      
-                        vresult =0
-                        break
-                elseif (stringmatch(tempheadhfir,wantedterm)>0) 
-                        //Find unit if exists.
-                        XMLlistAttr(refNum,W_ElementList[ind][0],"")
-                        WAVE/T M_listAttr
-                        for (i = 0; i < DimSize( M_listAttr,0); i+=1)
-                                if (stringmatch(M_listAttr[i][1],"units") >0)
-                                        unitstr = M_listAttr[i][2]
-                                        break
-                                endif
-                        endfor
-                        ntype ="s"              //TEXT  
-                        for (i = 0; i < DimSize( M_listAttr,0); i+=1)   
-                                if (stringmatch(M_listAttr[i][1],"type")>0)
-                                        if   (stringmatch(M_listAttr[i][2], "INT*")>0)
-                                                ntype = "i"             //INT32
-                                                break
-                                        elseif (stringmatch(M_listAttr[i][2], "FLOAT*")>0)
-                                                ntype ="f"              //FLOAT32
-                                                break
-                                        endif   
-                                endif
-                        endfor  
-                        if (strlen(ntype) == 0)
-                                ntype = "s"                     //for no "type" attr.
-                        endif           
-                        String ustr ="%f"                               //default: float
-                        if (stringmatch(ntype,"i") > 0) //for integer   
-                                ustr = "%d"
-                        endif   
+        String unitstr = "", typestr="",tempheadhfir="", val=""
+
+        if (stringmatch(wantedterm,"") >0 ) // set zero if wnatedterm is "" ,not defined(eg., rotation angle).
+                vresult =0
+                //close here
+                XMLclosefile(refNum, 0)
+                return vresult
+        else
+                //Find the value,unit, and type of the value: a little ugly but faster...
+                val =   XMLstrFmXpath(refNum,wantedterm,"","")
+                unitstr =  RemoveAllSpaces(XMLstrFmXpath(refNum,wantedterm+"/@units","",""))
+                typestr =  RemoveAllSpaces(XMLstrFmXpath(refNum,wantedterm+"/@type","",""))
+                //close here
+                XMLclosefile(refNum, 0)
+        endif
+        
+        if   (stringmatch(typestr , "INT*")>0)
+                ntype = "i"             //INT32
+        elseif (stringmatch(typestr , "FLOAT*")>0)
+                ntype ="f"              //FLOAT32
+        else
+                ntype ="s"              //TEXT
+        endif   
+        
+        String ustr ="%f"                               //default: float
+        if (stringmatch(ntype,"i") > 0) //for integer   
+                ustr = "%d"
+        endif   
                                         
-                        //Special case starts!!! 
-                        //No unit found in hfir ("mm") but needs to convert to meters.
-                        //The following 3 lines should be removed once HFIR puts th units on the raw data files.
-                        if (stringmatch(wantedterm,"source_distance")>0&& strlen(unitstr) ==0)
-                                unitstr = "mm"          
-                        endif
-                        //Special case ends!!!
-                        sscanf val, ustr, value
-                        
-                        vresult = unit_convert(value,unitstr,NCunit)
-                        //Set PixResDefault from y_mm_per_pixel (not x_mm_per_pixel!!!!!!!!)
-                        if (stringmatch(wantedterm,"y_mm_per_pixel")>0)
-                                Variable/G root:myGlobals:PixelResDefault = unit_convert(vresult,"mm","cm") //back to cm unit for this default value??!!
-                                SetDataFolder savedDataFolder           //In case...
-                        endif
-                        break
-                 endif
+        //Special case starts!!! 
+        //No unit found in hfir ("mm") but needs to convert to meters.
+        //The following 3 lines should be removed once HFIR puts th units on the raw data files.
+        if (stringmatch(wantedterm,"*source_distance")>0&& strlen(unitstr) ==0)
+                unitstr = "mm"          
+        endif
+        //Special case ends!!!
+        
+        //Do NOT use str2num(): will loose many decimal digits.
+        sscanf val, ustr, value 
+        vresult = unit_convert(value,unitstr,NCunit)
+        if (stringmatch(wantedterm,"*Transmission_for_Sample")>0 && vresult == 0)
+                 //Transmission default value if it was set to 0.
+                 vresult = 1
+        endif
+                        
+        //Set PixResDefault from y_mm_per_pixel (not x_mm_per_pixel!!!!!!!!)
+        if (stringmatch(wantedterm,"*y_mm_per_pixel")>0)
+                 Variable/G root:myGlobals:PixelResDefault = unit_convert(vresult,"mm","cm") //back to cm unit for this default value??!!
+                 SetDataFolder savedDataFolder          //In case...
+        endif
+
                 
-      endfor
-        KillWaves/Z W_ElementList,M_xmlContent
         return (vresult)
 
@@ -1328 +1195 @@
       
       String tempheadhfir = ""
-      String result = "",gotterm ="n" 
+      String result = "",gotterm ="n" ,name
         Variable ind,i
 
       if   (stringmatch(wantedterm,"")>0) 
                 result = ""
+                XMLclosefile(refNum, 0)
                 return (result)
         endif
-
-        XMLlistAttr(refNum,"/SPICErack","")
-        WAVE/T M_listAttr
-        if (stringmatch("filename",wantedterm)>0 ||  stringmatch("start_time",wantedterm)>0)
-                for (i = 0; i<DimSize(M_listAttr,0);i+=1)
-                         if ( Strsearch(M_listAttr[i][1],wantedterm,0) !=-1  )  
-                                result=M_listAttr[i][2]    
-                                gotterm ="y" 
-                                break
-                        endif
-                endfor    
-        else
-                XMLelemlist(refNum)
-                WAVE/T W_ElementList
-
-                for (ind = 0; ind<DimSize(W_ElementList,0); ind +=1)
-                
-                        tempheadhfir=W_ElementList[ind][3]
-                        
-                        XMLwaveFmXpath(refNum,W_ElementList[ind][0],""," \t\n\r")
-                        WAVE/T M_xmlContent
-                        
-                        if (DimSize(M_xmlContent, 0)==0)                //For NULL content
-                                Make/O/T /N=1 M_xmlContent                      
-                                M_xmlContent = ""
-                        endif   
-
-                        result =  M_xmlContent[0]
-                        
-                        if (stringmatch(tempheadhfir,wantedterm)>0)             
-                                for (i = 1; i < DimSize(M_xmlContent,0);i +=1)
-                                        result += " " + M_xmlContent[i]
-                                endfor          
-                                gotterm ="y"    
-                                break
-                        endif
-                endfor
-        endif
-        
+        
+        result =  XMLstrFmXpath(refNum,wantedterm,"","")
+        if (stringmatch(result, "") != -1 )     
+                gotterm ="y"    
+        endif
+
+        //HFIR header does not have "suffix" tag but one can get the info from file name before user writes the tag into the header.
+        if (stringmatch("",result)>0     && stringmatch("//suffix",wantedterm)>0 )
+                name = RemoveAllSpaces(XMLstrFmXpath(refNum,"//SPICErack/@filename","",""))
+                result=StringFromList(2,StringFromList(0, name,"."), "_")+"_"+StringFromList(3,StringFromList(0,name,"."), "_")
+        endif
+
+        //Close file here.
+        XMLclosefile(refNum, 0)
         
         if (stringmatch(gotterm,"n")>0 ) 
                 result = ""
-        endif
-        //HFIR header does not have "suffix" tag but one can get the info from file name before user writes the tag into the header.
-        if (stringmatch("suffix",wantedterm)>0 && stringmatch("",result)>0)                     
-                for (i = 0; i<DimSize(M_listAttr,0);i+=1)
-                         if ( Strsearch(M_listAttr[i][1],"filename",0) !=-1  )  
-                                result=StringFromList(2,StringFromList(0,M_listAttr[i][2],"."), "_")+"_"+StringFromList(3,StringFromList(0,M_listAttr[i][2],"."), "_")
-                                break
-                        endif
-                endfor   
-        //make sure not to have a left-over content (only for text; numbers are set to -1 later as a default if not found)
-        //else
-        endif
-        
-        //Make sure to clean up things...
-        KillWaves/Z M_listAttr,W_ElementList,M_xmlContent,,W_xmlcontentnodes
-        
+        endif   
+
       return (result)
 End
@@ -1412 +1241 @@
         Variable typenum = 0
         String ntype = ""       //Do not change this initial, "".
-        String nstr = "/SPICErack"              //to add new nodes and content.
+        String nstr = "/SPICErack"              //to add new nodes and content: NEVER CAHNGE this string
         String errorMsg =""
         
@@ -1436 +1265 @@
                 return -1                               //Not a xml file. Do nothing...
         endif
-        
-        XMLelemlist(refNum)
-        WAVE/T W_ElementList
-
-        for (ind = 0; ind<DimSize(W_ElementList,0); ind +=1)
-                String unitstr = "",tempheadhfir="", val=""
-                tempheadhfir=W_ElementList[ind][3]
+
+                String unitstr = "",typestr="", val=""
 
                 if  (strlen(wantedterm)==0)     
                         vresult =0                              //If input is NULL, do nothing...
                         nstr = ""                                       //reset as No new node
-                        break
-                elseif (stringmatch(tempheadhfir,wantedterm)>0) 
-
-                        XMLlistAttr(refNum,W_ElementList[ind][0],"")
-                        WAVE/T M_listAttr
-                                
+
+                else   //(stringmatch(tempheadhfir,wantedterm)>0)       
+                        val =   XMLstrFmXpath(refNum,wantedterm,"","")
+                
                         //Special case starts!!! 
                         //No unit founds in hfir ("mm") file but needs to convert to meters. Let's give it one.
-                        if (stringmatch(wantedterm,"source_distance")>0&& strlen(unitstr) ==0)
-                                unitstr = "mm"          
+                        if (stringmatch(wantedterm,"*source_distance")>0&& strlen(unitstr) ==0)
+                                unitstr = "mm"  
+                                ntype ="f"      
                         //Special case ends!!!
                         else
-                                //Check the unit
-                                for (i = 0; i < DimSize( M_listAttr,0); i+=1)   
-                                        if (stringmatch(M_listAttr[i][1],"units") >0)
-                                                unitstr = M_listAttr[i][2]
-                                                break
-                                        endif
-                                endfor          
+                                unitstr =  XMLstrFmXpath(refNum,wantedterm+"/@units","","")
+                                typestr =  RemoveAllSpaces(XMLstrFmXpath(refNum,wantedterm+"/@type","",""))
+        
                                 ntype ="s"              //TEXT  
-                                for (i = 0; i < DimSize( M_listAttr,0); i+=1)   
-                                        if (stringmatch(M_listAttr[i][1],"type")>0)
-                                                if   (stringmatch(M_listAttr[i][2], "INT*")>0)
-                                                        ntype = "i"             //INT32
-                                                        break
-                                                elseif (stringmatch(M_listAttr[i][2], "FLOAT*")>0)
-                                                        ntype ="f"              //FLOAT32
-                                                        break
-                                                endif   
-                                        endif
-                                endfor  
-                                if (strlen(ntype) == 0)
-                                        ntype = "s"                     //for no "type" attr.
-                                endif           
+                                
+                                        if  (strlen(typestr)==0)
+                                                ntype = "s"
+                                        elseif   (stringmatch(typestr, "INT*")>0)
+                                                ntype = "i"             //INT32
+                                        elseif (stringmatch(typestr, "FLOAT*")>0)
+                                                ntype ="f"              //FLOAT32
+                                        endif   
                         endif
+                        
                         if (stringmatch(ntype,"s") > 0) //for strings           
                                 vresult = 1                     
@@ -1492 +1306 @@
                                 sscanf  value,ustr, vals
                                 vresult = unit_convert(vals,NCunit,unitstr)     //Unit correction...(back to the HFIR unit)
+                                
                                 sprintf valstr,ustr, vresult
-                                //valstr = vresult
                         endif
-                        XMLsetNodeStr(refNum,W_ElementList[ind][0],"",valstr)   //to set
-                        nstr = ""                               //reset as No new node
-                        break
+                        
+                        if (stringmatch(wantedterm,"/SPICErack/*")>0&& strlen(val) ==0)
+                                nstr = "/SPICErack"
+                                // remove "/SPICErack/" from wantedterm 
+                                wantedterm = StringFromList(2, wantedterm,"/SPICErack/")
+                        else
+                                XMLsetNodeStr(refNum,wantedterm,"",valstr)      //to set
+                                nstr = ""                               //reset as No new node
+                        endif
+                        //break
                  endif          
-       endfor
-
-        if (strlen(nstr)>0)                             //to write a new  attribut name and value which is not found in the raw file.
+        //to write new  attr name and value which are not found in the raw file.
+        if (strlen(nstr)>2)                             
                  XMLaddNode(refNum,nstr,"",wantedterm,value,1)
-                 nstr += "/" + wantedterm
+                 // nstr to add new node
+                 nstr = "//"+wantedterm
+                 // get unit
                  if (stringmatch(NCunit,"text")>0)      
                         ntype = "text"
@@ -1513 +1335 @@
                         vresult = vals          
                  endif
-                 print "*** Note:*** \r     *** No parameter named",wantedterm, "was found, so it was added to the end of your data file."
+                 //print "*** Note:*** \r     *** No parameter named",wantedterm, "was found, so it was added to the end of your data file."
                  XMLsetAttr(refNum,nstr,"","type",ntype)        
         endif
 
-        KillWaves/Z W_ElementList,M_xmlContent,M_listXPath,M_listAttr                   //clean up
+        //KillWaves/Z W_ElementList,M_xmlContent,M_listXPath,M_listAttr                 //clean up
         if      (strlen(wantedterm)==0 && vresult == -1)
                 XMLclosefile(refNum, 0)
@@ -1566 +1388 @@
         String fname,str
 
-        WriteHFIRHead(fname,str, "Transmission","text")         
+        WriteHFIRHead(fname,str, "//Header/Transmission","text")        
         return(0)
 End
@@ -1578 +1400 @@
         sprintf transstr, "%f", trans
 
-         WriteHFIRHead(fname,transstr,"Transmission_for_Sample" ,"")            
+         WriteHFIRHead(fname,transstr,"/SPICErack/Transmission_for_Sample" ,"")                 
         return(0)
 End
@@ -1590 +1412 @@
         sprintf transstr, "%f", trans
 
-        WriteHFIRHead(fname,transstr,"detector" ,"")    //????????????????????????????????????????????????????????
+        WriteHFIRHead(fname,transstr,"//Counters/detector" ,"")         //????????????????????????????????????????????????????????
         return(0)
 End
@@ -1604 +1426 @@
         sprintf countsstr, "%f", counts
 
-        WriteHFIRHead(fname,countsstr,"Box_Counts" ,"")         
+        WriteHFIRHead(fname,countsstr,"/SPICErack/Box_Counts" ,"")      
         return(0)
 End
@@ -1617 +1439 @@
         sprintf xposstr, "%f", xpos
 
-        WriteHFIRHead(fname,xposstr,"beam_trap_x","mm")         ///Is this diameter???!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        WriteHFIRHead(fname,xposstr,"//Motor_Positions/beam_trap_x","mm")       ///Is this diameter?
         return(0)
 End
@@ -1629 +1451 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"Sample_Thickness","cm") 
+        WriteHFIRHead(fname,numstr,"//Header/Sample_Thickness","cm") 
         return(0)
 End
@@ -1641 +1463 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"beam_center_x_pixel" ,"") 
+        WriteHFIRHead(fname,numstr,"//Header/beam_center_x_pixel" ,"") 
         return(0)
 End
@@ -1653 +1475 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"beam_center_y_pixel","") 
+        WriteHFIRHead(fname,numstr,"//Header/beam_center_y_pixel","") 
         return(0)
 End
@@ -1665 +1487 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"attenuation","percent")     // HFIR has attenuation % instead of this. thus user has to use patch unless somebody change the format!!!!
+        WriteHFIRHead(fname,numstr,"//Motor_Positions/attenuation","percent")   // HFIR has attenuation % instead of this. thus user has to use patch unless somebody change the format!!!!
         return(0)
 End
@@ -1677 +1499 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"monitor","") 
+        WriteHFIRHead(fname,numstr,"//Counters/monitor","") 
         return(0)
 End
@@ -1689 +1511 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"psd","") 
+        WriteHFIRHead(fname,numstr,"//Counters/psd","") 
         return(0)
 End
@@ -1701 +1523 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"detector","")   ///Check with Steve & Ken!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
+        WriteHFIRHead(fname,numstr,"//Counters/detector","")   ///Check with Steve & Ken!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
         return(0)
 End
@@ -1713 +1535 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"wavelength" ,"angstroms") 
+        WriteHFIRHead(fname,numstr,"//Header/wavelength" ,"angstroms") 
         return(0)
 End
@@ -1725 +1547 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"wavelength_spread","") 
+        WriteHFIRHead(fname,numstr,"//Header/wavelength_spread","") 
         return(0)
 End
@@ -1737 +1559 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"temp" ,"C") 
+        WriteHFIRHead(fname,numstr,"//Parameter_Positions/tsample" ,"C") 
         return(0)
 End
@@ -1749 +1571 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"magnetic_field","G")  //Not defined on HFIR file...  Should be changed the name when decided...
+        WriteHFIRHead(fname,numstr,"/SPICErack/magnetic_field","G")  //Not defined on HFIR file...  Should be changed the name when decided...
         return(0)
 End
@@ -1761 +1583 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"source_aperture_size","mm") 
+        WriteHFIRHead(fname,numstr,"//Header/source_aperture_size","mm") 
         return(0)
 End
@@ -1785 +1607 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"source_distance","m")     //unit=m   :hfir = mm ???????????????
+        WriteHFIRHead(fname,numstr,"//Header/source_distance","m")     //unit=m   :hfir = mm ???????????????
         return(0)
 End
@@ -1797 +1619 @@
         sprintf numstr, "%f", num
 
-        WriteHFIRHead(fname,numstr,"detector_trans","cm")  //cm:  HFIR = mm !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        WriteHFIRHead(fname,numstr,"//Header/detector_trans","cm")  //cm:  HFIR = mm !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         return(0)
 End
@@ -1809 +1631 @@
         sprintf numstr, "%f", num
         
-        WriteHFIRHead(fname,numstr,"beam_trap_size","mm")  //check !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        WriteHFIRHead(fname,numstr,"//Motor_Positions/beam_trap_size","mm")  //check !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         return(0)
 End
@@ -1821 +1643 @@
         sprintf numstr, "%f", num
         
-        WriteHFIRHead(fname,numstr,"sample_det_dist","m")
+        WriteHFIRHead(fname,numstr,"//Motor_Positions/sample_det_dist","m")
         return(0)
 End
@@ -1833 +1655 @@
         sprintf numstr, "%f", num
         
-        WriteHFIRHead(fname,numstr, "x_mm_per_pixel","mm")
+        WriteHFIRHead(fname,numstr, "//Header/x_mm_per_pixel","mm")
         return(0)
 End
@@ -1845 +1667 @@
         sprintf numstr, "%f", num
         
-        WriteHFIRHead(fname,numstr, "y_mm_per_pixel","mm")
+        WriteHFIRHead(fname,numstr, "//Header/y_mm_per_pixel","mm")
         return(0)
 End
@@ -1857 +1679 @@
                 str = str[0,59]
         endif
-        WriteHFIRHead(fname,str, "Scan_Title","text") //Users tend to put the sample descrpt here instead of "Sample_Name"...
+        WriteHFIRHead(fname,str, "//Header/Scan_Title","text") //Users tend to put the sample descrpt here instead of "Sample_Name"...
         return(0)
 End
@@ -1869 +1691 @@
         sprintf numstr, "%f", num
         
-        WriteHFIRHead(fname,numstr,"time","sec") 
+        WriteHFIRHead(fname,numstr,"//Counters/time","sec") 
         return(0)
 End
@@ -1881 +1703 @@
         
         Make/O/T/N=(18,2) munit
-                
-        //length units
+        
+        //ToDo: to combine the same units       
+        //length units 
         munit[0][0]="m"   //popular units first...
         munit[0][1]= "1"
@@ -1957 +1780 @@
         Variable val
         String from, to
-        
+
+        from = RemoveAllSpaces(from)
+        to = RemoveAllSpaces(to)
+                        
         Variable i, out = val
-        
+
         //Search for two same strings, or one with none.
         if (stringmatch(from,to)>0 ||strlen(from) == 0||strlen(to)==0) 
@@ -1981 +1807 @@
         String from, to
         
-        Variable i, out = val
+        Variable i, j, out = val
 
         Make/O/T/N=(2,2) tunit
@@ -1989 +1815 @@
         tunit[1][0]="K" 
         tunit[1][1]= "0"        
-        
+
         String  v_from="", v_to=""
-        
+
         for (i = 0; i<DimSize(tunit,0); i+=1)
-                if (stringmatch(tunit[i][0],from)>0)  // IgorPro "stringmatch()" function handles both lower & upper cases.
+                if (stringmatch(tunit[i][0],from)==1)  // IgorPro "stringmatch()" function handles both lower & upper cases.
                         v_from = tunit[i][1]
                         break
                 endif
         endfor
-        
-        for (i = 0; i<DimSize(tunit,0); i+=1)
-                if (stringmatch(tunit[i][0],to)>0)
-                        v_to = tunit[i][1]
+
+        for (j = 0; j<DimSize(tunit,0); j+=1)
+                if (stringmatch(tunit[j][0],to)==1)
+                        v_to = tunit[j][1]
                         break
                 endif   
         endfor  
         KillWaves/Z tunit
-                
         if (strlen(v_from)==0 || strlen(v_to) ==0)
                 out = 1                 //Do nothing...
@@ -2015 +1840 @@
                 out = val + (vt - vf)
         endif
-        
         return out
+End
+
+
+///This function make HFIR SANS data file shorter which is more than 30 characters causing problem taking other names after the file name.
+//Will remove instrumental name.
+Function/S ShortFileName(fileName)
+        String fileName
+        //Default: just passing
+        String fname = fileName
+
+        //Check whether it is from HiResSANS or BioSANS and remove the head
+        if (stringmatch(fileName,"HiResSANS_*.*")>0 )
+                fname = ReplaceString("HiResSANS_",fname,"HS_",0,1)    
+        elseif (stringmatch(filename,"BioSANS_*.*")>0)
+                fname = ReplaceString("BioSANS_",fname,"BS_",0,1)     
+        endif
+        return fname
+END
+
+//Not used
+///This function return the original HFIR SANS data file name that was shorten before.
+//Put them back to HiResSANS*** or BioSANS***.
+Function/S FullFileName(fname)
+        String fname
+        //Default: just passing
+        String fileName = fname
+        
+        //Check whether it is from HiResSANS or BioSANS
+        if (stringmatch(fname,"*HS_*.*")>0 )
+                fileName = ReplaceString("HS_",fname,"HiResSANS_",0,1)  
+        elseif (stringmatch(fname,"*BS_*.*")>0)
+                fileName = ReplaceString("BS_",fname,"BioSANS_",0,1)   
+        endif
+
+        return fileName
+END
+
+
+///Find file name from full Path+file 
+Function/S GetFName(path,  length)
+        String path
+        Variable length // 1 for full name, 0 for shorten name, others pass the name
+        
+        Variable index 
+        String ofname, mfname
+        
+        // get index of the file name
+        index = ItemsInList(path,":") - 1
+        // get file name
+        ofname = StringFromList(index,path,":")
+        //modify the name if need otherwise return w/o change
+        if (length == 0)
+                mfname = ShortFileName(ofname)
+        elseif (length == 1)
+                mfname = FullFileName(ofname)
+        else
+                mfname = ofname
+        endif
+        // return the path+modified file name
+        return mfname
+End
+
+
+///Find file name from full Path+file and replace file name to a shorter or full name in path+file.
+Function/S ReplaceFName(path,  length)
+        String path
+        Variable length // 1 for full name, 0 for shorten name
+        
+        Variable index 
+        String ofname,mfname
+        
+        // get index of the file name
+        index = ItemsInList(path,":") - 1
+        // get file name
+        ofname = StringFromList(index,path,":")
+        //modify the name if need otherwise return w/o change
+        if (length == 0)
+                mfname = ShortFileName(ofname)
+        else
+                mfname = FullFileName(ofname)
+        endif
+        // return the path+modified file name
+        return ReplaceString(ofname,path,mfname,0,1)
+End
+
+////Unused ///Not working well
+// Change file name before and after Xml open
+Function/S XmlFileOpen(fname)
+        String fname
+        
+        // fname = path + full file name
+        fname = ReplaceFName(fname,  1)
+        XmlOpenFile(fname)
+        // path + short file name
+        return ReplaceFName(fname,  0)
 End
 

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/HFIR_Includes_v520.ipf

@@ -13 +13 @@
         return(0)
 End
-
 
 

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/HFIR_Utils.ipf

@@ -993 +993 @@
         return("Function Empty")
 End
+
+// Return the filename that represents the previous or next file.
+// Input is current filename and increment. 
+// Increment should be -1 or 1
+// -1 => previous file
+// 1 => next file
+Function/S GetPrevNextRawFile(curfilename, prevnext)
+        String curfilename
+        Variable prevnext
+
+        String filename
+        
+        //get the run number
+        Variable num = GetRunNumFromFile(curfilename)
+                
+        //find the next specified file by number
+        fileName = FindFileFromRunNumber(num+prevnext)
+
+        if(cmpstr(fileName,"")==0)
+                //null return, do nothing
+                fileName = FindFileFromRunNumber(num)
+        Endif
+
+//      print "in FU "+filename
+
+        Return filename
+End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ILL_Utils.ipf

@@ -987 +987 @@
         return(ff)
 End
+
+
+// Return the filename that represents the previous or next file.
+// Input is current filename and increment. 
+// Increment should be -1 or 1
+// -1 => previous file
+// 1 => next file
+Function/S GetPrevNextRawFile(curfilename, prevnext)
+        String curfilename
+        Variable prevnext
+
+        String filename
+        
+        //get the run number
+        Variable num = GetRunNumFromFile(curfilename)
+                
+        //find the next specified file by number
+        fileName = FindFileFromRunNumber(num+prevnext)
+
+        if(cmpstr(fileName,"")==0)
+                //null return, do nothing
+                fileName = FindFileFromRunNumber(num)
+        Endif
+
+//      print "in FU "+filename
+
+        Return filename
+End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Initialize.ipf

@@ -45 +45 @@
         Endif
         ResizeCmdWindow()
+        
+        //unload the NCNR_Package_Loader, if NCNR not defined
+        UnloadNCNR_Igor_Procedures()
+
 End
 
@@ -159 +163 @@
 End
 
+// since the NCNR procedures can't be loaded concurrently with the other facility functions,
+// unload this procedure file, and add this to the functions that run at initialization of the 
+// experiment
+Function UnloadNCNR_Igor_Procedures()
+
+#if (exists("NCNR")==6)                 //defined in the main #includes file.
+        //do nothing if an NCNR reduction experiment
+#else
+        if(ItemsInList(WinList("NCNR_Package_Loader.ipf", ";","WIN:128")))
+                Execute/P "CloseProc /NAME=\"NCNR_Package_Loader.ipf\""
+                Execute/P "COMPILEPROCEDURES "
+        endif
+#endif
+
+End
 
 //returns 1 if demo version, 0 if full version

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf

@@ -1366 +1366 @@
         Endif
 
-        print "in FU "+filename
+//      print "in FU "+filename
 
         Return filename