From 7fd6b698e5f1a1eccd48e2210e77219314da6c48 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Tue, 1 Oct 2013 21:20:11 +0200
Subject: [PATCH] upgrade to Pythia8 >= 8180. Previous versions don't compile
with latest clang.
---
configure | 2 +-
montecarlo/pythia8/inc/TPythia8.h | 2 +-
montecarlo/pythia8/inc/TPythia8Decayer.h | 2 +-
montecarlo/pythia8/src/TPythia8Decayer.cxx | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 5303784e8b2..7c4aae7874c 100755
--- a/configure
+++ b/configure
@@ -4016,7 +4016,7 @@ check_explicit "$enable_pythia6" "$enable_pythia6_explicit" \
#
if test ! "x$enable_pythia8" = "xno" ; then
# Check for PYTHIA8 include and library
- check_header "Pythia.h" "$pythia8incdir" \
+ check_header "Pythia8/Pythia.h" "$pythia8incdir" \
$PYTHIA8 ${PYTHIA8:+$PYTHIA8/include} \
/opt/pythia8/include /usr/local/include /usr/include /usr/include/pythia
pythia8incdir=$found_dir
diff --git a/montecarlo/pythia8/inc/TPythia8.h b/montecarlo/pythia8/inc/TPythia8.h
index c36f187e80f..0f70c2788df 100644
--- a/montecarlo/pythia8/inc/TPythia8.h
+++ b/montecarlo/pythia8/inc/TPythia8.h
@@ -66,7 +66,7 @@
*/
#include "TGenerator.h"
-#include "Pythia.h"
+#include "Pythia8/Pythia.h"
class Pythia;
diff --git a/montecarlo/pythia8/inc/TPythia8Decayer.h b/montecarlo/pythia8/inc/TPythia8Decayer.h
index 0f17cbbf6ac..e80e74f7d6c 100644
--- a/montecarlo/pythia8/inc/TPythia8Decayer.h
+++ b/montecarlo/pythia8/inc/TPythia8Decayer.h
@@ -7,7 +7,7 @@
#ifndef TPYTHIA8DECAYER_H
#define TPYTHIA8DECAYER_H
-#include <TVirtualMCDecayer.h>
+#include "TVirtualMCDecayer.h"
class TClonesArrray;
class TLorentzVector;
diff --git a/montecarlo/pythia8/src/TPythia8Decayer.cxx b/montecarlo/pythia8/src/TPythia8Decayer.cxx
index 68e15987596..e7d916401b7 100644
--- a/montecarlo/pythia8/src/TPythia8Decayer.cxx
+++ b/montecarlo/pythia8/src/TPythia8Decayer.cxx
@@ -16,8 +16,8 @@
* provided "as is" without express or implied warranty. *
**************************************************************************/
-#include <TLorentzVector.h>
-#include <TPythia8.h>
+#include "TLorentzVector.h"
+#include "TPythia8.h"
#include "TPythia8Decayer.h"
ClassImp(TPythia8Decayer)
--
GitLab