Changeset 206

Timestamp:

Nov 18, 2007 4:15:52 PM (15 years ago)

Author:

srkline

Message:

Three changes:

(1) in WorkfileUtils? - DetCorr?() now includes the correction to the detector efficiency at large angles as was described in John's memo of 3/20/2007. A small correction, increasing the measured intensity by at most a few percent at the largest scattering angles.

(2) Tweaks to the ascii output for Grasp, still untested.

(3) Changed beamstop x-tolerance to -8 cm to account for the 3" BS malfunction on NG3. Only affected recognition of transmission files, and easily worked around by resetting the BS position (NG1 Files to Trans function)

Location:

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00

Files:

• NCNR_Utils.ipf (modified) (1 diff)
• WorkFileUtils.ipf (modified) (6 diffs)
• WriteQIS.ipf (modified) (10 diffs)

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NCNR_Utils.ipf

@@ -41 +41 @@
         
         //new 11APR07
-        Variable/G root:myGlobals:BeamstopXTol = -5                     // (cm) is BS Xpos is -5 cm or less, it's a trans measurement
+        Variable/G root:myGlobals:BeamstopXTol = -8                     // (cm) is BS Xpos is -5 cm or less, it's a trans measurement
         // sample aperture offset is NOT stored in the VAX header, but it should be
         // - when it is, remove the global and write an accessor AND make a place for 

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/WorkFileUtils.ipf

@@ -367 +367 @@
         Variable ii,jj,dtdist,dtdis2
         Variable xi,xd,yd,rad,ratio,domega,xy
+        Variable lambda
         
 //      Print "...doing jacobian and non-linear corrections"
+        NVAR pixelsX = root:myGlobals:gNPixelsX
+        NVAR pixelsY = root:myGlobals:gNPixelsY
         
         //set up values to send to auxiliary trig functions
-        xcenter = 64.5
-        ycenter = 64.5
+        xcenter = pixelsX/2 + 0.5               // == 64.5 for 128x128 Ordela
+        ycenter = pixelsY/2 + 0.5               // == 64.5 for 128x128 Ordela
+
         x0 = realsread[16]
         y0 = realsread[17]
@@ -383 +387 @@
         dtdis2 = dtdist^2
         
+        lambda = realsRead[26]
+        
         xx0 = dc_fx(x0,sx,sx3,xcenter)
         yy0 = dc_fy(y0,sy,sy3,ycenter)
         
-        NVAR pixelsX = root:myGlobals:gNPixelsX
-//      NVAR pixelsY = root:myGlobals:gNPixelsY
+
         //waves to contain repeated function calls
-        Make/O/N=(pixelsX) fyy,xx,yy            //Assumes square detector
+        Make/O/N=(pixelsX) fyy,xx,yy            //Assumes square detector !!!
         ii=0
         do
@@ -399 +404 @@
         while(ii<pixelsX)
         
-//      Make/O/N=(pixelsX,pixelsX) SolidAngle
+//      Make/O/N=(pixelsX,pixelsX) SolidAngle           // testing only
         
         ii=0
@@ -413 +418 @@
                         domega = rad/dtdist
                         ratio = domega^3
-//                      solidAngle[ii][jj] = ratio                      
+//                      solidAngle[ii][jj] = ratio              //testing only  
                         xy = xx[ii]*yy[jj]
                         data[ii][jj] *= xy*ratio
+                        
+                        // multiplicative correction for detector efficiency JBG memo det_eff_cor2.doc 3/20/07
+                        // correction inserted 11/2007 SRK
+                        
+                        data[ii][jj] *= DetEffCorr(lambda,dtdist,xd,yd)
+                        
+//                      solidAngle[ii][jj] = DetEffCorr(lambda,dtdist,xd,yd)            //testing only
+                        
                         jj+=1
                 while(jj<pixelsX)
@@ -422 +435 @@
         
         //clean up waves
-        Killwaves/Z fyy,xx,yy
+//      Killwaves/Z fyy,xx,yy
         
         Return(0)
@@ -467 +480 @@
 End
 
+//distances passed in are in mm
+// dtdist is SDD
+// xd and yd are distances from the beam center to the current pixel
+//
+Function DetEffCorr(lambda,dtdist,xd,yd)
+        Variable lambda,dtdist,xd,yd
+        
+        Variable theta,cosT,ff,stAl,stHe
+        
+        theta = atan( (sqrt(xd^2 + yd^2))/dtdist )
+        cosT = cos(theta)
+        
+        stAl = 0.00967*lambda*0.8               //dimensionless, constants from JGB memo
+        stHe = 0.146*lambda*2.5
+        
+        ff = exp(-stAl/cosT)*(1-exp(-stHe/cosT)) / ( exp(-stAl)*(1-exp(-stHe)) )
+                
+        return(ff)
+End
 //******************
 //direct port of the FORTRAN code for calculating the weighted

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/WriteQIS.ipf

@@ -335 +335 @@
         String type,fullpath
         Variable dialog         //=1 will present dialog for name
-        
-        Variable enter=StopMSTimer(-2)
-        
+                
         String destStr="",ave="C",typeStr=""
         Variable step=1,refnum
@@ -396 +394 @@
         Endif
         
-        Print "Before fill = ",(StopMSTimer(-2) - enter)/1e6
 /////////
         Variable numTextLines=18
@@ -434 +431 @@
 //              termStr = "\r\n"
 //      Endif
