From 30f8fba0c140e680a366cb43323f573c99042b0f Mon Sep 17 00:00:00 2001
From: Klaus Rabbertz <klaus.rabbertz@cern.ch>
Date: Sun, 5 May 2024 23:55:48 +0200
Subject: [PATCH] Update installation script and readme

---
 tools/README.installation | 89 ++++++++++++++++++++++++++++-----------
 tools/fnlosrc_install.csh |  2 +-
 2 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/tools/README.installation b/tools/README.installation
index b622fd8d..1ec0eb2b 100644
--- a/tools/README.installation
+++ b/tools/README.installation
@@ -1,18 +1,18 @@
-28.05.2021, K. Rabbertz
+05.05.2024, K. Rabbertz
 
 The script fnlosrc_install.csh allows the user to install all packages
-required to produce NLO interpolation grids with NLOJet++ and
+required to produce interpolation grids with NLOJet++ or NNLOJET and
 the fastNLO toolkit for the grids.
 
 Just typing
 ./fnlosrc_install.csh
 provides a concise description of the command line arguments as follows:
-(NOTE: Some optional arguments, e.g. nos. 6, 7, 12, are still EXPERIMENTAL and not
-for public use.)
+(NOTE: The optional arguments nos. 7 and 12 are EXPERIMENTAL respectively
+not required any more.)
 
 #==============================================================================
 Usage: ./fnlosrc_install.csh basedir [optional_argument_2] [optional_argument_3] ...
-  1st argument: Base dir for installations, absolute path to e.g. /home/rabbertz/local
+  1st argument: Base dir for installations, absolute path to e.g. /home/username/local
   2nd optional argument: Base path to additional software to be taken from cvmfs,
                          e.g. /cvmfs/cms.cern.ch/slc6_amd64_gcc700
                          or   /cvmfs/sft.cern.ch/lcg/contrib/gcc/4.8
@@ -43,22 +43,22 @@ Usage: ./fnlosrc_install.csh basedir [optional_argument_2] [optional_argument_3]
 
 
 
-The following two installation flavours are recommended:
-========================================================
+The following installation flavours are recommended:
+====================================================
 
-1. Minimal installation to produce and evaluate interpolation grids
--------------------------------------------------------------------
+1. Minimal installation to produce and evaluate interpolation grids with NLOjet++
+---------------------------------------------------------------------------------
 
-This requires five archives to be installed and to be present
+This requires the following archives to be installed and to be present
 in the same directory as the install script fnlosrc_install.csh:
 
-fastjet-3.3.4.tar.gz
-LHAPDF-6.3.0.tar.gz
-fastnlo_toolkit-2.5.0-2823.tar.gz
+fastjet-3.4.0.tar.gz
+LHAPDF-6.5.4.tar.gz
+fastnlo_toolkit-2.5.1-3022.tar.gz
 nlojet++-4.1.3-patched2.tar.gz
-fastnlo_interface_nlojet-2.5.0-2819.tar.gz
+fastnlo_interface_nlojet-2.5.0-2888.tar.gz
 
-They are available in the package fastNLO_archives_minimal_202105.tar.gz.
+They are available in the package fastNLO_archives_minimal_202405.tar.gz.
 
 The command line to be used is:
 ./fnlosrc_install.csh /prefix-path/where/to/install _ _ 0 1 0 0 0 1 0 8 0
@@ -67,23 +67,57 @@ The command line to be used is:
 2. Normal installation including more evaluation features
 ---------------------------------------------------------
 
-In addition to the packages above this requires the packages:
+In addition to the packages listed above this requires the packages:
 
 HepMC3-3.2.2.tar.gz
 fjcontrib-1.045.tar.gz
-YODA-1.8.3.tar.gz
-Rivet-3.1.4.tar.gz
-hoppet-1.2.0.tar.gz
-qcdnum-17-01-14.tar.gz
+YODA-1.9.7.tar.gz
+Rivet-3.1.7.tar.gz
+# hoppet-1.2.0.tar.gz, excluded for now
+# qcdnum-17-01-14.tar.gz, excluded for now
 
-They are available in the package fastNLO_archives_fnlo_202105.tar.gz.
+They are available in the package fastNLO_archives_additional_202405.tar.gz.
 
 The command line to be used is:
 ./fnlosrc_install.csh /prefix-path/where/to/install _ _ 0 1 0 0 1 1 0 8 0
 
 
+3. Minimal installation to produce and evaluate interpolation grids with NNLOJET
+--------------------------------------------------------------------------------
+RESTRICTED UNTIL NNLOJET becomes publically available. Please contact me.
+
+This requires the following archives to be installed and to be present
+in the same directory as the install script fnlosrc_install.csh:
+
+fastjet-3.4.0.tar.gz
+LHAPDF-6.5.4.tar.gz
+fastnlo_toolkit-2.5.1-3022.tar.gz
+nnlo-bridge-1.0.0.tar.gz
+NNLOJET_modules2_rev6591_newcombine.tar.gz
+
+The command line to be used is:
+./fnlosrc_install.csh /prefix-path/where/to/install _ _ 0 0 1 0 0 1 0 8 0
+
+
+4. Installation with NLOJet++, NNLOJET, and optional packages
+-------------------------------------------------------------
+RESTRICTED UNTIL NNLOJET becomes publically available. Please contact me.
+
+In addition to the packages listed above this requires the packages:
+
+fastnlo_interface_nlojet-2.5.1-2888.tar.gz
+nlojet++-4.1.3-patched2.tar.gz
+HepMC3-3.2.2.tar.gz
+Rivet-3.1.7.tar.gz
+YODA-1.9.7.tar.gz
+fjcontrib-1.045.tar.gz
+
+The command line to be used is:
+./fnlosrc_install.csh /prefix-path/where/to/install _ _ 0 1 1 0 1 1 0 8 0
+
+
 Usage of an installation
-------------------------
+========================
 
 To subsequently USE the installation, first one of the two produced files
 fnlosrc_source.sh    (bash flavour)
@@ -92,7 +126,12 @@ must be 'source'd to set the proper environment variables.
 
 
 Remarks
--------
+=======
+
+It is also possible to use "views" of the LCG software stack, e.g.
+lcg102_centos7-gcc11-opt_source has been tested successfully. In that
+case these views, of course, have to be "source"d beforehand.
 
-Some of the packages can also work with ROOT. Because of the large variety of ROOT versions
-and installation problems this is not described here.
+Some of the packages might also work with ROOT. Because of the large variety of
+ROOT versions and installation problems this is not described here.
+However, the given LCG view seems to be a good choice.
diff --git a/tools/fnlosrc_install.csh b/tools/fnlosrc_install.csh
index f16c7402..f7ad298c 100755
--- a/tools/fnlosrc_install.csh
+++ b/tools/fnlosrc_install.csh
@@ -813,7 +813,7 @@ if ( ! $mpnnlo ) then
 #   set arc="fastnlo_toolkit-2.5.0-2848"
 #   set arc="fastnlo_toolkit-2.5.0-2856"
 #   set arc="fastnlo_toolkit-2.5.1-2890"
-   set arc="fastnlo_toolkit-2.5.1-3011"
+   set arc="fastnlo_toolkit-2.5.1-3022"
    set rev=""
    if ( ! -e ${arc}_installed  ) then
       tar xzf ${arc}${rev}.tar.gz
-- 
GitLab