From 6486e6bc57175f1f292f8102661f0d5b8e4f2cc1 Mon Sep 17 00:00:00 2001
From: Klaus Rabbertz <klaus.rabbertz@cern.ch>
Date: Thu, 10 Oct 2024 11:50:44 +0200
Subject: [PATCH] Update install script
---
tools/fnlosrc_install.csh | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/tools/fnlosrc_install.csh b/tools/fnlosrc_install.csh
index d9ba66dd..6db81b7e 100755
--- a/tools/fnlosrc_install.csh
+++ b/tools/fnlosrc_install.csh
@@ -241,7 +241,8 @@ if ( $#argv > 5 && $6 != "_" ) then
# NNLOJET modules1 production version
# set revision=rev5918
# NNLOJET modules2 production version
- set revision=modules2_rev6591
+# set revision=modules2_rev6591
+ set revision=rev7902
endif
echo "NNLOJET usage: $tab$tab $withnnlojet"
# With interface to Sherpa via MCGrid?
@@ -776,8 +777,10 @@ if ( $withoptional ) then
# fastNLO comes already with alpha_s evolutions from GRV or CRunDec, or
# uses the one from the PDFs in LHAPDF
#
+# set arc="hoppet-1.1.5"
# set arc="hoppet-1.2.0"
# 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
# cd ${arc}
# ./configure --prefix=${base}
@@ -827,7 +830,8 @@ if ( ! $mpnnlo ) then
# set arc="fastnlo_toolkit-2.5.0-2856"
# set arc="fastnlo_toolkit-2.5.1-2890"
# 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=""
if ( ! -e ${arc}_installed ) then
tar xzf ${arc}${rev}.tar.gz
@@ -841,6 +845,7 @@ if ( ! $mpnnlo ) then
# 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} --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
# ./configure --prefix=${base} --enable-fortranext --with-yoda --with-hoppet --with-qcdnum ${rootoptpath} ${pyextopt} --disable-doxygen-doc
else
@@ -877,7 +882,8 @@ if ( ! $mpnnlo ) then
# 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.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
tar xzf ${arc}.tar.gz
cd ${arc}
@@ -915,12 +921,16 @@ if ( $withnnlojet ) then
# nnlo-bridge to NNLOJet:
#------------------------------------------------------------------------------
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
# set arc="nnlo-bridge-0.0.46"
# NNLOJET modules2 production candidate
+# set arc="nnlo-bridge-1.0.0"
+# NNLOJET interface update with rev7902
set arc="nnlo-bridge-1.0.1"
+# NNLOJET modules2 APPLfast2 test
+# set arc="nnlo-bridge-2.0.3"
if ( ! -e ${arc}_installed ) then
tar xzf ${arc}.tar.gz
cd ${arc}
@@ -956,7 +966,7 @@ if ( $withnnlojet ) then
# Fixed makefile for gcc11 of revision 5918, or bridge updates for revision 6591
# Patches required?
# 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
cd ${arc}/driver
# Skip depend for now for modules 2 revisions
--
GitLab