[Rivet-svn] r2607 - in trunk: . bin include/Rivet/Tools

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Jul 22 13:09:24 2010
New Revision: 2607

Log:
Adding extra entries to the log levels enum (to match AGILe)

Modified:
   trunk/ChangeLog
   trunk/bin/make-plots
   trunk/configure.ac
   trunk/include/Rivet/Tools/Logging.hh

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Thu Jul 22 13:09:03 2010	(r2606)
+++ trunk/ChangeLog	Thu Jul 22 13:09:24 2010	(r2607)
@@ -1,3 +1,9 @@
+2010-07-16  Andy Buckley  <andy at insectnation.org>
+
+	* Adding an explicit library dependency declaration on libHepMC,
+	and hence removing the -lHepMC from the rivet-config --libs
+	output.
+
 2010-07-14  Andy Buckley  <andy at insectnation.org>
 
 	* Adding a manual section on use of Rivet (and AGILe) as

Modified: trunk/bin/make-plots
==============================================================================
--- trunk/bin/make-plots	Thu Jul 22 13:09:03 2010	(r2606)
+++ trunk/bin/make-plots	Thu Jul 22 13:09:24 2010	(r2607)
@@ -18,7 +18,12 @@
 ## $Revision$
 ##
 
-import os, sys, logging, re
+import sys
+if sys.version_info[:3] < (2,4,0):
+    print "rivet scripts require Python version >= 2.4.0... exiting"
+    sys.exit(1)
+
+import os, logging, re
 import tempfile
 import getopt
 import string

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Thu Jul 22 13:09:03 2010	(r2606)
+++ trunk/configure.ac	Thu Jul 22 13:09:24 2010	(r2607)
@@ -191,7 +191,7 @@
 ## Basic Python checks
 if test x$enable_pyext == xyes; then
   AZ_PYTHON_PATH
-  AZ_PYTHON_VERSION_ENSURE([2.3])
+  AZ_PYTHON_VERSION_ENSURE([2.4])
   PYTHON_VERSION=`$PYTHON -c "import sys; print '.'.join(map(str, sys.version_info@<:@:2@:>@));"`
   AC_SUBST(PYTHON_VERSION)
   RIVET_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix');"`

Modified: trunk/include/Rivet/Tools/Logging.hh
==============================================================================
--- trunk/include/Rivet/Tools/Logging.hh	Thu Jul 22 13:09:03 2010	(r2606)
+++ trunk/include/Rivet/Tools/Logging.hh	Thu Jul 22 13:09:24 2010	(r2607)
@@ -11,7 +11,7 @@
 
     /// Log priority levels.
     enum Level {
-      TRACE = 0, DEBUG = 10, INFO = 20, WARN = 30, WARNING = 30, ERROR = 40
+      TRACE = 0, DEBUG = 10, INFO = 20, WARN = 30, WARNING = 30, ERROR = 40, CRITICAL = 50, ALWAYS = 50
     };
 
     /// Typedef for a collection of named logs.
@@ -129,7 +129,7 @@
     void trace(const std::string& message) { log(TRACE, message); }
 
     void debug(const std::string& message) { log(DEBUG, message); }
- 
+
     void info(const std::string& message) { log(INFO, message); }
 
     void warn(const std::string& message) { log(WARN, message); }
@@ -140,10 +140,10 @@
   private:
     /// This logger's name
     std::string _name;
- 
+
     /// Threshold level for this logger.
     int _level;
- 
+
   protected:
     /// Write a message at a particular level.
     void log(int level, const std::string& message);