Changeset 1114 for sans

Timestamp:

Aug 30, 2018 11:12:50 AM (4 years ago)

Author:

srkline

Message:

bug fixes for:

RealTime? updating at VSANS
Mask loading at SANS

added highResGain field for VSANS R/W

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• SANS/MaskUtils.ipf (modified) (1 diff)
• VSANS/VC_DetectorBinning_Q.ipf (modified) (1 diff)
• VSANS/V_EventMode_Utils.ipf (modified) (1 diff)
• VSANS/V_HDF5_RW_Utils.ipf (modified) (4 diffs)
• VSANS/V_HDF5_Read.ipf (modified) (1 diff)
• VSANS/V_HDF5_Write.ipf (modified) (1 diff)
• VSANS/V_Initialize.ipf (modified) (1 diff)

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

@@ -418 +418 @@
 //      cmd += num2istr(pixelsX*pixelsY) + " /Q  \"" + fname +"\""
 
-        String GBLoadStr = "GBLoadWave/N=data/T={72,72}/O/S=4/W=1/P=catPathName/U="
+        String GBLoadStr = "GBLoadWave/N=data/T={72,72}/O/S=4/W=1/P=catPathName"
 
         if(cmpstr("\\\\",fname[0,1])==0)        //Windows user going through network neighborhood

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

@@ -1651 +1651 @@
                 folderList = "VCALC;"
         endif
-        
+
+        if(cmpstr(winNameStr,"WORK_RealTime") == 0)
+                folderList = "RealTime;"
+        endif
+        
+                
         for(ii=0;ii<ItemsInList(folderList);ii+=1)
                 fldr = StringFromList(ii, folderList, ";")

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

@@ -936 +936 @@
         String saveName
 
-        saveName = StringFromList(0, fileName)
+        saveName = StringFromList(0, fileName+";")
         Save_VSANS_file("root:export", "Events_"+saveName)
-
+        Printf "Saved file %s\r","Events_"+saveName
 End
 

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

@@ -642 +642 @@
 
 // (1) if requesting data from a WORK folder, get it, or report error
-        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;")
+        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;RealTime;")
         if(isWORKFolder != -1)          //requesting value from a WORK folder (not RawVSANS)
         // check for a work folder first (note that "entry" is now NOT doubled)
@@ -700 +700 @@
 // (1) if requesting data from a WORK folder, get it
 // no need to check for any existence, null return is OK
-        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;")
+        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;RealTime;")
         if(isWORKFolder != -1)          //requesting value from a WORK folder (not RawVSANS)
 //      // check for a work folder first (note that "entry" is now NOT doubled)
@@ -755 +755 @@
 // (1) if requesting data from a WORK folder, get it
 // no need to check for any existence, null return is OK
-        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;")
+        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;RealTime;")
         if(isWORKFolder != -1)          //requesting value from a WORK folder (not RawVSANS)
 //      // check for a work folder first (note that "entry" is now NOT doubled)
@@ -843 +843 @@
 
 // (1) if requesting data from a WORK folder, get it, or report error
-        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;")
+        Variable isWORKFolder = WhichListItem(fname,ksWorkFolderListShort+"VCALC;RealTime;")
         if(isWORKFolder != -1)          //requesting value from a WORK folder (not RawVSANS)
         // check for a work folder first (note that "entry" is now NOT doubled)

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

@@ -1565 +1565 @@
 End
 
+// for "B" only
+Function V_getDetector_highResGain(fname,detStr)
+        String fname,detStr
+
+        String path = "entry:instrument:detector_"+detStr+":highResGain"
+        if(cmpstr(detStr,"B") == 0)
+                return(V_getRealValueFromHDF5(fname,path))
+        else    
+                return(0)
+        endif
+End
+
 Function/S V_getDetDescription(fname,detStr)
         String fname,detStr

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

@@ -4314 +4314 @@
         endif
 End
+
+// high res detector gain, a single value, only for detB
+Function V_writeDetector_highResGain(fname,detStr,val)
+        String fname,detStr
+        variable val
+
+//      String path = "entry:instrument:detector_"+detStr+":highResGain"
+        if(cmpstr(detStr,"B") == 0)
+        
+                Make/O/D/N=1 wTmpWrite
+        //      Make/O/R/N=1 wTmpWrite
+                String groupName = "/entry/instrument/detector_"+detStr 
+                String varName = "highResGain"
+                wTmpWrite[0] = val
+        
+                variable err
+                err = V_WriteWaveToHDF(fname, groupName, varName, wTmpWrite)
+                if(err)
+                        Print "HDF write err = ",err
+                endif
+                // now be sure to kill the data folder to force a re-read of the data next time this file is read in
+        //      err = V_KillNamedDataFolder(fname)
+        //      if(err)
+        //              Print "DataFolder kill err = ",err
+        //      endif
+        
+                return(err)     
+        else
+                DoAlert 0,"Bad call to V_writeDetector_highResGain"
+                return(0)
+        endif
+End
+
 
 Function V_writeDetDescription(fname,detStr,str)

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

@@ -182 +182 @@
         NewDataFolder/O root:Packages:NIST:VSANS:DRK
         NewDataFolder/O root:Packages:NIST:VSANS:ADJ
+        NewDataFolder/O root:Packages:NIST:VSANS:RealTime
+        NewDataFolder/O root:Packages:NIST:VSANS:VCALC