From 4c7b5b249d2b1fb0472e9175800ba17fb7fbdb59 Mon Sep 17 00:00:00 2001
From: Zahari <zaharid@gmail.com>
Date: Tue, 20 Apr 2021 14:07:36 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Add=20per=20process=20chi=C2=B2=20estimator?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make the big table group by process  and add plots grouping
chi² and phi by process, in addition to the existing ones by experiment.
---
 .../src/validphys/comparefittemplates/comparecard.yaml    | 7 +++++++
 validphys2/src/validphys/comparefittemplates/report.md    | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/validphys2/src/validphys/comparefittemplates/comparecard.yaml b/validphys2/src/validphys/comparefittemplates/comparecard.yaml
index 3747240fd5..35a3c7f07f 100644
--- a/validphys2/src/validphys/comparefittemplates/comparecard.yaml
+++ b/validphys2/src/validphys/comparefittemplates/comparecard.yaml
@@ -140,5 +140,12 @@ Normalize:
 Datanorm:
   normalize_to: data
 
+DataGroups:
+  - metadata_group: nnpdf31_process
+  - metadata_group: experiment
+
+ProcessGroup:
+    metadata_group: nnpdf31_process
+
 actions_:
   - report(main=true)
diff --git a/validphys2/src/validphys/comparefittemplates/report.md b/validphys2/src/validphys/comparefittemplates/report.md
index 4cab5ec8ac..3c659b5de0 100644
--- a/validphys2/src/validphys/comparefittemplates/report.md
+++ b/validphys2/src/validphys/comparefittemplates/report.md
@@ -65,20 +65,26 @@ Training-validation
 -------------------
 {@fits plot_training_validation@}
 
+{@with DataGroups@}
 $\chi^2$ by {@processed_metadata_group@}
 ----------------------------------------
 {@plot_fits_groups_data_chi2@}
+{@endwith@}
+
 
 $\chi^2$ by dataset
 -------------------
 ### Plot
 {@plot_fits_datasets_chi2@}
 ### Table
-{@fits_chi2_table(show_total=true)@}
+{@ProcessGroup fits_chi2_table(show_total=true)@}
 
+
+{@with DataGroups@}
 $\phi$ by {@processed_metadata_group@}
 --------------------------------------
 {@plot_fits_groups_data_phi@}
+{@endwith@}
 
 Dataset plots
 -------------

From 3e5febae3f1476c91ad76c595f1e829260d3adf0 Mon Sep 17 00:00:00 2001
From: Zahari <zaharid@gmail.com>
Date: Thu, 13 May 2021 10:23:53 +0100
Subject: [PATCH 2/2] Bump minimal reportengine version

---
 conda-recipe/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
index 4e15090ced..ffea67ebfe 100644
--- a/conda-recipe/meta.yaml
+++ b/conda-recipe/meta.yaml
@@ -38,7 +38,7 @@ requirements:
         - apfel
         - pkg-config
         - python # requirements for validphys
-        - reportengine >=0.28.60 # see https://github.com/NNPDF/reportengine
+        - reportengine >=0.30.13 # see https://github.com/NNPDF/reportengine
         - matplotlib >=3.3.0
         - blessings >=1.7
         - scipy >=0.19.1