[Rivet-svn] r3467 - in branches/2011-07-aida2yoda: . bin src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Mon Oct 31 09:13:43 2011
New Revision: 3467

Log:
merge r3464 from trunk

Modified:
   branches/2011-07-aida2yoda/bin/flat2aida
   branches/2011-07-aida2yoda/configure.ac
   branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc

Modified: branches/2011-07-aida2yoda/bin/flat2aida
==============================================================================
--- branches/2011-07-aida2yoda/bin/flat2aida	Mon Oct 31 06:55:46 2011	(r3466)
+++ branches/2011-07-aida2yoda/bin/flat2aida	Mon Oct 31 09:13:43 2011	(r3467)
@@ -42,8 +42,7 @@
     parser.add_option("-o", "--output", default=None,
                       help="Write all histos to a single output file. "
                       "stdout can be explicitly specified by setting '-' as the output filename. This option will "
-                      "be disregarded if --split is specified.",
-                      dest="OUTPUT")
+                      "be disregarded if --split is specified.", dest="OUTPUT")
     parser.add_option("-s", "--split", action="store_true", default=False,
                       help="Split histograms into individual files", dest="SPLITOUTPUT")
     parser.add_option("--plotinfodir", dest="PLOTINFODIR", action="append",

Modified: branches/2011-07-aida2yoda/configure.ac
==============================================================================
--- branches/2011-07-aida2yoda/configure.ac	Mon Oct 31 06:55:46 2011	(r3466)
+++ branches/2011-07-aida2yoda/configure.ac	Mon Oct 31 09:13:43 2011	(r3467)
@@ -21,7 +21,7 @@
 
 ## Set library version info code
 ## Set for version 2.0.0
-VERSIONINFOFLAGS="-version-info 10:0:0"
+VERSIONINFOFLAGS="-version-info 11:0:0"
 AC_SUBST(VERSIONINFOFLAGS)
 
 ## OS X

Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc	Mon Oct 31 06:55:46 2011	(r3466)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc	Mon Oct 31 09:13:43 2011	(r3467)
@@ -8,7 +8,7 @@
 namespace Rivet {
 
 
-  /// Rivet analysis class for ATLAS_2010_S8918562 dataset
+  /// Rivet analysis class for ATLAS 2010 minimum bias analysis
   class ATLAS_2010_S8918562 : public Analysis {
   public: