Merge branch 'sevda-decreports-filter' into 'master'

decreports filter without functors

See merge request !3054

Hlt/Moore/python/Moore/config.py

@@ -10,11 +10,10 @@
 ###############################################################################
 import re, logging, inspect
 from collections import namedtuple
-import Functors as F
 
 from Allen.config import allen_detectors, run_allen_reconstruction  # noqa: F401
 from PyConf import configurable
-from PyConf.Algorithms import (VoidFilter, HltDecReportsMonitor,
+from PyConf.Algorithms import (HltDecReportsFilter, HltDecReportsMonitor,
                                DeterministicPrescaler, HltRoutingBitsFilter,
                                LHCb__Tests__RunEventCountAlg)
 
@@ -192,10 +191,9 @@ def moore_control_flow(options, streams, process, analytics=False):
             dec_reports=dec_reports,
             extra_locations=extra_locations_to_persist)
 
-        streamFilter = VoidFilter(
-            Cut=F.DECREPORTS_FILTER(
-                Lines=list(line.decision_name for line in stream.lines),
-                DecReports=dec_reports.DecReportsLocation))
+        streamFilter = HltDecReportsFilter(
+            Lines=list(line.decision_name for line in stream.lines),
+            DecReports=dec_reports.DecReportsLocation)
 
         stream_node_children = [streamFilter]