diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index ae54a36294..4f989b6247 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 diff --git a/validphys2/src/validphys/comparefittemplates/comparecard.yaml b/validphys2/src/validphys/comparefittemplates/comparecard.yaml index 2418f1847d..09a9187b5b 100644 --- a/validphys2/src/validphys/comparefittemplates/comparecard.yaml +++ b/validphys2/src/validphys/comparefittemplates/comparecard.yaml @@ -135,5 +135,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 1457e3c6e2..4a2cdd67c3 100644 --- a/validphys2/src/validphys/comparefittemplates/report.md +++ b/validphys2/src/validphys/comparefittemplates/report.md @@ -73,20 +73,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 -------------