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

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Fri Jul 22 12:19:23 2011
New Revision: 3249

Log:
merged r3238 from trunk

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

Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog	Fri Jul 22 12:16:32 2011	(r3248)
+++ branches/2011-07-aida2yoda/ChangeLog	Fri Jul 22 12:19:23 2011	(r3249)
@@ -5,6 +5,8 @@
 	* Add two more observables to MC_DIPHOTON and make its isolation cut
 	more LHC-like
 
+	* Add linear photon pT histo to MC_PHOTONJETS
+
 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_PHOTONJETS.plot
==============================================================================
--- branches/2011-07-aida2yoda/data/plotinfo/MC_PHOTONJETS.plot	Fri Jul 22 12:16:32 2011	(r3248)
+++ branches/2011-07-aida2yoda/data/plotinfo/MC_PHOTONJETS.plot	Fri Jul 22 12:19:23 2011	(r3249)
@@ -16,13 +16,19 @@
 YLabel=$\text{d}\sigma/\text{d}\Delta{\phi}(\gamma\text{, 1st jet})$ [pb]
 # END PLOT
 
-# BEGIN PLOT /MC_PHOTONJETS/photon_pT
+# BEGIN PLOT /MC_PHOTONJETS/photon_pT$
 Title=Photon $p_\perp$
 XLabel=$p_\perp^{\gamma}$ [GeV]
 YLabel=$\text{d}\sigma/\text{d}p_\perp^{\gamma}$ [pb/GeV]
 LogX=1
 # END PLOT
 
+# BEGIN PLOT /MC_PHOTONJETS/photon_pT_lin$
+Title=Photon $p_\perp$
+XLabel=$p_\perp^{\gamma}$ [GeV]
+YLabel=$\text{d}\sigma/\text{d}y_{\gamma}$ [pb/GeV]
+# END PLOT
+
 # BEGIN PLOT /MC_PHOTONJETS/photon_y
 Title=Photon rapidity
 XLabel=$y_{\gamma}$

Modified: branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc	Fri Jul 22 12:16:32 2011	(r3248)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc	Fri Jul 22 12:19:23 2011	(r3249)
@@ -42,6 +42,7 @@
       addProjection(jetpro, "Jets");
 
       _h_photon_pT = bookHisto1D("photon_pT", logBinEdges(50, 30.0, 0.5*sqrtS()));
+      _h_photon_pT_lin = bookHisto1D("photon_pT_lin", 50, 0.0, 70.0);
       _h_photon_y = bookHisto1D("photon_y", 50, -5.0, 5.0);
       _h_photon_jet1_deta = bookHisto1D("photon_jet1_deta", 50, -5.0, 5.0);
       _h_photon_jet1_dphi = bookHisto1D("photon_jet1_dphi", 20, 0.0, M_PI);
@@ -83,6 +84,7 @@
       }
 
       _h_photon_pT->fill(photon.pT(),weight);
+      _h_photon_pT_lin->fill(photon.pT(),weight);
       _h_photon_y->fill(photon.rapidity(),weight);
 
       const FastJets& jetpro = applyProjection<FastJets>(e, "Jets");
@@ -100,6 +102,7 @@
     // Finalize
     void finalize() {
       scale(_h_photon_pT, crossSectionPerEvent());
+      scale(_h_photon_pT_lin, crossSectionPerEvent());
       scale(_h_photon_y, crossSectionPerEvent());
       scale(_h_photon_jet1_deta, crossSectionPerEvent());
       scale(_h_photon_jet1_dphi, crossSectionPerEvent());
@@ -116,6 +119,7 @@
     /// @name Histograms
     //@{
     Histo1DPtr _h_photon_pT;
+    Histo1DPtr _h_photon_pT_lin;
     Histo1DPtr _h_photon_y;
     Histo1DPtr _h_photon_jet1_deta;
     Histo1DPtr _h_photon_jet1_dphi;