[Rivet-svn] r2378 - in trunk: . pyext

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sat Apr  3 21:26:55 2010
New Revision: 2378

Log:
Improving SWIG detection since we're relying on the user system to have it again

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/pyext/Makefile.am
   trunk/pyext/rivet.i

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Sat Apr  3 20:46:38 2010	(r2377)
+++ trunk/ChangeLog	Sat Apr  3 21:26:55 2010	(r2378)
@@ -1,3 +1,23 @@
+2010-04-03  Andy Buckley  <andy at insectnation.org>
+
+	* Frank Siegert: Update of rivet-mkhtml to conform to improved
+	compare-histos.
+
+	* Frank Siegert: LWH output in precision-8 scientific notation, to
+	solve a binning precision problem... the first one!
+
+	* Improved treatment of data/reference datasets and labels in
+	compare-histos.
+
+	* Rewrite of rivet-mkanalysis in Python to make way for neat
+	additions.
+
+	* Improving SWIG tests, since once again the user's biuld system
+	must include SWIG (no test to check that it's a 'good SWIG', since
+	the meaning of that depends on which compiler is being used and we
+	hope that the user system is consistent... evidence from Finkified
+	Macs and bloody SLC5 notwithstanding).
+
 2010-03-23  Andy Buckley  <andy at insectnation.org>
 
 	* Tag as patch release 1.2.1.

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Sat Apr  3 20:46:38 2010	(r2377)
+++ trunk/configure.ac	Sat Apr  3 21:26:55 2010	(r2378)
@@ -218,26 +218,19 @@
   fi
 fi
 ## SWIG version checks
-#if test x$enable_pyext == xyes -a ! -e pyext/lhapdf_wrap.cc; then
-#  AC_PATH_PROG(SWIG, swig)
-#  if test -x "$SWIG"; then
-#    swig_version=`$SWIG -version 2>&1 | grep Version | cut -f3 -d" "`
-#    swig_major=`echo $swig_version | cut -f1 -d.`
-#    swig_minor=`echo $swig_version | cut -f2 -d.`
-#    swig_micro=`echo $swig_version | cut -f3 -d.`
-#    let swig_version_num="1000*$swig_major+100*$swig_minor+$swig_micro"
-#    if test "$swig_version_num" -lt 1333; then
-#    #if test "$swig_major" -eq 1 -a "$swig_minor" -eq 3 -a "$swig_micro" -lt 33; then
-#      AC_MSG_WARN([Can't build Python extension since SWIG version is too old to build wrapper files: please use a tarball release])
-#      enable_pyext=no
-#    fi
-#  fi
+AC_PROG_SWIG
+if test x$SWIG == x; then
+  enable_pyext=no
+fi
+#if test x$enable_pyext == xyes; then
+#  SWIG_ENABLE_CXX
+#  SWIG_PYTHON
 #fi
 ## Finish
-AM_CONDITIONAL(ENABLE_PYEXT, [test x$enable_pyext == xyes])
 if test x$enable_pyext == xyes; then
   AC_MSG_NOTICE([All Python build checks successful: 'rivet' Python extension will be built])
 fi
+AM_CONDITIONAL(ENABLE_PYEXT, [test x$enable_pyext == xyes])
 
 
 ## Set default build flags

Modified: trunk/pyext/Makefile.am
==============================================================================
--- trunk/pyext/Makefile.am	Sat Apr  3 20:46:38 2010	(r2377)
+++ trunk/pyext/Makefile.am	Sat Apr  3 21:26:55 2010	(r2378)
@@ -1,7 +1,7 @@
 EXTRA_DIST = rivet.i ez_setup.py lighthisto.py
 
 rivet_wrap.cc rivet.py: rivet.i
-	swig -c++ -python -I$(top_srcdir)/include -o rivet_wrap.cc $<;
+	$(SWIG) -c++ -python -I$(top_srcdir)/include -o rivet_wrap.cc $<;
 
 if ENABLE_PYEXT
 

Modified: trunk/pyext/rivet.i
==============================================================================
--- trunk/pyext/rivet.i	Sat Apr  3 20:46:38 2010	(r2377)
+++ trunk/pyext/rivet.i	Sat Apr  3 21:26:55 2010	(r2378)
@@ -59,9 +59,6 @@
     const long pdgId() const;
   };
 
-  typedef std::vector<Particle> ParticleVector;
-  typedef std::pair<Particle, Particle> ParticlePair;
-
   ParticlePair beams(const Event& e);
 
   BeamPair beamIds(const HepMC::GenEvent& e) {