Changeset 991 for sans/Dev/trunk/NCNR_User_Procedures/Reduction

Timestamp:

Apr 14, 2016 4:54:12 PM (7 years ago)

Author:

srkline

Message:

updated the base "Write" routines to look locally first, then if no local folder found, write to the HDF file on disk. This is the same behavior as the base "Read" (or "get") routines.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf (modified) (8 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf

@@ -443 +443 @@
         
         if(!valExists)
-                //then read in the file
+                //then read in the file, putting the data in RawVSANS
+                SetDataFolder ksBaseDFPath
                 V_LoadHDF5_NoAtt(fname,"")
+                SetDataFolder root:
         endif
 
@@ -484 +486 @@
                 valExists=1
         endif
-        
+
         if(!valExists)
-                //then read in the file
+                //then read in the file, putting the data in RawVSANS
+                SetDataFolder ksBaseDFPath
                 V_LoadHDF5_NoAtt(fname,"")
-        endif
-
+                SetDataFolder root:
+        endif
+                
 // this should exist now - if not, I need to see the error
         Wave wOut = $(ksBaseDFPath+folderStr+":"+path)
@@ -526 +530 @@
         
         if(!valExists)
-                //then read in the file
+                //then read in the file, putting the data in RawVSANS
+                SetDataFolder ksBaseDFPath
                 V_LoadHDF5_NoAtt(fname,"")
+                SetDataFolder root:
         endif
 
@@ -592 +598 @@
                 valExists=1
         endif
-        
+
         if(!valExists)
-                //then read in the file
+                //then read in the file, putting the data in RawVSANS
+                SetDataFolder ksBaseDFPath
                 V_LoadHDF5_NoAtt(fname,"")
+                SetDataFolder root:
         endif
 
@@ -638 +646 @@
         String fname, groupName, varName
         Wave wav
+        
+        
+        // try a local folder first, then try to save to disk
+        //
+        String folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname))
+        
+        String localPath = "root:Packages:NIST:VSANS:"+folderStr+":entry"
+        localPath += groupName + "/" + varName
+        // make everything colons for local data folders
+        localPath = ReplaceString("/", localPath, ":")
+        
+        Wave/Z w = $localPath
+        if(waveExists(w) == 1)
+                w = wav
+                Print "write to local folder done"
+                return(0)               //we're done, get out
+        endif
+        
+        
+        // if the local wave did not exist, then we proceed to write to disk
+
         
         variable err=0, fileID,groupID
@@ -724 +753 @@
         String fname, groupName, varName
         Wave/T wav
+
+        // try a local folder first, then try to save to disk
+        //
+        String folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname))
+        
+        String localPath = "root:Packages:NIST:VSANS:"+folderStr+":entry"
+        localPath += groupName + "/" + varName
+        // make everything colons for local data folders
+        localPath = ReplaceString("/", localPath, ":")
+        
+        Wave/Z/T w = $localPath
+        if(waveExists(w) == 1)
+                w = wav
+                Print "write to local folder done"
+                return(0)               //we're done, get out
+        endif
+        
+        
+        // if the local wave did not exist, then we proceed to write to disk
+
+
         
         variable err=0, fileID,groupID
@@ -863 +913 @@
 //V_writeDet_cal_y(fname,detStr,inW)
 
+                
 // the dead time for each detector
 // V_writeDetector_deadtime(fname,detStr,inW)
@@ -869 +920 @@
         endfor
         
+        // TODO testing - delete this
+                V_writeDet_beam_center_x(fileName,detStr,321)