Changeset 1078 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_DetectorBinning_Slit.ipf

Timestamp:

Jan 5, 2018 10:32:55 AM (5 years ago)

Author:

srkline

Message:

more utilities and bug fixes to handle:
(1) generation of DIV files
(2) generation and loading of slit-smeared VSANS data sets

Loading of VSANS data sets and generating the resolution smearing matrix required adding a conditional compile statement to the PlotUtilsMacro? file, to distinguish VSANS data - crudely done now by checking to see that VSANS is defined (which will NOT be the case for a "normal" Analysis experiment. This will need to be revisited in the future.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_DetectorBinning_Slit.ipf (modified) (6 diffs)

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

@@ -175 +175 @@
 //      eBin_qxqy = tmp[0][p]
 
-        Variable ii,jj,ntube,npix,sum_inten, sum_n, sum_inten2,avesq,aveisq,var,mask_val
+        Variable ii,jj,ntube,nYpix,sum_inten, sum_n, sum_inten2,avesq,aveisq,var,mask_val
         ntube = DimSize(inten,0)
-        npix = DimSize(inten,1)
+        nYpix = DimSize(inten,1)
         
         for(ii=0;ii<ntube;ii+=1)
@@ -184 +184 @@
                 sum_inten2 = 0
                 
-                for(jj=0;jj<npix;jj+=1)
+                for(jj=0;jj<nYpix;jj+=1)
                                 val = inten[ii][jj]
                                 if(isVCALC || maskMissing)              // mask_val == 0 == keep, mask_val == 1 = YES, mask out the point
@@ -199 +199 @@
                 iBin_qxqy[ii] = sum_inten/sum_n         //the average value
                 
-                avesq = sum_inten
+                avesq = (sum_inten/sum_n)^2
                 aveisq = sum_inten2/sum_n
                 var = aveisq-avesq
@@ -211 +211 @@
 
 //TODO:  use only the Qx component in the y-center of the detector, not Qtotal
-        qBin_qxqy =  abs(qx[p][npix/2])         
-
-// if the detectors are "L", then the values are all negative...        
-        qBin_qxqy = abs(qBin_qxqy)
+// if the detectors are "L", then the values are all negative, so take the absolute value here
+        qBin_qxqy =  abs(qx[p][nYpix/2])                
 
 // for the L panels, sort the q-values (and data) after the abs() step, otherwise the data is reversed
-// won't hurt to sort the R data
+// won't hurt to sort the R panel data
         Sort qBin_qxqy, qBin_qxqy,iBin_qxqy,eBin_qxqy
-        
-        // not needed to corrrect data, but put in the file???
-        delQy = abs(qy[0][npix-1] - qy[0][0])   // TODO: do I use dQ for the height of the panel?
+
+
+        // TODO: do I use dQ for the height of the panel?
+        // TODO : do I use 1/2 of dQ due to the symmetry of my smearing calculation?    
+        delQy = abs(qy[0][nYpix-1] - qy[0][0])
+
 //      iBin_qxqy *= delQy
 //      eBin_qxqy *= delQy
@@ -247 +248 @@
 //      DeletePoints 0, val, iBin_qxqy,qBin_qxqy,eBin_qxqy
 
-
-// TODO:
-// -- calculate the slit resolution here. don't really have any idea how to represent this in VSANS
-//    since it's not an infinite slit, and not anything that I expect could be represented as a Gaussian
 
         // TODO:
@@ -266 +263 @@
         Wave fsubs = $(folderPath+":"+"fSubS_qxqy_"+detStr)
 
-// TODO
-// -- these are DUMMY VALUES!!!
-        sigmaq = -delQy
-        qbar = -delQy
-        fsubs = -delQy
+// TODO:
+// -- calculate the slit resolution here. don't really have any idea how to represent this in VSANS
+//    since it's not an infinite slit, and not anything that I expect could be represented as a Gaussian
+// -- there is also wavelength smearing present
+
+// ASSUMPTION: As a first approximation, ignore the wavelength smearing component       
+        // TODO : do I use 1/2 of dQy due to the symmetry of my smearing calculation?   
+        sigmaq = -delQy/2
+        qbar = -delQy/2
+        fsubs = -delQy/2