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

Timestamp:

Jun 24, 2011 9:46:25 AM (12 years ago)

Author:

srkline

Message:

switched the 2d resolution calculation back to using the latest gravity correction terms. Still not sure if these are final, but I think it's close.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• MultScatter_MonteCarlo_2D.ipf (modified) (2 diffs)
• NCNR_Utils.ipf (modified) (2 diffs)

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

@@ -534 +534 @@
                 Vz = (ssd - 0)/magn
                 
-//              Vx = 0.0                        // Initialize direction vector.
-//              Vy = 0.0
-//              Vz = 1.0
-                
-                
 //
 //              if(n1 == 1)
@@ -600 +595 @@
                                         while(!find_theta)
                                         ran = abs(enoise(1))            //[0,1]
-                                        PHI = 2.0*PI*Ran                        //Chooses azimuthal scattering angle.
+                                        PHI = 2.0*PI*Ran                        //Chooses azimuthal scattering angle. Currently this is random
                                 ELSE
                                         //NEUTRON scattered incoherently

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

@@ -297 +297 @@
 
 
-// for test case with no gravity, set a_val = 0
-// note that gravity has no wavelength dependence. the lambda^4 cancels out.
-//
-//      a_val = 0
-//      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
-        SigmaQX = kap*kap/12 * (3*(S1/L1)^2 + 3*(S2/LP)^2 + (proj_DDet/L2)^2 + (sin(phi))^2*8*(a_val_L2)^2*lambda^4*lambdaWidth^2)
-        SigmaQX += inQ*inQ*v_lambda
-
-        //this is really sigma_Q_perpendicular
-        proj_DDet = DDet*sin(phi) + DDet*cos(phi)               //not necessary, since DDet is the same in both X and Y directions
-
-        SigmaQY = kap*kap/12 * (3*(S1/L1)^2 + 3*(S2/LP)^2 + (proj_DDet/L2)^2 + (cos(phi))^2*8*(a_val_L2)^2*lambda^4*lambdaWidth^2)
-        
-        SigmaQX = sqrt(SigmaQX)
-        SigmaQy = sqrt(SigmaQY)
-        
+//// for test case with no gravity, set a_val = 0
+//// note that gravity has no wavelength dependence. the lambda^4 cancels out.
+////
+////    a_val = 0
+////    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
+//      SigmaQX = kap*kap/12 * (3*(S1/L1)^2 + 3*(S2/LP)^2 + (proj_DDet/L2)^2 + (sin(phi))^2*8*(a_val_L2)^2*lambda^4*lambdaWidth^2)
+//      SigmaQX += inQ*inQ*v_lambda
+//
+//      //this is really sigma_Q_perpendicular
+//      proj_DDet = DDet*sin(phi) + DDet*cos(phi)               //not necessary, since DDet is the same in both X and Y directions
+//
+//      SigmaQY = kap*kap/12 * (3*(S1/L1)^2 + 3*(S2/LP)^2 + (proj_DDet/L2)^2 + (cos(phi))^2*8*(a_val_L2)^2*lambda^4*lambdaWidth^2)
+//      
+//      SigmaQX = sqrt(SigmaQX)
+//      SigmaQy = sqrt(SigmaQY)
+//      
 
 /////////////////////////////////////////////////
@@ -323 +323 @@
 //      ////// this is all experimental, inclusion of gravity effect into the parallel 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
-//      G = 981.  //!   ACCELERATION OF GRAVITY, CM/SEC^2
-//      acc = vz_1              //      3.956E5 //!     CONVERT WAVELENGTH TO VELOCITY CM/SEC
-//      SDD = L2                //1317
-//      SSD = L1                //1627          //cm
-//      lambda0 = lambda                //              15
-//      DL_L = lambdaWidth              //0.236
-//      SIG_L = DL_L/sqrt(6)
-//      YG_d = -0.5*G*SDD*(SSD+SDD)*(LAMBDA0/acc)^2
-/////// Print "DISTANCE BEAM FALLS DUE TO GRAVITY (CM) = ",YG
-//      
-//      sig_perp = kap*kap/12 * (3*(S1/L1)^2 + 3*(S2/LP)^2 + (proj_DDet/L2)^2)
-//      sig_perp = sqrt(sig_perp)
-//      
-//      
-//      FindQxQy(inQ,phi,qx,qy)
-//      
-//      VAR_QLY = SIG_L^2 * (QY+4*PI*YG_d/(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
-//      
-/////// return values PBR       
-//      SigmaQX = sig_para
-//      SigmaQy = sig_perp
-//      
-//////  
+        Variable yg_d,acc,sdd,ssd,lambda0,DL_L,sig_l
+        Variable var_qlx,var_qly,var_ql,qx,qy,sig_perp,sig_para
+        G = 981.  //!   ACCELERATION OF GRAVITY, CM/SEC^2
+        acc = vz_1              //      3.956E5 //!     CONVERT WAVELENGTH TO VELOCITY CM/SEC
+        SDD = L2                //1317
+        SSD = L1                //1627          //cm
+        lambda0 = lambda                //              15
+        DL_L = lambdaWidth              //0.236
+        SIG_L = DL_L/sqrt(6)
+        YG_d = -0.5*G*SDD*(SSD+SDD)*(LAMBDA0/acc)^2
+/////   Print "DISTANCE BEAM FALLS DUE TO GRAVITY (CM) = ",YG
+        
+        sig_perp = kap*kap/12 * (3*(S1/L1)^2 + 3*(S2/LP)^2 + (proj_DDet/L2)^2)
+        sig_perp = sqrt(sig_perp)
+        
+        
+        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
+        
+///// return values PBR 
+        SigmaQX = sig_para
+        SigmaQy = sig_perp
+        
+////    
         
         results = "success"