Changeset 827 for sans/Dev/trunk/NCNR_User_Procedures/Reduction

Timestamp:

Aug 1, 2011 4:05:48 PM (12 years ago)

Author:

srkline

Message:

changed the line endings on Auto_fit.ipf so that diff will work properly

Changed the 2D resolution calculation to match the style and variables used in the JAC paper w/ David and John. No effect on the calculation, just for consistency.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf (modified) (4 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_Utils.ipf

@@ -293 +293 @@
 
 
-///////// in terms of Q_parallel ("x") and Q_perp ("y") - this works, since parallel is in the direction of Q and I
+        // the detector pixel is square, so correct for phi
+        proj_DDet = DDet*cos(phi) + DDet*sin(phi)
+
+
+///////// OLD - don't use ---
+//in terms of Q_parallel ("x") and Q_perp ("y") - this works, since parallel is in the direction of Q and I
 // can calculate that from the QxQy (I just need the projection)
-
-
 //// for test case with no gravity, set a_val = 0
 //// note that gravity has no wavelength dependence. the lambda^4 cancels out.
@@ -303 +306 @@
 ////    a_val_l2 = 0
 //
-//      // the detector pixel is square, so correct for phi
-//      proj_DDet = DDet*cos(phi) + DDet*sin(phi)
 //      
 //      // this is really sigma_Q_parallel
@@ -321 +322 @@
 /////////////////////////////////////////////////
 /////   
-//      ////// this is all experimental, inclusion of gravity effect into the parallel component
+//      ////// this is all new, inclusion of gravity effect into the parallel component
+//       perpendicular component is purely geometric, no gravity component
 ////    //
         Variable yg_d,acc,sdd,ssd,lambda0,DL_L,sig_l
-        Variable var_qlx,var_qly,var_ql,qx,qy,sig_perp,sig_para
+        Variable var_qlx,var_qly,var_ql,qx,qy,sig_perp,sig_para, sig_para_new
         G = 981.  //!   ACCELERATION OF GRAVITY, CM/SEC^2
         acc = vz_1              //      3.956E5 //!     CONVERT WAVELENGTH TO VELOCITY CM/SEC
@@ -340 +342 @@
         
         FindQxQy(inQ,phi,qx,qy)
-        
-        VAR_QLY = SIG_L^2 * (QY+4*PI*YG_d/(2*SDD*LAMBDA0))^2
-        VAR_QLX = (SIG_L*QX)^2
-        VAR_QL = VAR_QLY + VAR_QLX  //! WAVELENGTH CONTRIBUTION TO VARIANCE
-        sig_para = (sig_perp^2 + VAR_QL)^0.5
+
+// missing a factor of 2 here, and the form is different than the paper, so re-write    
+//      VAR_QLY = SIG_L^2 * (QY+4*PI*YG_d/(2*SDD*LAMBDA0))^2
+//      VAR_QLX = (SIG_L*QX)^2
+//      VAR_QL = VAR_QLY + VAR_QLX  //! WAVELENGTH CONTRIBUTION TO VARIANCE
+//      sig_para = (sig_perp^2 + VAR_QL)^0.5
+        
+        // r_dist is passed in, [=]cm
+        // from the paper
+        a_val = 0.5*G*SDD*(SSD+SDD)*m_h^2 * 1e-16               //units now are cm /(A^2)
+        
+        var_QL = 1/6*(kap/SDD)^2*(DL_L)^2*(r_dist^2 - 4*r_dist*a_val*lambda0^2*sin(phi) + 4*a_val^2*lambda0^4)
+        sig_para_new = (sig_perp^2 + VAR_QL)^0.5
+        
         
 ///// return values PBR 
-        SigmaQX = sig_para
+        SigmaQX = sig_para_new
         SigmaQy = sig_perp