[Rivet-svn] r3329 - in branches/2011-07-aida2yoda: . bin include/Rivet/Projections

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Thu Aug 25 11:17:43 2011
New Revision: 3329

Log:
merge r3322-3223 from trunk

Modified:
   branches/2011-07-aida2yoda/ChangeLog
   branches/2011-07-aida2yoda/bin/rivet-buildplugin.in
   branches/2011-07-aida2yoda/include/Rivet/Projections/UnstableFinalState.hh

Modified: branches/2011-07-aida2yoda/ChangeLog
==============================================================================
--- branches/2011-07-aida2yoda/ChangeLog	Thu Aug 25 11:16:29 2011	(r3328)
+++ branches/2011-07-aida2yoda/ChangeLog	Thu Aug 25 11:17:43 2011	(r3329)
@@ -1,3 +1,9 @@
+2011-08-23  Andy Buckley  <andy at insectnation.org>
+
+	* Also call the --cflags option on root-config when using the
+	--root option with rivet-biuldplugin (thanks to Richard Corke for
+	the report)
+
 2011-08-23  Frank Siegert <frank.siegert at cern.ch>
 
 	* Added ATLAS_2011_S9126244

Modified: branches/2011-07-aida2yoda/bin/rivet-buildplugin.in
==============================================================================
--- branches/2011-07-aida2yoda/bin/rivet-buildplugin.in	Thu Aug 25 11:16:29 2011	(r3328)
+++ branches/2011-07-aida2yoda/bin/rivet-buildplugin.in	Thu Aug 25 11:17:43 2011	(r3329)
@@ -87,7 +87,7 @@
 shift
 sources_and_flags="$@"
 if [[ -n $with_root ]]; then
-    root_flags=$(root-config --libs 2> /dev/null)
+    root_flags=$(root-config --libs --cflags 2> /dev/null)
     # echo $root_flags
     sources_and_flags="$root_flags $sources_and_flags"
 fi

Modified: branches/2011-07-aida2yoda/include/Rivet/Projections/UnstableFinalState.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Projections/UnstableFinalState.hh	Thu Aug 25 11:16:29 2011	(r3328)
+++ branches/2011-07-aida2yoda/include/Rivet/Projections/UnstableFinalState.hh	Thu Aug 25 11:17:43 2011	(r3329)
@@ -10,11 +10,23 @@
 
 
   /// @brief Project out all physical-but-decayed particles in an event.
+  ///
+  /// The particles returned by the UFS are unique unstable particles, such as
+  /// hadrons which are decayed by the generator. If, for example, you set Ks
+  /// and Lambda particles stable in the generator, they will not be returned by
+  /// the UFS. Also, you should be aware that all unstable particles in a decay
+  /// chain are returned: if you are looking for something like the number of B
+  /// hadrons in an event and there is a decay chain from e.g. B** -> B, you
+  /// will count both B mesons unless you are careful to check for
+  /// ancestor/descendent relations between the particles. Duplicate particles
+  /// in the event record, i.e. those which differ only in bookkeeping details
+  /// or photon emissions, are stripped from the returned particles collection.
   class UnstableFinalState : public FinalState {
   public:
 
     /// @name Standard constructors and destructors.
     //@{
+
     /// The default constructor. May specify the minimum and maximum
     /// pseudorapidity \f$ \eta \f$ and the min \f$ p_T \f$ (in GeV).
     UnstableFinalState(double mineta = -MAXRAPIDITY,
@@ -33,8 +45,13 @@
     virtual const Projection* clone() const {
       return new UnstableFinalState(*this);
     }
+
     //@}
 
+
+    /// @name Accessors
+    //@{
+
     /// Access the projected final-state particles.
     virtual const ParticleVector& particles() const { return _theParticles; }
 
@@ -44,6 +61,8 @@
     /// @deprecated Is this final state empty?
     virtual bool isEmpty() const { return _theParticles.empty(); }
 
+    //@}
+
 
   protected: