Changeset 116 for sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/RectAnnulAvg.ipf

Timestamp:

May 31, 2007 12:58:47 PM (16 years ago)

Author:

ajj

Message:

Merged kline_29MAR07 branch (Separation of NCNR specific code) r66:115 into the trunk

File:

• sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/RectAnnulAvg.ipf (modified) (7 diffs)

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

@@ -59 +59 @@
         
         // center of detector, for non-linear corrections
-        xcenter = 64.5
-        ycenter = 64.5
+        NVAR pixelsX = root:myGlobals:gNPixelsX
+        NVAR pixelsY = root:myGlobals:gNPixelsY
+        
+        xcenter = pixelsX/2 + 0.5               // == 64.5 for 128x128 Ordela
+        ycenter = pixelsY/2 + 0.5               // == 64.5 for 128x128 Ordela
         
         // beam center, in pixels
@@ -323 +326 @@
         //good values
 
-        Variable DDet, apOff=0.0
+        Variable DDet
+        NVAR apOff = root:myGlobals:apOff               //in cm
         DDet = DetectorPixelResolution(fileStr,detStr)          //needs detector type and beamline
-//      do 
-//        if(strsearch(fileStr, "NG5", 0) != -1)
-//          //string was found, it's an NG5 file
-//          DDet = 1.0
-//          break
-//        Endif
-//        if(strsearch(fileStr, "NG3", 0) != -1)
-//          //string was found, it's an NG3 file
-//          DDet = 1.0
-//          break
-//        Endif
-//        if(strsearch(fileStr, "NG7", 0) != -1)
-//          //string was found, it's an NG7 file
-//          DDet = 0.5
-//          break
-//        Endif
-//      while(0)
 
         //Width of annulus used for the average is gotten from the 
@@ -351 +338 @@
 
         ii=0
-//      String res_string="root:myGlobals:Res_vals"
-//      Make/O/D/N=3 $res_string
-//      Wave res_wave=$res_string
+
         Variable ret1,ret2,ret3
         do
                 getResolution(qval[ii],lambda,lambdaWidth,DDet,apOff,S1,S2,L1,L2,BS,ddr,ret1,ret2,ret3)
-                sigmaq[ii] = ret1       //res_wave[0]
-                qbar[ii] = ret2         //res_wave[1]
-                fsubs[ii] = ret3                //res_wave[2]
+                sigmaq[ii] = ret1
+                qbar[ii] = ret2 
+                fsubs[ii] = ret3
                 ii+=1
         while(ii<nq)
@@ -372 +357 @@
 
         Avg_1D_Graph(aveint,qval,sigave)
-//      DoWindow/F Plot_1d
-//      If(V_flag == 1)         //the graph window already exists
-//              //kill the old graph and make a new one
-//              //easier than adjusting the old one
-//              DoWindow/K Plot_1d
-//      Endif   
-//      Display /W=(412,51,727,302)/K=1 aveint vs qval
-//      ModifyGraph log=1
-//      ModifyGraph mode=3,marker=19,msize=1,rgb=(0,0,0)
-//      ErrorBars aveint Y,wave=(sigave,sigave)
-//      Label left "Counts";DelayUpdate
-//      Label bottom "q\\U"
-//      SVAR angst = root:myGlobals:gAngstStr
-//      Label bottom "q ("+angst+"\\S-1\\M)"
-//      DoWindow/C Plot_1d
-        
+
         //get rid of the default mask, if one was created (it is in the current folder)
         //don't just kill "mask" since it might be pointing to the one in the MSK folder
@@ -490 +460 @@
         Wave reals = $(destPath + ":RealsRead")
 
+        // center of detector, for non-linear corrections
         NVAR pixelsX = root:myGlobals:gNPixelsX
         NVAR pixelsY = root:myGlobals:gNPixelsY
         
-        // center of detector, for non-linear corrections
-        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
         
         // beam center, in pixels
@@ -517 +487 @@
         nphi = numPhiSteps              //number of anular sectors is set by users
         
-        rcentr = 150            //pixels within rcentr of beam center are broken into 9 parts
         rc = 2*dtdist*asin(qc*lambda/4/Pi)              //in mm
         delr = nw*sx/2
@@ -673 +642 @@
         //angle dependent transmission correction is not done in phiave
         Ann_1D_Graph(aveint,phival,sigave)
-//      DoWindow/F Plot_1d
-//      If(V_flag == 1)         //the graph window already exists
-//              //kill the old graph and make a new one
-//              //easier than adjusting the old one
-//              DoWindow/K Plot_1d
-//      Endif   
-//      Display /W=(412,51,727,302)/K=1 aveint vs phival
-//      ModifyGraph log=0
-//      ModifyGraph mode=3,marker=19,msize=1,rgb=(0,0,0)
-//      ErrorBars aveint Y,wave=(sigave,sigave)
-//      Label left "Counts";DelayUpdate
-//      Label bottom "Angle (degrees)"
-//      DoWindow/C Plot_1d
         
         //get rid of the default mask, if one was created (it is in the current folder)