-
-        Print "After fill = ",(StopMSTimer(-2) - enter)/1e6
         
         Duplicate/O data,spWave         
         Redimension/S/N=(pixelsX*pixelsY) spWave                //single precision (/S)
         
-        Print "Before save = ",(StopMSTimer(-2) - enter)/1e6
         //not demo- compatible, but approx 100x faster!!
         
@@ -457 +451 @@
         Print "2D ASCII File written: ", GetFileNameFromPathNoSemi(fullPath)
         
-        Print "Before exit = ",(StopMSTimer(-2) - enter)/1e6
         return(0)
 End
 
 
-//// ASCII EXPORT in detector coordinates - mimicking the VAX ASCII/128 command
+//// ASCII EXPORT in detector coordinates - mimicking the VAX CONVERT command
 // this is done simply to be able to produce converted raw data files that can be 
 // read in with Grasp. A rather awkward structure, definitely not the preferred export format
@@ -471 +464 @@
         String type,fullpath
         Variable dialog         //=1 will present dialog for name
-        
-        Variable enter=StopMSTimer(-2)
-        
+                
         String destStr=""
         String typeStr=""
@@ -522 +513 @@
         Endif
         
-        Print "Before fill = ",(StopMSTimer(-2) - enter)/1e6
 /////////
         String tmpStr=""
@@ -531 +521 @@
         labelWave[0] = tmpStr
         labelWave[1] = textw[6]         //label
-        sprintf tmpStr," %d   %g   %g   %g",intw[2],rw[0],rw[39],rw[2]
+        
+        sprintf tmpStr," %d  %g  %g  %g",intw[2],rw[0],rw[39],rw[2]
         labelWave[2] = tmpStr
         labelWave[3] = " Cnt.Time(sec.)    Mon. Cnt.      Trans. Det. Cnt.  Tot. Det. Cnt."
-        sprintf tmpStr," %g   %g   %g   %g   %d   %d   %g",rw[4],rw[5],rw[8],rw[9],intw[4],intw[5],rw[6]
+        
+        sprintf tmpStr," %g  %g  %g '%s' %g '%s' %d  %d  %g",rw[4],rw[5],rw[8],textw[7],rw[9],textw[8],intw[4],intw[5],rw[6]
         labelWave[4] = tmpStr
         labelWave[5] = " Trans.      Thckns       Temp.           H Field         Table  Holder  Pos"
-        sprintf tmpStr," %g   %g   %d   '%s'   %g",rw[26],rw[27],intw[9],textw[9],rw[7]
+        
+        sprintf tmpStr," %g  %g  %d  '%s'  %g",rw[26],rw[27],intw[9],textw[9],rw[7]
         labelWave[6] = tmpStr
         labelWave[7] = " Wavelength &  Spread(FWHM)    Det.#  Type      Sample Rotation Angle"
-        sprintf tmpStr," %g   %g   %g   %g   %g   %g",rw[18],rw[19],rw[16],rw[17],rw[21],rw[3]
+        
+        sprintf tmpStr," %g  %g  %g  %g  %g  %g",rw[18],rw[19],rw[16],rw[17],rw[21],rw[3]
         labelWave[8] = tmpStr
         labelWave[9] = " Sam-Det Dis.(m)   Det.Ang.(cm.)   Beam Center(x,y)  Beam Stop(mm)  Atten.No."
-        sprintf tmpStr," %g   %g   %g   %g   %g   %g",rw[10],rw[11],rw[12],rw[13],rw[14],rw[15]
+        
+        sprintf tmpStr," %g  %g  %g  %g  %g  %g",rw[10],rw[11],rw[12],rw[13],rw[14],rw[15]
         labelWave[10] = tmpStr
         labelWave[11] = "        Det. Calib Consts. (x)           Det. Calib Consts. (y)"
-        sprintf tmpStr," %g  %g  %g  '%s'   %g   %g",rw[23],rw[24],rw[25],"    F",rw[32],rw[32]
+        
+        sprintf tmpStr," %g  %g  %g  '%s'  %g  %g",rw[23],rw[24],rw[25],"    F",rw[45],rw[46]
         labelWave[12] = tmpStr
         labelWave[13] = " Aperture (A1,A2) Sizes(mm)    Sep.(m)    Flip ON   Horiz. and Vert. Cur.(amps)"
+        
         sprintf tmpStr," %d  %d  %d  %d  %g  %g  %g",intw[19],intw[20],intw[21],intw[22],rw[47],rw[48],rw[49]
         labelWave[14] = tmpStr
         labelWave[15] = "      Rows        Cols       Factor   Qmin      Qmax"
+        
         labelWave[16] = " Packed Counts by Rows (L -> R) and Top -> Bot"
          
@@ -559 +557 @@
                 labelWave[ii] = (labelWave[ii])[0,240]
         endfor
-
-        Print "After fill = ",(StopMSTimer(-2) - enter)/1e6
         
         Duplicate/O data,spWave         
@@ -581 +577 @@
                 sPt=ePt
         while(ePt<len-1)
-        
-        Print "Before save = ",(StopMSTimer(-2) - enter)/1e6
-        
+                
         Open refNum as fullpath
         wfprintf refNum,"%s\r",labelWave                        //VAX uses just \r
@@ -593 +587 @@
         Print "2D ASCII File written for Grasp: ", GetFileNameFromPathNoSemi(fullPath)
         
-        Print "Before exit = ",(StopMSTimer(-2) - enter)/1e6
         return(0)
 End