Skip to content
Snippets Groups Projects
Commit 6486e6bc authored by Klaus Rabbertz's avatar Klaus Rabbertz
Browse files

Update install script

parent cad01f0b
No related branches found
No related tags found
No related merge requests found
...@@ -241,7 +241,8 @@ if ( $#argv > 5 && $6 != "_" ) then ...@@ -241,7 +241,8 @@ if ( $#argv > 5 && $6 != "_" ) then
# NNLOJET modules1 production version # NNLOJET modules1 production version
# set revision=rev5918 # set revision=rev5918
# NNLOJET modules2 production version # NNLOJET modules2 production version
set revision=modules2_rev6591 # set revision=modules2_rev6591
set revision=rev7902
endif endif
echo "NNLOJET usage: $tab$tab $withnnlojet" echo "NNLOJET usage: $tab$tab $withnnlojet"
# With interface to Sherpa via MCGrid? # With interface to Sherpa via MCGrid?
...@@ -776,8 +777,10 @@ if ( $withoptional ) then ...@@ -776,8 +777,10 @@ if ( $withoptional ) then
# fastNLO comes already with alpha_s evolutions from GRV or CRunDec, or # fastNLO comes already with alpha_s evolutions from GRV or CRunDec, or
# uses the one from the PDFs in LHAPDF # uses the one from the PDFs in LHAPDF
# #
# set arc="hoppet-1.1.5"
# set arc="hoppet-1.2.0" # set arc="hoppet-1.2.0"
# if ( ! -e ${arc}_installed ) then # if ( ! -e ${arc}_installed ) then
# tar xzf ${arc}-patched.tar.gz # Need patched version on newer systems like Ubuntu 16.04
# tar xzf ${arc}.tar.gz # tar xzf ${arc}.tar.gz
# cd ${arc} # cd ${arc}
# ./configure --prefix=${base} # ./configure --prefix=${base}
...@@ -827,7 +830,8 @@ if ( ! $mpnnlo ) then ...@@ -827,7 +830,8 @@ if ( ! $mpnnlo ) then
# set arc="fastnlo_toolkit-2.5.0-2856" # set arc="fastnlo_toolkit-2.5.0-2856"
# set arc="fastnlo_toolkit-2.5.1-2890" # set arc="fastnlo_toolkit-2.5.1-2890"
# set arc="fastnlo_toolkit-2.5.1-3022" # set arc="fastnlo_toolkit-2.5.1-3022"
set arc="fastnlo_toolkit-2.5.1-3034" # set arc="fastnlo_toolkit-2.5.1-3034"
set arc="fastnlo_toolkit-2.6.0-3055"
set rev="" set rev=""
if ( ! -e ${arc}_installed ) then if ( ! -e ${arc}_installed ) then
tar xzf ${arc}${rev}.tar.gz tar xzf ${arc}${rev}.tar.gz
...@@ -841,6 +845,7 @@ if ( ! $mpnnlo ) then ...@@ -841,6 +845,7 @@ if ( ! $mpnnlo ) then
# HOPPET-1.2.0 leads to unresolved references with fastNLO interface to NLOJet++. # HOPPET-1.2.0 leads to unresolved references with fastNLO interface to NLOJet++.
# ./configure --prefix=${base} --enable-fortranext --with-yoda --with-hoppet --with-qcdnum ${rootoptpath} ${pyextopt} # ./configure --prefix=${base} --enable-fortranext --with-yoda --with-hoppet --with-qcdnum ${rootoptpath} ${pyextopt}
./configure --prefix=${base} --with-yoda ${rootoptpath} ${pyextopt} ./configure --prefix=${base} --with-yoda ${rootoptpath} ${pyextopt}
# ./configure --prefix=${base} --with-yoda --with-hoppet --with-qcdnum ${rootoptpath} ${pyextopt}
# Doxygen does not work giving TeX compile error and not producing refman.tex # Doxygen does not work giving TeX compile error and not producing refman.tex
# ./configure --prefix=${base} --enable-fortranext --with-yoda --with-hoppet --with-qcdnum ${rootoptpath} ${pyextopt} --disable-doxygen-doc # ./configure --prefix=${base} --enable-fortranext --with-yoda --with-hoppet --with-qcdnum ${rootoptpath} ${pyextopt} --disable-doxygen-doc
else else
...@@ -877,7 +882,8 @@ if ( ! $mpnnlo ) then ...@@ -877,7 +882,8 @@ if ( ! $mpnnlo ) then
# set arc="fastnlo_interface_nlojet-2.5.0-2819" # set arc="fastnlo_interface_nlojet-2.5.0-2819"
# set arc="fastnlo_interface_nlojet-2.5.0-2858" # set arc="fastnlo_interface_nlojet-2.5.0-2858"
# set arc="fastnlo_interface_nlojet-2.5.1-2888" # set arc="fastnlo_interface_nlojet-2.5.1-2888"
set arc="fastnlo_interface_nlojet-2.5.1-3030" # set arc="fastnlo_interface_nlojet-2.5.1-3030"
set arc="fastnlo_interface_nlojet-2.6.0-3055"
if ( ! -e ${arc}_installed ) then if ( ! -e ${arc}_installed ) then
tar xzf ${arc}.tar.gz tar xzf ${arc}.tar.gz
cd ${arc} cd ${arc}
...@@ -915,12 +921,16 @@ if ( $withnnlojet ) then ...@@ -915,12 +921,16 @@ if ( $withnnlojet ) then
# nnlo-bridge to NNLOJet: # nnlo-bridge to NNLOJet:
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
if ( ! $mpnnlo ) then if ( ! $mpnnlo ) then
# set arc="nnlo-bridge-0.0.40"# updated scale settings for jetpt scale # Updated scale settings for jetpt scale
# # set arc="nnlo-bridge-0.0.40"
# NNLOJET modules1 production version # NNLOJET modules1 production version
# set arc="nnlo-bridge-0.0.46" # set arc="nnlo-bridge-0.0.46"
# NNLOJET modules2 production candidate # NNLOJET modules2 production candidate
# set arc="nnlo-bridge-1.0.0"
# NNLOJET interface update with rev7902
set arc="nnlo-bridge-1.0.1" set arc="nnlo-bridge-1.0.1"
# NNLOJET modules2 APPLfast2 test
# set arc="nnlo-bridge-2.0.3"
if ( ! -e ${arc}_installed ) then if ( ! -e ${arc}_installed ) then
tar xzf ${arc}.tar.gz tar xzf ${arc}.tar.gz
cd ${arc} cd ${arc}
...@@ -956,7 +966,7 @@ if ( $withnnlojet ) then ...@@ -956,7 +966,7 @@ if ( $withnnlojet ) then
# Fixed makefile for gcc11 of revision 5918, or bridge updates for revision 6591 # Fixed makefile for gcc11 of revision 5918, or bridge updates for revision 6591
# Patches required? # Patches required?
# set rev="_multicore" # set rev="_multicore"
set rev="_newcombine" # Has newer nnlojet-combine python code # set rev="_newcombine" # Has newer nnlojet-combine python code
tar xzf ${arc}${rev}.tar.gz tar xzf ${arc}${rev}.tar.gz
cd ${arc}/driver cd ${arc}/driver
# Skip depend for now for modules 2 revisions # Skip depend for now for modules 2 revisions
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment