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

Timestamp:

Jul 20, 2017 3:22:34 PM (6 years ago)

Author:

srkline

Message:

LOTS of changes to accommodate the beam center being reported in cm rather than pixels. Required a lot of changes to VCALC (to fill in simulated data), and in the reading and interpreting of data for display, and most importantly, the calculation of q.

There may still be a few residual bugs with this. I am still re-testing with new sample data sets.

File:

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

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

@@ -2147 +2147 @@
         String fname,detStr
         
-        Wave xCtr_pix = root:Packages:NIST:VSANS:Globals:Patch:xCtr_pix
-        Wave yCtr_pix = root:Packages:NIST:VSANS:Globals:Patch:yCtr_pix
+        Wave xCtr_cm = root:Packages:NIST:VSANS:Globals:Patch:xCtr_cm
+        Wave yCtr_cm = root:Packages:NIST:VSANS:Globals:Patch:yCtr_cm
         Wave/T panelW = root:Packages:NIST:VSANS:Globals:Patch:panelW
         
         // check the dimensions of the waves (9)
-        if (DimSize(xCtr_pix, 0) != 9 || DimSize(yCtr_pix, 0) != 9 || DimSize(panelW, 0) != 9)
+        if (DimSize(xCtr_cm, 0) != 9 || DimSize(yCtr_cm, 0) != 9 || DimSize(panelW, 0) != 9)
                 Abort "waves are not of proper dimension (9)"
         endif
@@ -2163 +2163 @@
                         for(ii=0;ii<ItemsInList(ksDetectorListAll);ii+=1)
                                 detStr = panelW[ii]
-                                V_writeDet_beam_center_x(fname,detStr,xCtr_pix[ii])
-                                V_writeDet_beam_center_y(fname,detStr,yCtr_pix[ii])             
+                                V_writeDet_beam_center_x(fname,detStr,xCtr_cm[ii])
+                                V_writeDet_beam_center_y(fname,detStr,yCtr_cm[ii])              
                         endfor  
                 
@@ -2183 +2183 @@
         Variable ii,jj
         
-        Wave xCtr_pix = root:Packages:NIST:VSANS:Globals:Patch:xCtr_pix
-        Wave yCtr_pix = root:Packages:NIST:VSANS:Globals:Patch:yCtr_pix
+        Wave xCtr_cm = root:Packages:NIST:VSANS:Globals:Patch:xCtr_cm
+        Wave yCtr_cm = root:Packages:NIST:VSANS:Globals:Patch:yCtr_cm
         Wave/T panelW = root:Packages:NIST:VSANS:Globals:Patch:panelW
         
@@ -2194 +2194 @@
                                 detStr = StringFromList(ii, ksDetectorListAll, ";")
                                 panelW[ii] = detStr
-                                xCtr_pix[ii] = V_getDet_beam_center_x(fname,detStr)
-                                yCtr_pix[ii] = V_getDet_beam_center_y(fname,detStr)
+                                xCtr_cm[ii] = V_getDet_beam_center_x(fname,detStr)              //these values are in cm, not pixels
+                                yCtr_cm[ii] = V_getDet_beam_center_y(fname,detStr)
                         endfor
                 
@@ -2217 +2217 @@
                 NewDataFolder/O/S root:Packages:NIST:VSANS:Globals:Patch
 
-                Make/O/D/N=9 xCtr_pix,yCtr_pix
+                Make/O/D/N=9 xCtr_cm,yCtr_cm
                 Make/O/T/N=9 panelW
                 
@@ -2248 +2248 @@
         DrawText 21,258,"Write to all files (inlcusive)"
         SetDrawEnv fsize= 14,fstyle= 1
-        DrawText 262,30,"Beam Center (pixels)"
+        DrawText 262,30,"Beam Center (cm)"
         DrawText 20,133,"Run Number(s)"
         
@@ -2261 +2261 @@
         SetDataFolder root:Packages:NIST:VSANS:Globals:Patch
 // display the wave     
-        Edit/W=(180,40,500,370)/HOST=#  panelW,xCtr_pix,yCtr_pix
+        Edit/W=(180,40,500,370)/HOST=#  panelW,xCtr_cm,yCtr_cm
         ModifyTable width(Point)=0
         ModifyTable width(panelW)=80
-        ModifyTable width(xCtr_pix)=100
-        ModifyTable width(yCtr_pix)=100
+        ModifyTable width(xCtr_cm)=100
+        ModifyTable width(yCtr_cm)=100
         RenameWindow #,T0
         SetActiveSubwindow ##