Changeset 1095 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_PatchFiles.ipf

Timestamp:

Apr 16, 2018 10:50:33 AM (4 years ago)

Author:

srkline

Message:

Added two model functions for white beam smearing.

Many other small changes for processing of the back detector, shuffling of VSANS menu items, and consistent naming of V_ procedures.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_PatchFiles.ipf (modified) (5 diffs)

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

@@ -446 +446 @@
         fname = S_path + fname
 
-        Variable nRows = 9
+        Variable nRows = 11
         Redimension/N=(nRows,3) ListWave
         Redimension/N=(nRows,3) selWave
@@ -482 +482 @@
         listWave[8][1] = "sample aperture diam (external) (cm)"
         listWave[8][2] = num2str(V_getSampleAp2_size(fname))    
+
+        listWave[9][1] = "beam stop diameter (Middle) (mm)"
+        listWave[9][2] = num2str(V_getBeamStopC2_size(fname))   
+        
+        listWave[10][1] = "beam stop diameter (Back) (mm)"
+        listWave[10][2] = num2str(V_getBeamStopC3_size(fname))  
+
+
                                 
         return(0)
@@ -1257 +1265 @@
         endif           
 
+        if ((selWave[9][0] & 2^4) != 0)         //"beam stop diameter (Middle) (mm)"
+                val = str2num(listWave[9][2])
+                err = V_writeBeamStopC2_size(fname,val)
+        endif           
+        
+        if ((selWave[10][0] & 2^4) != 0)                //"beam stop diameter (Back) (mm)"
+                val = str2num(listWave[10][2])
+                err = V_writeBeamStopC3_size(fname,val)
+        endif           
+        
         return(0)
 End
@@ -1726 +1744 @@
 // root:Packages:NIST:VSANS:RawVSANS:sans1301:
         for(ii=lo;ii<=hi;ii+=1)
-                KillDataFolder/Z $("root:Packages:NIST:VSANS:RawVSANS:sans"+num2str(ii))
+                KillDataFolder/Z $("root:Packages:NIST:VSANS:RawVSANS:sans"+num2istr(ii))
         endfor
         return 0
@@ -2036 +2054 @@
 // root:Packages:NIST:VSANS:RawVSANS:sans1301:
         for(ii=lo;ii<=hi;ii+=1)
-                KillDataFolder/Z $("root:Packages:NIST:VSANS:RawVSANS:sans"+num2str(ii))
+                KillDataFolder/Z $("root:Packages:NIST:VSANS:RawVSANS:sans"+num2istr(ii))
         endfor
         return 0