From 6d2813dc6e021d38206f368634de5ec18c25443d Mon Sep 17 00:00:00 2001
From: Patrick Koppenburg <patrick.koppenburg@cern.ch>
Date: Fri, 18 Dec 2020 12:09:48 +0100
Subject: [PATCH] Fix tests for PrintDecayTree modernisation
---
DaVinciTests/tests/options/DVTestWriteDst.py | 2 +-
.../DVTestTagging-Summer2017Opt-Upgrade.py | 2 +-
.../tests/qmtest/io.qms/test_write_dst.qmt | 25 +++++++------------
3 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/DaVinciTests/tests/options/DVTestWriteDst.py b/DaVinciTests/tests/options/DVTestWriteDst.py
index c7560e255..6fe1e2343 100755
--- a/DaVinciTests/tests/options/DVTestWriteDst.py
+++ b/DaVinciTests/tests/options/DVTestWriteDst.py
@@ -62,7 +62,7 @@ for i in MassRanges :
RequiredSelections = [ MyLooseJpsi ])
printer = PrintDecayTree("Print_"+name,
- Inputs = [SelJpsi.outputLocation()])
+ Input = SelJpsi.outputLocation())
SeqJpsi = SelectionSequence('SeqJpsi_'+name
, TopSelection = SelJpsi
diff --git a/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py b/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py
index 0d922ae5f..48e4aa45b 100644
--- a/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py
+++ b/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py
@@ -88,7 +88,7 @@ DaVinci().CondDBtag = "sim-20171127-vc-md100"
DaVinci().DDDBtag = "dddb-20171126"
from Configurables import StoreExplorerAlg, PrintDecayTree
-PrintDecayTree().Inputs = [ location ]
+PrintDecayTree(Input = location )
DaVinci().MoniSequence = [
cheatsel,
tag,
diff --git a/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt b/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt
index 0f475c2cc..62541f17f 100755
--- a/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt
+++ b/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt
@@ -18,25 +18,18 @@
</set></argument>
<argument name="validator"><text>
findReferenceBlock("""
-Print_3000_3087 INFO Number of counters : 3
+Print_3000_3087 INFO Number of counters : 2
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Phys/SelJpsi_3000_3087" | 28 | 30 | 1.0714 | 0.25754 | 1.0000 | 2.0000 |
- | "# input particles" | 28 | 30 | 1.0714 | 0.25754 | 1.0000 | 2.0000 |
- |*"#accept" | 28 | 28 |( 100.0000 +- 0.000000)% |
-""", stdout, result, causes, signature_offset = 0, id = "Stream1")
-findReferenceBlock("""
-Print_3088_3100 INFO Number of counters : 3
+ | "Candidates" | 28 |
+ | "Events" | 28 |
+Print_3088_3100 INFO Number of counters : 2
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Phys/SelJpsi_3088_3100" | 4 | 4 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
- | "# input particles" | 4 | 4 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
- |*"#accept" | 4 | 4 |( 100.0000 +- 0.000000)% |
-""", stdout, result, causes, signature_offset = 0, id = "Stream2")
-findReferenceBlock("""
-Print_3100_4000 INFO Number of counters : 3
+ | "Candidates" | 4 |
+ | "Events" | 4 |
+Print_3100_4000 INFO Number of counters : 2
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Phys/SelJpsi_3100_4000" | 6 | 6 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
- | "# input particles" | 6 | 6 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
- |*"#accept" | 6 | 6 |( 100.0000 +- 0.000000)% |
+ | "Candidates" | 6 |
+ | "Events" | 6 |
""", stdout, result, causes, signature_offset = 0, id = "Stream3")
</text></argument>
</extension>
--
GitLab