Changeset 58 for sans/SASCalc

Timestamp:

Mar 19, 2007 5:43:32 PM (16 years ago)

Author:

srkline

Message:

added a more realistic shadow correction for resolution

File:

• sans/SASCalc/trunk/SASCALC.ipf (modified) (4 diffs)

sans/SASCalc/trunk/SASCALC.ipf

@@ -930 +930 @@
         Variable L2 = reals[18]
 //      Variable BS = reals[21]         //this the diameter is stored in mm
-        Variable BS = beamstopDiamProjection() * 10             //calculated projection in cm *10 = mm
+        Variable BS = beamstopDiamProjection(1) * 10            //calculated projection in cm *10 = mm
         Variable S1 = reals[23]
         Variable S2 = reals[24]
@@ -1423 +1423 @@
 //returns the projected diameter of the beamstop at the anode plane.
 // most noticeable at short SDD
-Function beamstopDiamProjection()
-
+//if flag == 0 use conservative estimate = largest diameter (for SASCALC, default)
+//if flag != 0 use point aperture = average diameter (for resolution calculation)
+Function beamstopDiamProjection(flag)
+        Variable flag
+        
         NVAR L2diff = root:SAS:L2diff
         Variable a2 = sampleApertureDiam()
@@ -1432 +1435 @@
         l2 = sampleToDetectorDist() + L2diff
         LB = 20.1 + 1.61*BS                     //distance in cm from beamstop to anode plane (empirical)
-        BS_P = bs + (bs+a2)*lb/(l2-lb)          //diameter of shadow from parallax
-
+        if(flag==0)
+                BS_P = bs + (bs+a2)*lb/(l2-lb)          //diameter of shadow from parallax
+        else
+                BS_P = bs + bs*lb/(l2-lb)               //diameter of shadow, point A2
+        endif
         return (bs_p)           //return projected diameter in cm
 End
@@ -1444 +1450 @@
     Variable l2s = sampleToDetectorDist()       //distance from sample to detector in cm
 //    Variable bs = beamstopDiam()              //beamstop diameter in cm
-    Variable bs_p = beamstopDiamProjection()            //projected beamstop diameter in cm
+    Variable bs_p = beamstopDiamProjection(0)           //projected beamstop diameter in cm
     NVAR lambda = root:SAS:gLambda
     NVAR d_det = root:SAS:d_det         //cm