analyze-log: allow ignoring parameters after filtering on them

1 files changed, 6 insertions, 6 deletions

diff --git a/bin/analyze-log.py b/bin/analyze-log.py
index 160ffc3..1978df0 100755
--- a/bin/analyze-log.py
+++ b/bin/analyze-log.py
@@ -65,18 +65,17 @@ def main():
             style="{",
         )
 
-    if args.filter_observation:
-        args.filter_observation = list(
-            map(lambda x: tuple(x.split(":")), args.filter_observation.split(","))
-        )
-
     observations = reduce(lambda a, b: a + b, map(parse_logfile, args.logfiles))
     by_name, parameter_names = dfatool.utils.observations_to_by_name(observations)
     del observations
 
     if args.ignore_param:
         args.ignore_param = args.ignore_param.split(",")
-        dfatool.utils.ignore_param(by_name, parameter_names, args.ignore_param)
+
+    if args.filter_observation:
+        args.filter_observation = list(
+            map(lambda x: tuple(x.split(":")), args.filter_observation.split(","))
+        )
 
     if args.filter_param:
         args.filter_param = list(
@@ -92,6 +91,7 @@ def main():
 
     dfatool.utils.filter_aggregate_by_param(by_name, parameter_names, args.filter_param)
     dfatool.utils.filter_aggregate_by_observation(by_name, args.filter_observation)
+    dfatool.utils.ignore_param(by_name, parameter_names, args.ignore_param)
 
     if args.param_shift:
         param_shift = dfatool.cli.parse_param_shift(args.param_shift)