[Rivet-svn] r3248 - in branches/2011-07-aida2yoda: . data/plotinfo src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Fri Jul 22 12:16:32 2011
New Revision: 3248

Log:
merged r3237 from trunk

Modified:
   branches/2011-07-aida2yoda/ChangeLog
   branches/2011-07-aida2yoda/data/plotinfo/MC_DIPHOTON.plot
   branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc

Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog	Fri Jul 22 12:08:52 2011	(r3247)
+++ branches/2011-07-aida2yoda/ChangeLog	Fri Jul 22 12:16:32 2011	(r3248)
@@ -2,6 +2,9 @@
 
 	* Added ATLAS_2011_S9120807
 
+	* Add two more observables to MC_DIPHOTON and make its isolation cut
+	more LHC-like
+
 2011-07-20  Andy Buckley  <andy at insectnation.org>
 
 	* Making MC_TTBAR work with semileptonic ttbar events and generally

Modified: branches/2011-07-aida2yoda/data/plotinfo/MC_DIPHOTON.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/MC_DIPHOTON.plot	Fri Jul 22 12:08:52 2011	(r3247)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_DIPHOTON.plot	Fri Jul 22 12:16:32 2011	(r3248)
@@ -3,6 +3,7 @@
 XLabel=$M_{\gamma \gamma}$ (GeV/$c^2$)
 YLabel=$\mathrm{d}\sigma/\mathrm{d}M_{\gamma \gamma}$ (pb/(GeV/$c^2$))
 LogX=1
+RatioPlotYMin=0.0
 # END PLOT
 
 # BEGIN PLOT /MC_DIPHOTON/pT_PP
@@ -10,10 +11,28 @@
 XLabel=$p_{\perp}^{\gamma \gamma}$ (GeV/$c$)
 YLabel=$\mathrm{d}\sigma/\mathrm{d}p_{\perp}^{\gamma \gamma}$ (pb/(GeV/$c$))
 LogX=1
+RatioPlotYMin=0.0
+# END PLOT
+
+# BEGIN PLOT /MC_DIPHOTON/pT_P1
+Title=Transverse momentum of leading photon
+XLabel=$p_{\perp}^{\gamma_1}$ (GeV/$c$)
+YLabel=$\mathrm{d}\sigma/\mathrm{d}p_{\perp}^{\gamma_1}$ (pb/(GeV/$c$))
+LogX=0
+RatioPlotYMin=0.0
+# END PLOT
+
+# BEGIN PLOT /MC_DIPHOTON/pT_P2
+Title=Transverse momentum of second photon
+XLabel=$p_{\perp}^{\gamma_2}$ (GeV/$c$)
+YLabel=$\mathrm{d}\sigma/\mathrm{d}p_{\perp}^{\gamma_2}$ (pb/(GeV/$c$))
+LogX=0
+RatioPlotYMin=0.0
 # END PLOT
 
 # BEGIN PLOT /MC_DIPHOTON/dphi_PP
 Title=Azimuthal angle between photons
 XLabel=$\Delta\Phi_{\gamma \gamma}$ (rad)
 YLabel=$\mathrm{d}\sigma/\mathrm{d}\Delta\Phi_{\gamma \gamma}$ (pb/rad)
+RatioPlotYMin=0.0
 # END PLOT

Modified: branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc	Fri Jul 22 12:08:52 2011	(r3247)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc	Fri Jul 22 12:16:32 2011	(r3248)
@@ -31,6 +31,8 @@
 
       _h_m_PP = bookHisto1D("m_PP", logBinEdges(50, 1.0, 0.25*sqrtS()));
       _h_pT_PP = bookHisto1D("pT_PP", logBinEdges(50, 1.0, 0.25*sqrtS()));
+      _h_pT_P1 = bookHisto1D("pT_P1", 50, 0.0, 70.0);
+      _h_pT_P2 = bookHisto1D("pT_P2", 50, 0.0, 70.0);
       _h_dphi_PP = bookHisto1D("dphi_PP", 20, 0.0, M_PI);
     }
 
@@ -46,7 +48,7 @@
 
       // Isolate photons with ET_sum in cone
       ParticleVector isolated_photons;
-      ParticleVector fs = applyProjection<FinalState>(event, "FS").particles();
+      ParticleVector fs = applyProjection<FinalState>(event, "FS").particlesByPt();
       foreach (const Particle& photon, photons) {
         FourMomentum mom_in_cone;
         double eta_P = photon.momentum().eta();
@@ -56,7 +58,7 @@
             mom_in_cone += p.momentum();
           }
         }
-        if (mom_in_cone.Et()-photon.momentum().Et() < 1.0*GeV) {
+        if (mom_in_cone.Et()-photon.momentum().Et() < 4.0*GeV) {
           isolated_photons.push_back(photon);
         }
       }
@@ -65,17 +67,21 @@
         vetoEvent;
       }
 
+      _h_pT_P1->fill(isolated_photons[0].momentum().pT(), weight);
+      _h_pT_P2->fill(isolated_photons[1].momentum().pT(), weight);
       FourMomentum mom_PP = isolated_photons[0].momentum() + isolated_photons[1].momentum();
       _h_m_PP->fill(mom_PP.mass(), weight);
       _h_pT_PP->fill(mom_PP.pT(), weight);
-      _h_dphi_PP->fill(mapAngle0ToPi(isolated_photons[0].momentum().phi()-
-                                     isolated_photons[1].momentum().phi())/M_PI, weight);
+      _h_dphi_PP->fill(deltaPhi(isolated_photons[0].momentum().phi(),
+                                isolated_photons[1].momentum().phi()), weight);
     }
 
 
     void finalize() {
       scale(_h_m_PP, crossSection()/sumOfWeights());
       scale(_h_pT_PP, crossSection()/sumOfWeights());
+      scale(_h_pT_P1, crossSection()/sumOfWeights());
+      scale(_h_pT_P2, crossSection()/sumOfWeights());
       scale(_h_dphi_PP, crossSection()/sumOfWeights());
     }
 
@@ -88,6 +94,8 @@
     //@{
     Histo1DPtr _h_m_PP;
     Histo1DPtr _h_pT_PP;
+    Histo1DPtr _h_pT_P1;
+    Histo1DPtr _h_pT_P2;
     Histo1DPtr _h_dphi_PP;
     //@}