[Rivet-svn] rivet: Undo changes related to gsl

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/db8d68d0a8c1
branches:  release-2-5-x
changeset: 5611:db8d68d0a8c1
user:      Holger Schulz <holger.schulz at durham.ac.uk>
date:      Wed Nov 23 11:30:51 2016 +0000
description:
Undo changes related to gsl

diffs (truncated from 284 to 50 lines):

--- a/bin/rivet	Tue Nov 22 15:18:56 2016 +0000
+++ b/bin/rivet	Wed Nov 23 11:30:51 2016 +0000
@@ -283,8 +283,6 @@
                             msg += "  [" + " ".join(a.keywords()) + "]"
                         if a.luminosityfb():
                             msg += "  [ \int L = %s fb^{-1} ]"%a.luminosityfb()
-                        if a.collider():
-                            msg += " [ Collider: %s ] "%a.collider()
                 print msg
                 #os.write(tf, msg + "\n")
         # if os.path.getsize(tfpath) > 0:
--- a/configure.ac	Tue Nov 22 15:18:56 2016 +0000
+++ b/configure.ac	Wed Nov 23 11:30:51 2016 +0000
@@ -145,12 +145,12 @@
 
 
 ## GNU Scientific Library
-#AC_SEARCH_GSL
-#AC_CEDAR_HEADERS([gsl], , , [AC_MSG_ERROR([GSL (GNU Scientific Library) is required])])
-#oldCPPFLAGS=$CPPFLAGS
-#CPPFLAGS="$CPPFLAGS -I$GSLINCPATH"
-#AC_CHECK_HEADER([gsl/gsl_vector.h], [], [AC_MSG_ERROR([GSL vectors not found.])])
-#CPPFLAGS=$oldCPPFLAGS
+AC_SEARCH_GSL
+AC_CEDAR_HEADERS([gsl], , , [AC_MSG_ERROR([GSL (GNU Scientific Library) is required])])
+oldCPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS -I$GSLINCPATH"
+AC_CHECK_HEADER([gsl/gsl_vector.h], [], [AC_MSG_ERROR([GSL vectors not found.])])
+CPPFLAGS=$oldCPPFLAGS
 
 
 ## Disable build/install of standard analyses
@@ -238,7 +238,7 @@
 ## Set default build flags
 AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include"
 #AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)/include/eigen3"
-#AM_CPPFLAGS="$AM_CPPFLAGS \$(GSL_CPPFLAGS)"
+AM_CPPFLAGS="$AM_CPPFLAGS \$(GSL_CPPFLAGS)"
 dnl AM_CPPFLAGS="$AM_CPPFLAGS \$(BOOST_CPPFLAGS)"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(YODAINCPATH)"
 AM_CPPFLAGS="$AM_CPPFLAGS -I\$(HEPMCINCPATH)"
--- a/include/Rivet/Math/Matrices.hh	Tue Nov 22 15:18:56 2016 +0000
+++ b/include/Rivet/Math/Matrices.hh	Wed Nov 23 11:30:51 2016 +0000
@@ -5,5 +5,6 @@
 #include "Rivet/Math/MatrixN.hh"
 #include "Rivet/Math/Matrix3.hh"
 #include "Rivet/Math/LorentzTrans.hh"
+#include "Rivet/Math/MatrixDiag.hh"
 
 #endif