mcd-analysis/src/main/java/org/lcsim/mcd/analysis

diff -u -r1.7 -r1.8
--- MCHiggs.java	19 Dec 2012 18:13:10 -0000	1.7
+++ MCHiggs.java	19 Dec 2012 18:26:03 -0000	1.8
@@ -95,20 +95,9 @@

                 
                 double pt = VecOp.dot(p, z_unit);
                 double pt2 = VecOp.dot(p2,z_unit);

-                double cos_theta = VecOp.cosTheta(p);

-                double phi1 = VecOp.phi(p);
-                double phi2 = VecOp.phi(p2);
-                double eta1 = 0.5*Math.log((p_m+p.z())/(p_m-p.z()));
-                double eta2 = 0.5*Math.log((p2_m+p2.z())/(p2_m-p2.z()));

-                aida.cloud1D("eta1").fill(eta1);
-                aida.cloud1D("eta2").fill(eta2);
-                aida.cloud1D("phi1").fill(phi1);
-                aida.cloud1D("phi2").fill(phi2);
-                
-                double inv_mass = Math.sqrt(
-                        2*pt*pt2*(Math.cosh(eta1-eta2) - Math.cos(phi1-phi2)));

+                double inv_mass = Math.sqrt(2*(ener*ener - VecOp.dot(p, p2)));

                 
                 aida.cloud1D("gamma momentum").fill(p_m);
                 aida.cloud1D("gamma transverse momentum").fill(pt);