[Rivet-svn] r3251 - in trunk: . include/Rivet src/Projections

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Fri Jul 22 12:21:11 2011
New Revision: 3251

Log:
merged Changelog changes from branches/2011-07-aida2yoda

Modified:
   trunk/ChangeLog
   trunk/include/Rivet/Makefile.am
   trunk/src/Projections/Makefile.am

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Fri Jul 22 12:20:05 2011	(r3250)
+++ trunk/ChangeLog	Fri Jul 22 12:21:11 2011	(r3251)
@@ -2,6 +2,11 @@
 
 	* Added ATLAS_2011_S9120807
 
+	* 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: trunk/include/Rivet/Makefile.am
==============================================================================
--- trunk/include/Rivet/Makefile.am	Fri Jul 22 12:20:05 2011	(r3250)
+++ trunk/include/Rivet/Makefile.am	Fri Jul 22 12:21:11 2011	(r3251)
@@ -64,6 +64,7 @@
   Projections/Multiplicity.hh   \
   Projections/NeutralFinalState.hh \
   Projections/ParisiTensor.hh   \
+  Projections/PartonFinalState.hh \
   Projections/PVertex.hh        \
   Projections/Sphericity.hh     \
   Projections/Spherocity.hh     \

Modified: trunk/src/Projections/Makefile.am
==============================================================================
--- trunk/src/Projections/Makefile.am	Fri Jul 22 12:20:05 2011	(r3250)
+++ trunk/src/Projections/Makefile.am	Fri Jul 22 12:21:11 2011	(r3251)
@@ -27,6 +27,7 @@
   Multiplicity.cc \
   NeutralFinalState.cc \
   ParisiTensor.cc \
+  PartonFinalState.cc \
   PVertex.cc \
   Sphericity.cc \
   Spherocity.cc \