From b304e5b9406896199695700d4a60d5d3c95c42bc Mon Sep 17 00:00:00 2001
From: Shunan Zhang <shunan.zhang@cern.ch>
Date: Wed, 28 Jul 2021 13:39:48 +0800
Subject: [PATCH 1/2] add a selection id for Sprucing

---
 Hlt/Moore/python/Moore/config.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Hlt/Moore/python/Moore/config.py b/Hlt/Moore/python/Moore/config.py
index 810112ef28..1eb13c904b 100644
--- a/Hlt/Moore/python/Moore/config.py
+++ b/Hlt/Moore/python/Moore/config.py
@@ -122,7 +122,7 @@ def _build_decision_ids(decision_names):
     return {name: idx for idx, name in enumerate(decision_names, 1)}
 
 
-def setup_ann_service(hlt1_decision_ids, hlt2_decision_ids):
+def setup_ann_service(hlt1_decision_ids, hlt2_decision_ids, spruce_decision_ids):
     """Configure the ANN service.
 
     The ANN service is responsible for mapping strings to numbers and
@@ -140,6 +140,7 @@ def setup_ann_service(hlt1_decision_ids, hlt2_decision_ids):
         "HltANNSvc",
         Hlt1SelectionID=hlt1_decision_ids,
         Hlt2SelectionID=hlt2_decision_ids,
+        SpruceSelectionID=spruce_decision_ids,
     )
 
     if hlt_ann_svc.getFullName() not in ApplicationMgr().ExtSvc:
@@ -233,12 +234,11 @@ def report_writers_node(streams,
 
         erw = ExecutionReportsWriter(
             Persist=[line.name for line in lines],
-            ANNSvcKey="Hlt2SelectionID",
+            ANNSvcKey="SpruceSelectionID",
             outputs={
                 'DecReportsLocation':
                 force_location("/Event/Spruce/DecReports")
-            },
-            PrintFreq=10,
+            }
         )
 
         line_output_cf, line_output_locations, packed_data = persist_line_outputs(
@@ -400,10 +400,10 @@ def moore_control_flow(options, streams, process, allen_hlt1):
         streams[stream] = sorted(lines, key=lambda line: line.name)
 
     lines = streams_dict_to_lines_list(streams)
-    ann_config = dict(hlt1_decision_ids={}, hlt2_decision_ids={})
+    ann_config = dict(hlt1_decision_ids={}, hlt2_decision_ids={}, spruce_decision_ids={})
     if allen_hlt1:
         ann_config["hlt1_decision_ids"] = get_allen_hlt1_decision_ids()
-    key = ("hlt1" if process == "hlt1" else "hlt2") + "_decision_ids"
+    key = process + "_decision_ids"
     ann_config[key] = _build_decision_ids([l.decision_name for l in lines])
     setup_ann_service(**ann_config)
 
@@ -585,7 +585,7 @@ def allen_control_flow(options):
     new_hlt_banks['HltDecReports'] = drw.OutputRawEventLocation
 
     decision_ids = get_allen_hlt1_decision_ids()
-    setup_ann_service(hlt1_decision_ids=decision_ids, hlt2_decision_ids={})
+    setup_ann_service(hlt1_decision_ids=decision_ids, hlt2_decision_ids={}, spruce_decision_ids={})
 
     report_writers_node = CompositeNode(
         'report_writers',
-- 
GitLab


From 04a6d28dbb48ba35f192cc69d4158b00c3d07aaa Mon Sep 17 00:00:00 2001
From: Shunan Zhang <shunan.zhang@cern.ch>
Date: Wed, 28 Jul 2021 13:40:32 +0800
Subject: [PATCH 2/2] fix make_allen_tck test to match setup_ann_svc

---
 Hlt/Hlt1Conf/tests/options/make_allen_tck.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Hlt/Hlt1Conf/tests/options/make_allen_tck.py b/Hlt/Hlt1Conf/tests/options/make_allen_tck.py
index 4b99fbc75b..6d7cdbe84d 100644
--- a/Hlt/Hlt1Conf/tests/options/make_allen_tck.py
+++ b/Hlt/Hlt1Conf/tests/options/make_allen_tck.py
@@ -44,7 +44,7 @@ prescaler = DeterministicPrescaler(
 seq.Members = [prescaler]
 
 hlt1_decision_ids = get_allen_hlt1_decision_ids()
-setup_ann_service(hlt1_decision_ids, {})
+setup_ann_service(hlt1_decision_ids, {}, {})
 
 # Algorithm to generate the TCK
 gen_tck = HltGenConfig(
-- 
GitLab