Changeset 804 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Timestamp:

Jun 7, 2011 4:06:02 PM (12 years ago)

Author:

srkline

Message:

Fixes in HFIR_DataReadWrite (JaeHie? Cho). Now the reader it writes back if attr. entry does not exist in the data file.

File:

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

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

@@ -757 +757 @@
         String fname
         
-        return(getRealValueFromHeader(fname,"",""))  // (Unused, return 0) 
+        return(getRealValueFromHeader(fname,"//Counters/detector",""))   
 end
 
@@ -1154 +1154 @@
         
         val =   XMLstrFmXpath(refNum,wantedterm,"","")
+
+        // Case of no value or zero value, check if written by HFIR Patch
+        if (stringmatch(wantedterm,"//*")>0&& strlen(val) ==0)
+                 wantedterm = "//" +  StringFromList(3, wantedterm,"//")
+                 // if valid wnatedterm
+                 if (strlen(wantedterm) >1)
+                        val =   XMLstrFmXpath(refNum,wantedterm,"","")
+                 endif
+        endif   
         unitstr =  RemoveAllSpaces(XMLstrFmXpath(refNum,wantedterm+"/@units","",""))
         
@@ -1197 +1206 @@
                 //Find the value,unit, and type of the value: a little ugly but faster...
                 val =   XMLstrFmXpath(refNum,wantedterm,"","")
+                // Case of no value or zero value, check if it written by HFIR Patch
+                if (stringmatch(wantedterm,"//*")>0&& strlen(val) ==0)
+                        wantedterm = "//" +  StringFromList(3, wantedterm,"//")
+                        // if valid wnatedterm
+                        if (strlen(wantedterm) >1)
+                                val =   XMLstrFmXpath(refNum,wantedterm,"","")
+                        endif
+                endif
                 unitstr =  RemoveAllSpaces(XMLstrFmXpath(refNum,wantedterm+"/@units","",""))
                 typestr =  RemoveAllSpaces(XMLstrFmXpath(refNum,wantedterm+"/@type","",""))
@@ -1330 +1347 @@
                 else   //(stringmatch(tempheadhfir,wantedterm)>0)       
                         val =   XMLstrFmXpath(refNum,wantedterm,"","")
-                
+                        // if no regular entry is found, check patch entry.
+                        if (stringmatch(wantedterm,"//*")>0&& strlen(val) ==0)
+                                wantedterm = "//" +  StringFromList(3, wantedterm,"//")
+                                // if valid wnatedterm
+                                if (strlen(wantedterm) >1)
+                                        val =   XMLstrFmXpath(refNum,wantedterm,"","")
+                                endif
+                        endif
                         //Special case starts!!! 
                         //No unit founds in hfir ("mm") file but needs to convert to meters. Let's give it one.
@@ -1370 +1394 @@
                                 // remove "/SPICErack/" from wantedterm 
                                 wantedterm = StringFromList(2, wantedterm,"/SPICErack/")
+                        elseif (stringmatch(wantedterm,"//*")>0&& strlen(val) ==0)
+                                nstr = "/SPICErack"
+                                //remove'//' to wantedterm 
+                                wantedterm = StringFromList(2, wantedterm,"//")
                         else
                                 XMLsetNodeStr(refNum,wantedterm,"",valstr)      //to set