From b030b2794d7258eb6a23f0d0a1aeaabf886eb173 Mon Sep 17 00:00:00 2001
From: Klaus Rabbertz <klaus.rabbertz@cern.ch>
Date: Thu, 21 Sep 2023 20:05:47 +0200
Subject: [PATCH] Prepare release with Johannes fixed merger

---
 v2.5/toolkit/ChangeLog | 24 ++++++++++++++++++++++++
 v2.5/toolkit/NEWS      |  5 +++++
 v2.5/toolkit/TODO      | 32 ++++++++++++++++----------------
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/v2.5/toolkit/ChangeLog b/v2.5/toolkit/ChangeLog
index 120573c1..0e4cb71b 100644
--- a/v2.5/toolkit/ChangeLog
+++ b/v2.5/toolkit/ChangeLog
@@ -1,3 +1,27 @@
+2023-09-21  Public release of the fastNLO_toolkit package version 2.5.1, tag 2896
+            =====================================================================
+
+2023-08-10  JohannesGaessler <johannesg@5d6.de>
+
+        * v2.5/toolkit/fastnlotoolkit/fastNLOCoeffAddFix.cc,
+        v2.5/toolkit/fastnlotoolkit/fastNLOCoeffAddFlex.cc,
+        v2.5/toolkit/fastnlotoolkit/include/fastnlotk/fastNLOCoeffAddFlex.h:
+        Fixed NNLOJET table merging
+
+2023-07-12  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/toolkit/NEWS: Eliminate debug printout
+
+2023-07-12  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/toolkit/fastnlotoolkit/fastNLOCreate.cc: Eliminate debug
+        printout
+
+2023-07-12  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/toolkit/AUTHORS, v2.5/toolkit/ChangeLog, v2.5/toolkit/NEWS,
+        v2.5/toolkit/configure.ac: Toolkit version 2.5.1; update NEWS and CL
+
 2023-07-12  Public release of the fastNLO_toolkit package version 2.5.1, tag 2888
             =====================================================================
 
diff --git a/v2.5/toolkit/NEWS b/v2.5/toolkit/NEWS
index 1a52bfdf..4ee79404 100644
--- a/v2.5/toolkit/NEWS
+++ b/v2.5/toolkit/NEWS
@@ -1,3 +1,8 @@
+Notes for public release of the fastNLO_toolkit package version 2.5.1, tag 2890
+===============================================================================
+Fix to table merger from Johannes for NodeDensity x binning
+
+
 Notes for public release of the fastNLO_toolkit package version 2.5.1, tag 2890
 ===============================================================================
 Remove leftover debug printout
diff --git a/v2.5/toolkit/TODO b/v2.5/toolkit/TODO
index 98fe785d..cca4b08c 100644
--- a/v2.5/toolkit/TODO
+++ b/v2.5/toolkit/TODO
@@ -12,28 +12,28 @@ TODO list for fastNLO_toolkit (ordered by priority)
 - Use binary read/write table to save storage space and read in times (Mark's suggestion)
   (Not clear that binary storage actually saves anything ...! Test first.)
 - Provide features to allow -> APPLgrid conversion and the inverse -> fastNLO
-- Test installation with lgcenv environment
-   - Problem with zlib?
-   - Problem with HOPPET?
- - Streamline usage of logger.messagelevel, shout|cout, error|warn|silent etc. in speaker
- - Getter for PhaseSpace-check: a la: GetIsWithinPhaseSpace(double obs1, double obs2, etc.) (cache probably observables for later usage)
- - Write documentation (e.g. twiki)
- - converter aktualisieren ??
- - Benutzbarkeit gewaehrleisten, wenn binning- und bin-suche im generator gemacht werden (ist teils implementiert bspw 'fnloEvent::_iOB')
- - fastNLOCreate fuer mehrere Tabellen - also (bspw.) mehrere fastNLOCreate instanzen (dazu muessen alle 'read-steer'-statements geaendert werden)
-   oder mehrere Coeffizienten Tabellen
- - 'automatisches' Erkennen von PDF-LiCos beim warm-up run
- - implement DIS fixed-scale (desired?)
- - 'Generator-stamps': konsistente beschreibung und zitate fuer CodeDescr[]. Bspw: fastNLO::CodeDescr::NLOJET_hhc(vector<string>& contrdescr)
- - fnloEvent: implementiere 'operator+' und/oder eine 'add-funktion' (ordentliche Klassendefinitionen??)
- - Change int functions() to void functions of read and write routines
- - punktweise-differentielle gemischt mit bin-integrierten doppelt-differentiellen tabllen
+- Streamline usage of logger.messagelevel, shout|cout, error|warn|silent etc. in speaker
+- Getter for PhaseSpace-check: a la: GetIsWithinPhaseSpace(double obs1, double obs2, etc.) (cache probably observables for later usage)
+- Write documentation (e.g. twiki)
+- converter aktualisieren ??
+- Benutzbarkeit gewaehrleisten, wenn binning- und bin-suche im generator gemacht werden (ist teils implementiert bspw 'fnloEvent::_iOB')
+- fastNLOCreate fuer mehrere Tabellen - also (bspw.) mehrere fastNLOCreate instanzen (dazu muessen alle 'read-steer'-statements geaendert werden)
+  oder mehrere Coeffizienten Tabellen
+- 'automatisches' Erkennen von PDF-LiCos beim warm-up run
+- implement DIS fixed-scale (desired?)
+- 'Generator-stamps': konsistente beschreibung und zitate fuer CodeDescr[]. Bspw: fastNLO::CodeDescr::NLOJET_hhc(vector<string>& contrdescr)
+- fnloEvent: implementiere 'operator+' und/oder eine 'add-funktion' (ordentliche Klassendefinitionen??)
+- Change int functions() to void functions of read and write routines
+- punktweise-differentielle gemischt mit bin-integrierten doppelt-differentiellen tabllen
 
 
 
 =======================================================================
 DONE
 =======================================================================
+ - Test installation with lgcenv environment:
+   - works but depends a lot on lcgenv quality
+   - ok is for example lcg102_centos7-gcc11-opt
  - Drop LHAPDF5 support
  - Include stat. uncertainties into table
  - Modifier & Concatenator for tables/bins
-- 
GitLab