From d3d1878aa92bbf451523ddb6d3a29af6db995918 Mon Sep 17 00:00:00 2001
From: Rosen Matev <rosen.matev@cern.ch>
Date: Mon, 7 Nov 2016 00:37:11 +0100
Subject: [PATCH] Fix hlt1trackdecode test
---
Hlt/Moore/tests/options/Moore_2016.py | 4 +++
Hlt/Moore/tests/options/default-input.py | 14 +++++++++
.../tracking.qms/hlt1trackdecode.qmt | 30 +++++++++++--------
.../tracking.qms/hlt1trackingonly.qmt | 13 ++++++--
4 files changed, 46 insertions(+), 15 deletions(-)
create mode 100644 Hlt/Moore/tests/options/Moore_2016.py
create mode 100644 Hlt/Moore/tests/options/default-input.py
diff --git a/Hlt/Moore/tests/options/Moore_2016.py b/Hlt/Moore/tests/options/Moore_2016.py
new file mode 100644
index 00000000000..1c97324129b
--- /dev/null
+++ b/Hlt/Moore/tests/options/Moore_2016.py
@@ -0,0 +1,4 @@
+from Configurables import Moore, CondDB
+
+Moore().DataType = "2016"
+CondDB().LatestGlobalTagByDataType = Moore().getProp('DataType')
diff --git a/Hlt/Moore/tests/options/default-input.py b/Hlt/Moore/tests/options/default-input.py
new file mode 100644
index 00000000000..8bc5ae5cfd8
--- /dev/null
+++ b/Hlt/Moore/tests/options/default-input.py
@@ -0,0 +1,14 @@
+from Configurables import Moore
+from Configurables import HltConf
+from PRConfig.TestFileDB import test_file_db
+
+input = test_file_db["2016NB_25ns_L0Filt0x160B"]
+input.run(configurable=Moore())
+HltConf().setProp('L0TCK', '0x160B')
+
+if Moore().getProp('Split') != 'Hlt2':
+ Moore().RemoveInputHltRawBanks = True
+ Moore().EvtMax = 1000
+else:
+ from GaudiConf import IOExtension
+ IOExtension().inputFiles([], clear=True)
diff --git a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackdecode.qmt b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackdecode.qmt
index c6413a8f39b..305e49e5f9f 100755
--- a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackdecode.qmt
+++ b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackdecode.qmt
@@ -4,23 +4,29 @@
<argument name="timeout">
<integer>1200</integer>
</argument>
- <argument name="args"><set>
- <text>--option</text>
- <text>from Gaudi.Configuration import *; from Configurables import ApplicationMgr, HltTrackReportsDecoder, DumpTracks; ApplicationMgr().TopAlg=[HltTrackReportsDecoder('TrackreportsDecoder',OutputLevel=4)];from GaudiConf import IOExtension; IOExtension().inputFiles(['hlt1_reqhlt1_track.raw']); from Configurables import LHCbApp; LHCbApp();</text>
- </set></argument>
- <argument name="unsupported_platforms"><set><text>win.*</text></set></argument>
+ <argument name="options"><text>
+from Gaudi.Configuration import *
+from Configurables import ApplicationMgr, HltTrackReportsDecoder, DumpTracks
+ApplicationMgr().TopAlg = [HltTrackReportsDecoder('TrackreportsDecoder', OutputLevel=WARNING)]
+from GaudiConf import IOExtension
+IOExtension().inputFiles(['hlt1_reqhlt1_track.raw'])
+from Configurables import LHCbApp
+LHCbApp()
+ </text></argument>
<argument name="prerequisites"><set>
<tuple><text>moore.physics.tracking.hlt1trackingonly</text><enumeral>PASS</enumeral></tuple>
- </set></argument>-->
+ </set></argument>
<argument name="validator"><text>
-block="""
+
+block = """
TrackreportsDec...SUCCESS Number of counters : 3
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "Hlt/Track/ForwardHPT" | 208 | 4060 | 19.519 | 10.891 | 3.0000 | 124.00 |
- | "Hlt/Track/Velo" | 208 | 26660 | 128.17 | 64.102 | 27.000 | 641.00 |
- | "Hlt/Track/VeloTTHPT" | 208 | 12477 | 59.986 | 32.148 | 10.000 | 350.00 |
+ | "Hlt/Track/ForwardHPT" | 68 | 1140 | 16.765 | 8.6774 | 2.0000 | 41.000 |
+ | "Hlt/Track/Velo" | 68 | 7593 | 111.66 | 64.985 | 19.000 | 462.00 |
+ | "Hlt/Track/VeloTTHPT" | 68 | 4049 | 59.544 | 34.139 | 10.000 | 238.00 |
"""
-findReferenceBlock(block, signature_offset = 0)
-</text></argument>
+findReferenceBlock(block, signature_offset=0)
+
+ </text></argument>
</extension>
diff --git a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackingonly.qmt b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackingonly.qmt
index bc34c297c61..59f856499aa 100755
--- a/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackingonly.qmt
+++ b/Hlt/Moore/tests/qmtest/moore.qms/physics.qms/tracking.qms/hlt1trackingonly.qmt
@@ -5,12 +5,19 @@
<integer>1200</integer>
</argument>
<argument name="args"><set>
- <text>../options/Moore_Hlt1And2.py</text>
- <text>../options/Input_Default.py</text>
+ <text>../options/Moore_2016.py</text>
+ <text>../options/default-input.py</text>
<text>../options/hlt1_trackingonly-threshold.py</text>
<text>../options/Moore_Hlt1Only.py</text>
<text>--option</text>
- <text>from Configurables import Moore; Moore().RemoveInputHltRawBanks = True ; Moore().outputFile = 'hlt1_reqhlt1_track.raw'; Moore().EnableTimer="physics.tracking.hlt1.csv"; </text>
+ <text>
+from Configurables import Moore
+Moore().RemoveInputHltRawBanks = True
+Moore().outputFile = 'hlt1_reqhlt1_track.raw'
+Moore().EnableTimer = "physics.tracking.hlt1.csv"
+from Configurables import HltConf
+HltConf().EnableHltTrkReports = True
+ </text>
</set></argument>
<argument name="unsupported_platforms"><set><text>win.*</text></set></argument>
<!--<argument name="prerequisites"><set>
--
GitLab