Changeset 641 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/HFIR_DataReadWrite.ipf

Timestamp:

Mar 16, 2010 5:50:17 PM (13 years ago)

Author:

srkline

Message:

A variety of changes to get some of the basic reduction functions working with HFIR raw data files.

Patch now works correctly without duplicating file names in the popup list.

Transmissions can be assigned and calculated now that I've changed the critera for deciding if a file is a transmission file. Hopefully this will always work - it's based on the beamstop y-position being less than 30 mm for all four beam stops.

When checking for a DIV file, it returns an OK if the extension is .xml, since the raw data and div files can't be distinguished like the binary VAX data.

The file catalog is correct, but still excruciatingly slow.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/HFIR_DataReadWrite.ipf (modified) (11 diffs)

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

@@ -50 +50 @@
         Endif
         
+        Variable t1=ticks
         
         variable error
@@ -89 +90 @@
         KillWaves/Z M_listAttr, nsList,W_xmlcontentnodes
         
+        Print "Time to load and display (s) = ",(ticks-t1)/60.15
         Return(0)               //Do not change.
 End
@@ -127 +129 @@
         //Open/R refNum as fname
         STRING/G errorMsg       
-        Variable refNum
+        Variable refNum,t1=ticks
         //print "Loading", filename, "..."      
         if (stringmatch(filename,"*.xml") <1)
@@ -216 +218 @@
         //data =0
         
+//      Print "Time to open (s) = ",(ticks-t1)/60.15
 
         //ORNL HFIR SANS DATA
         String tempheadhfir
         tempheadhfir = ""
-       ReadHFIRSansRaw(refNum,curFolder,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)
+        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)
         
         //return the data folder to root
@@ -605 +609 @@
                 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:
@@ -641 +645 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"attenuation","percent")) //in unit od percents
+        return(getRealValueFromHeader(fname,"attenuation","percent")) //in unit of percents
 end
 
@@ -989 +993 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 Function ReadHFIRSansRaw(refNum,curFolder,tempheadhfir)
-      Variable refNum
-      String curFolder,tempheadhfir
+        Variable refNum
+        String curFolder,tempheadhfir
       
-      String curPath="root:Packages:NIST:"+curFolder
-      SetDataFolder curPath
+        String curPath="root:Packages:NIST:"+curFolder
+        SetDataFolder curPath
         Make/O/N=23 $(curPath+":IntegersRead")
         Make/O/N=52 $(curPath+":RealsRead")
@@ -1005 +1009 @@
         Variable pixnumx=0,pixnumy=0
         String val = ""// numerical and text values
-        Variable value
+        Variable value,t1=ticks
 
         //Initialize wave values         
@@ -1043 +1047 @@
                 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)
@@ -1179 +1184 @@
                 
        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
         
@@ -1213 +1226 @@
         
         SetDataFolder curPath
-        Killwaves/Z nsList,M_listAttr,M_xmlContent,W_ElementList,M_listXPath,W_xmlcontentnodes
+        
+//      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)
+        
 End