Skip to content
Snippets Groups Projects

clean up the Moore config, define Stream objects

Merged Sevda Esen requested to merge sevda-clean-up-config-try-again into master
Compare and Show latest version
4 files
+ 24
23
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -30,7 +30,7 @@ from .streams import make_default_streams, Stream
from .stream_writers import stream_writer
from .reports_writers import report_writers_nodes
# These are not really needed here, but most lines import them from config instead lines module
# These are not really needed here, but most lines import them from config instead of lines module
from .lines import HltLine, Hlt2Line, SpruceLine
#: Regular expression (compiled) defining the valid selection line names
@@ -179,7 +179,7 @@ def moore_control_flow(options, streams, process, analytics=False):
stream_writers = []
for stream in streams.streams:
pre_algs, post_algs = stream_writer(
post_algs = stream_writer(
options=options,
stream=stream,
process=process,
@@ -405,13 +405,12 @@ def allen_control_flow(options, write_all_input_leaves=True):
children=algs,
force_order=True)
writer_setup = []
writers = [report_writers_node]
if options.output_file:
# Give stream a name: 'default'
stream = Stream(name="default", lines=[])
pre_algs, post_algs = stream_writer(
post_algs = stream_writer(
options=options,
stream=stream,
process="hlt1",
@@ -422,7 +421,7 @@ def allen_control_flow(options, write_all_input_leaves=True):
dst_data=[],
dec_reports=None,
write_all_input_leaves=write_all_input_leaves)
writer_setup += pre_algs
writers += post_algs
allen_algs = [non_event_data_node, allen_cf]
@@ -441,7 +440,7 @@ def allen_control_flow(options, write_all_input_leaves=True):
allen = CompositeNode(
'MooreAllen',
combine_logic=NodeLogic.LAZY_AND,
children=writer_setup + [allen_node, make_allen_decision()] + writers,
children=[allen_node, make_allen_decision()] + writers,
force_order=True)
return allen
@@ -595,3 +594,12 @@ def has_global_event_cut(node: CompositeNode) -> bool:
return any(
isinstance(n, Algorithm) and n.typename == "PrGECFilter"
for n in traverse_node_and_children(node))
def dummy_function_for_line_imports():
a_line = HltLine(name="UnusedHltLine")
b_line = Hlt2Line(name="UnusedHltLine")
c_line = SpruceLine(name="UnusedHltLine")
return (a_line, b_line, c_line)
Loading