switching to pythia8.3 so that we can use vincia

.pythia8

@@ -1 +1 @@
-/Users/mverweij/soft/pythia8235
+/Users/mverweij/soft/pythia8303

Makefile

@@ -11,15 +11,15 @@ FFLAGS = -Wall -O2
 CXXFLAGS += -std=c++11
 LDFLAGS += -std=c++11
 
-FJCONFIG = /Users/mverweij/soft/fastjet-3.3.2/../fastjet332-install/bin/fastjet-config
-FJLOC = /Users/mverweij/soft/fastjet-3.3.2/../fastjet332-install
+FJCONFIG = /Users/mverweij/soft/fastjet-3.3.3/../fastjet333-install/bin/fastjet-config
+FJLOC = /Users/mverweij/soft/fastjet-3.3.3/../fastjet333-install
 
 INCLUDE += `$(FJCONFIG) --cxxflags`
 LIBRARIES  += -L$(FJLOC)/lib -lRecursiveTools `$(FJCONFIG) --libs --plugins` -lfastjetcontribfragile
 
-PYTHIA8LOCATION = /Users/mverweij/soft/pythia8235
+PYTHIA8LOCATION = /Users/mverweij/soft/pythia8303
 INCLUDE += -I$(PYTHIA8LOCATION)/include
-LIBRARIES  += -L$(PYTHIA8LOCATION)/lib -lpythia8
+LIBRARIES  += -L$(PYTHIA8LOCATION)/lib -Wl,-rpath,$(PYTHIA8LOCATION)/lib -lpythia8 -ldl
 LIBRARIES += -L/usr/local/Cellar/gsl/2.5/lib -lgsl -lgslcblas
 
 INCLUDE += -I/usr/local/Cellar/gsl/2.5/include

PU14/Makefile

@@ -11,8 +11,8 @@ FFLAGS = -Wall -O2
 CXXFLAGS += -std=c++11
 LDFLAGS += -std=c++11
 
-FJCONFIG = /Users/mverweij/soft/fastjet-3.3.2/../fastjet332-install/bin/fastjet-config
-FJLOC = /Users/mverweij/soft/fastjet-3.3.2/../fastjet332-install
+FJCONFIG = /Users/mverweij/soft/fastjet-3.3.3/../fastjet333-install/bin/fastjet-config
+FJLOC = /Users/mverweij/soft/fastjet-3.3.3/../fastjet333-install
 
 INCLUDE += `$(FJCONFIG) --cxxflags`
 LIBRARIES  += -L$(FJLOC)/lib -lRecursiveTools `$(FJCONFIG) --libs --plugins` -lfastjetcontribfragile

README_ForBScStudents.md

@@ -52,11 +52,11 @@ rootsetup=$PWD/root/bin/thisroot.sh
 echo $rootsetup >> ~/.bashrc
 ```
 
-### Install PYTHIA8
+### Install PYTHIA8.3
 ```sh
-wget http://home.thep.lu.se/~torbjorn/pythia8/pythia8235.tgz
-tar xvfz pythia8235.tgz
-cd pythia8235
+wget http://home.thep.lu.se/~torbjorn/pythia8/pythia8303.tgz
+tar xvfz pythia8303.tgz
+cd pythia8303
 ./configure
 make
 PYTHIA=$PWD
@@ -77,7 +77,7 @@ make install
 FASTJET=$PWD/../fastjet333-install
 cd ..
 
-export FJ_CONTRIB_VER=1.042 
+export FJ_CONTRIB_VER=1.045 
 curl -Lo source.tar.gz http://fastjet.hepforge.org/contrib/downloads/fjcontrib-"$FJ_CONTRIB_VER".tar.gz
 tar xzf source.tar.gz
 cd fjcontrib-"$FJ_CONTRIB_VER"
@@ -93,7 +93,7 @@ cd ..
 ```sh
 git clone https://github.com/mverwe/JetToyHI.git
 cd JetToyHI
-git pull --rebase origin forbsc2
+git pull --rebase origin pyt83
 
 echo `$FASTJET/bin/fastjet-config --prefix` > .fastjet
 echo $PYTHIA > .pythia8

scripts/mkcxx.pl

@@ -146,7 +146,7 @@
   $makefile.="
 PYTHIA8LOCATION = $pythia8location
 INCLUDE += -I\$(PYTHIA8LOCATION)/include
-LIBRARIES  += -L\$(PYTHIA8LOCATION)/lib -lpythia8
+LIBRARIES  += -L\$(PYTHIA8LOCATION)/lib -Wl,-rpath,\$(PYTHIA8LOCATION)/lib -lpythia8 -ldl
 ";
 }