From 38dd18beb23cfa19716c6ae8c7c174c2933b2a1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <amuoz@ed.ac.uk>
Date: Thu, 11 Nov 2021 15:04:15 +0000
Subject: [PATCH] add proceses to defaults

Former-commit-id: 8a0abf87529dce62f1931659224165dabcde9632
---
 core/processor.py | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/core/processor.py b/core/processor.py
index 70d473bd..00ff333c 100644
--- a/core/processor.py
+++ b/core/processor.py
@@ -62,6 +62,16 @@ class PostProcessorParameters(ParametersABC):
                     "dsignal",
                     [
                         "/extraction/general/None/volume",
+                        "/postprocessing/bud_metric/extraction_general_None_volume",
+                    ],
+                ],
+                [
+                    "aggregate",
+                    [
+                        "/extraction/general/None/volume",
+                        "postprocessing/bud_metric/extraction_general_None_volume",
+                        "postprocessing/dsignal/extraction_general_None_volume",
+                        "postprocessing/dsignal/postprocessing_bud_metric_extraction_general_None_volume",
                     ],
                 ],
             ],
@@ -78,7 +88,6 @@ class PostProcessorParameters(ParametersABC):
             targets["processes"]["bud_metric"].append(
                 [
                     [
-                        "/extraction/general/None/volume",
                         "/extraction/em_ratio/np_max/mean",
                         "/extraction/em_ratio/np_max/median",
                     ],
@@ -90,35 +99,23 @@ class PostProcessorParameters(ParametersABC):
                     "/extraction/em_ratio/np_max/median",
                     "/extraction/em_ratio_bgsub/np_max/mean",
                     "/extraction/em_ratio_bgsub/np_max/median",
-                    "/postprocessing/bud_metric/extraction_general_None_volume",
                     "/postprocessing/bud_metric/extraction_em_ratio_np_max_mean",
                     "/postprocessing/bud_metric/extraction_em_ratio_np_max_median",
                 ]
             )
-            targets["processes"].append(
+            targets["processes"]["aggregate"].append(
                 [
-                    [
-                        "aggregate",
-                        [
-                            [
-                                "/extraction/general/None/volume",
-                                "/extraction/em_ratio/np_max/mean",
-                                "/extraction/em_ratio/np_max/median",
-                                "/extraction/em_ratio_bgsub/np_max/mean",
-                                "/extraction/em_ratio_bgsub/np_max/median",
-                                "/extraction/gsum/np_max/median",
-                                "/extraction/gsum/np_max/mean",
-                                "postprocessing/bud_metric/extraction_general_None_volume",
-                                "postprocessing/bud_metric/extraction_em_ratio_np_max_mean",
-                                "postprocessing/bud_metric/extraction_em_ratio_np_max_median",
-                                "postprocessing/dsignal/extraction_general_None_volume",
-                                "postprocessing/dsignal/postprocessing_bud_metric_extraction_general_None_volume",
-                                "postprocessing/dsignal/postprocessing_bud_metric_extraction_em_ratio_np_max_median",
-                                "postprocessing/dsignal/postprocessing_bud_metric_extraction_em_ratio_np_max_mean",
-                            ]
-                        ],
-                    ]
-                ]
+                    "/extraction/em_ratio/np_max/mean",
+                    "/extraction/em_ratio/np_max/median",
+                    "/extraction/em_ratio_bgsub/np_max/mean",
+                    "/extraction/em_ratio_bgsub/np_max/median",
+                    "/extraction/gsum/np_max/median",
+                    "/extraction/gsum/np_max/mean",
+                    "postprocessing/bud_metric/extraction_em_ratio_np_max_mean",
+                    "postprocessing/bud_metric/extraction_em_ratio_np_max_median",
+                    "postprocessing/dsignal/postprocessing_bud_metric_extraction_em_ratio_np_max_median",
+                    "postprocessing/dsignal/postprocessing_bud_metric_extraction_em_ratio_np_max_mean",
+                ],
             )
             outpaths["aggregate"].append(
                 ["/postprocessing/experiment_wide/aggregated/"]
-- 
GitLab