From d94cb6a804cd59975cc02f8322dcb36ab6d75f8c Mon Sep 17 00:00:00 2001
From: Klaus Rabbertz <klaus.rabbertz@cern.ch>
Date: Wed, 20 Jul 2022 11:31:52 +0200
Subject: [PATCH] Complement changelog and news for release

---
 v2.5/toolkit/ChangeLog | 99 ++++++++++++++++++++++++++++++++++++++++++
 v2.5/toolkit/NEWS      | 13 ++++++
 v2.5/toolkit/TODO      |  3 ++
 3 files changed, 115 insertions(+)

diff --git a/v2.5/toolkit/ChangeLog b/v2.5/toolkit/ChangeLog
index 2cb0812e..57d906ad 100644
--- a/v2.5/toolkit/ChangeLog
+++ b/v2.5/toolkit/ChangeLog
@@ -1,6 +1,105 @@
 2021-08-21  Public release of the fastNLO_toolkit package version 2.5.0, tag 2826
             =====================================================================
 
+2022-07-14  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * tools/plotting/fastnnlo_pdfunc.py,
+        tools/plotting/fastnnlo_scaleunc.py: Fix for issue when using
+        matplotlib > 3.2.x
+
+2022-07-03  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/toolkit/src/fnlo-tk-cppread.cc: Added option for Ecms
+        reweighting in fnlo-tk-cppread; TODO use getopt for cmdlines
+
+2022-06-14  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * tools/plotting/fastnnlo_multigridclosure.py: Fix python issue with
+        ambiguous boolean
+
+2022-06-13  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/toolkit/src/fnlo-tk-yodaout.cc: Allow rescaling uncertainty
+        for plotting
+
+2022-06-12  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/toolkit/fastnlotoolkit/fastNLOTable.cc,
+        v2.5/toolkit/src/fnlo-tk-modify.cc,
+        v2.5/toolkit/src/fnlo-tk-yodaout.cc: Add feature to multiply bin
+        borders. e.g. for GeV -> TeV, in fnlo-tk-modify
+
+2022-06-09  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/toolkit/fastnlotoolkit/fastNLOTable.cc,
+        v2.5/toolkit/fastnlotoolkit/include/fastnlotk/fastNLOTable.h,
+        v2.5/toolkit/src/fnlo-tk-modify.cc: Test multiplying bin borders
+        through fnlo-tk-modify
+
+2022-06-05  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/toolkit/fastnlotoolkit/fastNLOReader.cc,
+        v2.5/toolkit/fastnlotoolkit/fastNLOTools.cc,
+        v2.5/toolkit/fastnlotoolkit/include/fastnlotk/fastNLOConstants.h.in
+        , v2.5/toolkit/fastnlotoolkit/include/fastnlotk/fastNLOReader.h,
+        v2.5/toolkit/fastnlotoolkit/include/fastnlotk/fastNLOTools.h,
+        v2.5/toolkit/src/fnlo-tk-cppread.cc,
+        v2.5/toolkit/src/fnlo-tk-yodaout.cc: Add possibility of having
+        sclfac*scale as central choice, e.g. m12 -> m2/2
+
+2022-05-20  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * tools/plotting/fastnnlo_statunc.py: Add option for stat.
+        uncertainty
+
+2022-02-25  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * tools/plotting/fastnnlo_runtime.py,
+        tools/plotting/fastnnlo_statunc.py: Fix two scripts for law usage up
+        to NLO only
+
+2022-02-08  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * tools/fnlo-add-tables.pl: Use merge2 in fnlo-add-tables
+
+2022-02-07  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * tools/fnlo-add-tables.pl, v2.5/toolkit/src/fnlo-tk-example.cc,
+        v2.5/toolkit/src/fnlo-tk-rootout.cc,
+        v2.5/toolkit/src/fnlo-tk-statunc.cc,
+        v2.5/toolkit/src/fnlo-tk-yodaout.cc: A few fixes for stat.
+        uncertainties with NLOjet++
+
+2022-01-05  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * tools/plotting/fastnnlo_absolute.py,
+        tools/plotting/fastnnlo_kfaccomp.py,
+        tools/plotting/fastnnlo_multigridclosure.py,
+        tools/plotting/fastnnlo_scaleclosure.py,
+        tools/plotting/fastnnlo_scaleunc.py,
+        v2.5/toolkit/src/fnlo-tk-modify.cc,
+        v2.5/toolkit/src/fnlo-tk-yodaout.cc: Changes required for yoda plot
+        x-y-rescaling for DataComparison task in law
+
+2021-09-07  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * tools/README.installation: Add forgotten readme file
+
+2021-08-24  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * tools/fnlosrc_install.csh: Update version no. to install
+
+2021-08-21  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/toolkit/ChangeLog, v2.5/toolkit/NEWS: Update changelog and
+        news for new release of v2.5 code
+
+2021-07-04  Daniel Britzger <daniel.britzger@cern.ch>
+
+        * : commit fbd39ce9170a858beb383b6795d8b0ec07800576 Author: Daniel
+        Britzger <daniel.britzger@cern.ch> Date:   Sun Jul 4 23:21:14 2021
+        +0200
+
 2021-06-28  Klaus Rabbertz <klaus.rabbertz@cern.ch>
 
         * v2.5/toolkit/fastnlotoolkit/fastNLOTools.cc: Commented trial with
diff --git a/v2.5/toolkit/NEWS b/v2.5/toolkit/NEWS
index 0eca98d6..b3dca8c2 100644
--- a/v2.5/toolkit/NEWS
+++ b/v2.5/toolkit/NEWS
@@ -1,3 +1,16 @@
+Notes for public release of the fastNLO_toolkit package version 2.5.0, tag 2851
+===============================================================================
+This release includes only some minor improvements:
+- Added option for existing Ecms reweighting in fnlo-tk-cppread
+- Added options for rescaling x-axis values or uncertainties for plotting in fnlo-tk-yodaout
+- Added to fnlo-tk-modify the possibilities to
+  - multiply all coefficients by factor
+  - rescale bin borders e.g. for GeV -> TeV units
+- Added option to recenter scale variations around factor*central scale to
+  fnlo-tk-cppread and fnlo-tk-yodaout, e.g. 2*ptjet instead of ptjet
+- Some adaptations for stat. uncertainties with NLOJet++
+
+
 Notes for public release of the fastNLO_toolkit package version 2.5.0, tag 2826
 ===============================================================================
 The major developments included in this release are:
diff --git a/v2.5/toolkit/TODO b/v2.5/toolkit/TODO
index cd423536..faea2dec 100644
--- a/v2.5/toolkit/TODO
+++ b/v2.5/toolkit/TODO
@@ -2,6 +2,9 @@
 TODO list for fastNLO_toolkit (ordered by priority)
 -----------------------------------------------------------------------
 
+- Allow re-merge for normalised-reweighted NNLOJET grids
+- Implement possibility to use two different PDF sets instead of 2x proton PDF
+- Use getopt for commandlines of C++ executables
 - Creator for Referenztabellen
 - Add checks for HOPPET, CRunDec, QCDNUM
 - Change everything to use LHAPDF6 features instead of deprecated LHAGLUE;
-- 
GitLab