[Rivet-svn] r3464 - in trunk: . bin src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Oct 27 22:52:39 2011
New Revision: 3464

Log:
Cosmetic changes and changing version number to 1.7.0beta0 for pre-release testing

Modified:
   trunk/bin/flat2aida
   trunk/configure.ac
   trunk/src/Analyses/ATLAS_2010_S8918562.cc

Modified: trunk/bin/flat2aida
==============================================================================
--- trunk/bin/flat2aida	Mon Oct 24 18:31:11 2011	(r3463)
+++ trunk/bin/flat2aida	Thu Oct 27 22:52:39 2011	(r3464)
@@ -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: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Mon Oct 24 18:31:11 2011	(r3463)
+++ trunk/configure.ac	Thu Oct 27 22:52:39 2011	(r3464)
@@ -1,7 +1,7 @@
 ## Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([Rivet],[1.7.0alpha0],[rivet at projects.hepforge.org],[Rivet])
+AC_INIT([Rivet],[1.7.0beta0],[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
@@ -20,8 +20,8 @@
 AC_DEFINE_UNQUOTED(RIVET_BUGREPORT, "$PACKAGE_BUGREPORT", "Rivet contact email address")
 
 ## Set library version info code
-## Set for version 1.6.0
-VERSIONINFOFLAGS="-version-info 9:0:0"
+## Set for version 1.7.0
+VERSIONINFOFLAGS="-version-info 10:0:0"
 AC_SUBST(VERSIONINFOFLAGS)
 
 ## OS X

Modified: trunk/src/Analyses/ATLAS_2010_S8918562.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2010_S8918562.cc	Mon Oct 24 18:31:11 2011	(r3463)
+++ trunk/src/Analyses/ATLAS_2010_S8918562.cc	Thu Oct 27 22:52:39 2011	(r3464)
@@ -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: