From bc6fc889f6a42fc9bc941546fc8cc2cf0eb6bc91 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Mon, 7 Jun 2021 11:49:22 +0200
Subject: [PATCH] Fix tests
---
Event/DAQEvent/include/Event/ODIN.h | 2 +-
GaudiConf/python/GaudiConf/QMTest/LHCbExclusions.py | 5 ++++-
Kernel/LHCbAlgs/tests/options/odinemulator.py | 6 +++---
Phys/LoKiHlt/python/LoKiHlt/functions.py | 12 ------------
4 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/Event/DAQEvent/include/Event/ODIN.h b/Event/DAQEvent/include/Event/ODIN.h
index 102da2b39d7..29ddf88e337 100644
--- a/Event/DAQEvent/include/Event/ODIN.h
+++ b/Event/DAQEvent/include/Event/ODIN.h
@@ -146,7 +146,7 @@ namespace LHCb {
const CLID& clID() const override { return this->classID(); }
static const CLID& classID() { return CLID_ODIN; }
- static constexpr std::uint8_t version() { return 7; }
+ static constexpr int version() { return 7; }
enum Fields {
RunNumberSize = 32,
diff --git a/GaudiConf/python/GaudiConf/QMTest/LHCbExclusions.py b/GaudiConf/python/GaudiConf/QMTest/LHCbExclusions.py
index a6390359ada..00932fb47b1 100755
--- a/GaudiConf/python/GaudiConf/QMTest/LHCbExclusions.py
+++ b/GaudiConf/python/GaudiConf/QMTest/LHCbExclusions.py
@@ -113,7 +113,10 @@ preprocessor = (
r"INFO \+\+ Loaded \s*\d+ conditions from",
r"Alignments\s*INFO \+\+ Add dependency:",
r"Align\s*INFO Alignments:",
- ]) +
+ ]) + RegexpReplacer( # Hide specific ODIN type
+ when="StoreExplorerAlg",
+ orig=r'LHCb::ODINImplementation::v7::OD',
+ repl=r'LHCb::ODIN') +
# Grouping
SortGroupOfLines(
r'.*SUCCESS (Exceptions/Errors/Warnings/Infos Statistics :| #WARNINGS =| #ERRORS =|List of booked \dD histograms in directory).*'
diff --git a/Kernel/LHCbAlgs/tests/options/odinemulator.py b/Kernel/LHCbAlgs/tests/options/odinemulator.py
index 69a938aacaf..7756adbc9a8 100644
--- a/Kernel/LHCbAlgs/tests/options/odinemulator.py
+++ b/Kernel/LHCbAlgs/tests/options/odinemulator.py
@@ -27,9 +27,9 @@ import GaudiPython as GP
from PRConfig import TestFileDB
from GaudiKernel.DataHandle import DataHandle
-LUMI_BIT = cppyy.gbl.LHCb.ODIN.Lumi
+LUMI_BIT = cppyy.gbl.LHCb.ODIN.EventTypes.Lumi
LUMI_FRACTION = 0.25
-NOBIAS_BIT = cppyy.gbl.LHCb.ODIN.NoBias
+NOBIAS_BIT = cppyy.gbl.LHCb.ODIN.EventTypes.NoBias
NOBIAS_FRACTION = 0.5
unpack = LHCb__UnpackRawEvent(
@@ -80,7 +80,7 @@ while event < app.EvtMax:
assert odin.eventType() & LUMI_BIT == 0, "Unexpected Lumi bit"
assert odin.eventType() & NOBIAS_BIT == 0, "Unexpected NoBias bit"
assert odin.bunchCrossingType(
- ) == cppyy.gbl.LHCb.ODIN.BeamCrossing, "Unexpected non beam-beam crossing"
+ ) == cppyy.gbl.LHCb.ODIN.BXTypes.BeamCrossing, "Unexpected non beam-beam crossing"
emulated = TES[str(emulator.OutputODINLocation)]
assert emulated, "Emulated ODIN not found"
diff --git a/Phys/LoKiHlt/python/LoKiHlt/functions.py b/Phys/LoKiHlt/python/LoKiHlt/functions.py
index 19002d60f54..0296cd70434 100755
--- a/Phys/LoKiHlt/python/LoKiHlt/functions.py
+++ b/Phys/LoKiHlt/python/LoKiHlt/functions.py
@@ -68,9 +68,6 @@ ODIN_ALL = LoKi.Constant(_o1 + ',bool')(True)
## @see LoKi::Cuts::ODIN_BUNCH
ODIN_BUNCH = LoKi.Odin.BunchId()
-## @see LoKi::Cuts::ODIN_BXCURRENT
-ODIN_BXCURRENT = LoKi.Odin.BunchCurrent()
-
## @see LoKi::Cuts::ODIN_BXID
ODIN_BXID = LoKi.Odin.BXId
@@ -80,15 +77,9 @@ ODIN_BXTYP = LoKi.Odin.BXType()
## @see LoKi::Cuts::ODIN_CALSTEP
ODIN_CALSTEP = LoKi.Odin.CalibrationStep()
-## @see LoKi::Cuts::ODIN_ForceBit
-ODIN_FORCEBIT = LoKi.Odin.ForceBit()
-
## @see LoKi::Cuts::ODIN_EVTTYP
ODIN_EVTTYP = LoKi.Odin.EventType()
-## @see LoKi::Cuts::ODIN_ERRBITS
-ODIN_ERRBITS = LoKi.Odin.ErrorBits()
-
## @see LoKi::Cuts::ODIN_FALSE
ODIN_FALSE = LoKi.Constant(_o1 + ',bool')(False)
@@ -107,9 +98,6 @@ ODIN_ORBIT = LoKi.Odin.Orbit()
## @see LoKi::Cuts::ODIN_PRESCALE
ODIN_PRESCALE = LoKi.Odin.Prescale
-## @see LoKi::Cuts::ODIN_ROTYP
-ODIN_ROTYP = LoKi.Odin.ReadOutType()
-
## @see LoKi::Cuts::ODIN_RUN
ODIN_RUN = LoKi.Odin.Run()
--
GitLab