[Rivet-svn] r3412 - in branches/2011-07-aida2yoda: . include/Rivet/Projections src/Projections

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Oct  6 14:03:02 2011
New Revision: 3412

Log:
merge r3343-3345 from trunk

Modified:
   branches/2011-07-aida2yoda/configure.ac
   branches/2011-07-aida2yoda/include/Rivet/Projections/JetAlg.hh
   branches/2011-07-aida2yoda/src/Projections/ChargedLeptons.cc

Modified: branches/2011-07-aida2yoda/configure.ac
==============================================================================
--- branches/2011-07-aida2yoda/configure.ac	Thu Oct  6 13:55:37 2011	(r3411)
+++ branches/2011-07-aida2yoda/configure.ac	Thu Oct  6 14:03:02 2011	(r3412)
@@ -2,6 +2,9 @@
 
 AC_PREREQ(2.59)
 AC_INIT([Rivet],[2.0.0a0],[rivet at projects.hepforge.org],[Rivet])
+if test "$prefix" = "$PWD"; then
+  AC_MSG_ERROR([Installation into the build directory is not supported: use a different --prefix argument])
+fi
 AC_CONFIG_SRCDIR([src/Core/Analysis.cc])
 AC_CONFIG_HEADERS([include/Rivet/Config/DummyConfig.hh include/Rivet/Config/RivetConfig.hh include/Rivet/Config/BuildOptions.hh])
 AM_INIT_AUTOMAKE(dist-bzip2)

Modified: branches/2011-07-aida2yoda/include/Rivet/Projections/JetAlg.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Projections/JetAlg.hh	Thu Oct  6 13:55:37 2011	(r3411)
+++ branches/2011-07-aida2yoda/include/Rivet/Projections/JetAlg.hh	Thu Oct  6 14:03:02 2011	(r3412)
@@ -93,7 +93,7 @@
                       RapScheme rapscheme=PSEUDORAPIDITY) const {
       const Jets rawjets = _jets(ptmin);
       Jets rtn;
-      MSG_DEBUG("Raw jet size (with pTmin cut) = " << rawjets.size());
+      MSG_DEBUG("Raw jet size (with pTmin cut = " << ptmin/GeV << "GeV) = " << rawjets.size());
       foreach (const Jet& j, rawjets) {
         const FourMomentum pj = j.momentum();
         if (!inRange(pj.pT(), ptmin, ptmax)) continue;

Modified: branches/2011-07-aida2yoda/src/Projections/ChargedLeptons.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Projections/ChargedLeptons.cc	Thu Oct  6 13:55:37 2011	(r3411)
+++ branches/2011-07-aida2yoda/src/Projections/ChargedLeptons.cc	Thu Oct  6 14:03:02 2011	(r3412)
@@ -23,6 +23,7 @@
         _theChargedLeptons += Particle(p);
       }
     }
+    std::sort(_theChargedLeptons.begin(), _theChargedLeptons.end(), cmpParticleByPt);
   }