diff --git a/Phys/DaVinciMCKernel/include/Kernel/HepMC2MC.h b/Phys/DaVinciMCKernel/include/Kernel/HepMC2MC.h
deleted file mode 100644
index 84cdae04a313de77bf0684be9c2364d4541de1f6..0000000000000000000000000000000000000000
--- a/Phys/DaVinciMCKernel/include/Kernel/HepMC2MC.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*****************************************************************************\
-* (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration *
-* *
-* This software is distributed under the terms of the GNU General Public *
-* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". *
-* *
-* In applying this licence, CERN does not waive the privileges and immunities *
-* granted to it by virtue of its status as an Intergovernmental Organization *
-* or submit itself to any jurisdiction. *
-\*****************************************************************************/
-// ============================================================================
-#ifndef MCTOOLS_HEPMC2MC_H
-# define MCTOOLS_HEPMC2MC_H 1
-// ============================================================================
-// Include files
-// ============================================================================
-// GeneEvent
-// ============================================================================
-# include "Event/HepMCEvent.h"
-// ============================================================================
-// forward declarations
-// ============================================================================
-// HepMC
-// ============================================================================
-namespace HepMC {
- class GenParticle;
-}
-// ============================================================================
-// Relations
-// ============================================================================
-template <class FROM, class TO>
-class IRelation;
-template <class FROM, class TO>
-class IRelation2D;
-// ============================================================================
-// Event
-// ============================================================================
-namespace LHCb {
- class MCParticle;
-}
-// ============================================================================
-/** @file
- *
- * This file is a part of LoKi project -
- * "C++ ToolKit for Smart and Friendly Physics Analysis"
- *
- * The package has been designed with the kind help from
- * Galina PAKHLOVA and Sergey BARSUK. Many bright ideas,
- * contributions and advices from G.Raven, J.van Tilburg,
- * A.Golutvin, P.Koppenburg have been used in the design.
- *
- * @author Vanya BELYAEV ibelyaev@physics.syr.edu
- * @date 2006-01-23
- */
-// ============================================================================
-namespace LHCb {
- // ===========================================================================
- /** @namespace LHCb::Relations_
- * definition fo low-level classes used for relations
- * @author Vanya BELYAEV ibelyaev@physics.syr.edu
- * @date 2006-03-16
- */
- namespace Relations_ {
- // ========================================================================
- /// the actual type for HepMC --> MC relations
- typedef IRelation<HepMC::GenParticle*, LHCb::MCParticle> HepMC2MC;
- /// the actual type for MC --> HepMC relations
- typedef IRelation<LHCb::MCParticle, HepMC::GenParticle*> MC2HepMC;
- /// the actual type for HepMC <--> MC relations
- typedef IRelation2D<HepMC::GenParticle*, LHCb::MCParticle> HepMC2MC2D;
- // ========================================================================
- } // namespace Relations_
- // ==========================================================================
- /// the actual type for HepMC --> MC relations
- typedef LHCb::Relations_::HepMC2MC HepMC2MC;
- /// the actual type for MC --> HepMC relations
- typedef LHCb::Relations_::MC2HepMC MC2HepMC;
- /// the actual type for HepMC <--> MC relations
- typedef LHCb::Relations_::HepMC2MC2D HepMC2MC2D;
- // ==========================================================================
- /** @namespace HepMC2MCLocation
- * namespace with the definiton of "default" TES
- * location for HepMC::GenParticle <---> MCParticle relation table
- * @author Vanya BELYAEV Ivan.Belyaev@itep.ru
- * @date 2005-07-14
- */
- // ==========================================================================
- namespace HepMC2MCLocation {
- // ========================================================================
- /** @var Default
- * The definiton of "default" TES
- * location for HepMC::GenParticle <---> MCParticle relation table
- * @author Vanya BELYAEV Ivan.Belyaev@itep.ru
- * @date 2005-07-14
- */
- // ========================================================================
- const std::string Default = "Relations/" + LHCb::HepMCEventLocation::Default;
- // ========================================================================
- } // namespace HepMC2MCLocation
- // ==========================================================================
-} // end of namespace LHCb
-// ============================================================================
-// The END
-// ============================================================================
-#endif // MCTOOLS_HEPMC2MC_H
-// ============================================================================
diff --git a/Pr/PrConverters/tests/qmtest/convert_tracks.qmt b/Pr/PrConverters/tests/qmtest/convert_tracks.qmt
index 52d99763d03a789b3922127e0d43e8197440b870..3ad56046014e1035a33c9cc539045a7518bdfb6b 100644
--- a/Pr/PrConverters/tests/qmtest/convert_tracks.qmt
+++ b/Pr/PrConverters/tests/qmtest/convert_tracks.qmt
@@ -20,7 +20,6 @@ Test track converters
<argument name="reference"><text>../refs/convert_tracks.ref</text></argument>
<argument name="validator"><text>
from GaudiConf.QMTest.LHCbExclusions import preprocessor
-preprocessor = preprocessor + \
-validateWithReference(preproc = preprocessor)
+validateWithReference(preproc=preprocessor)
</text></argument>
</extension>
diff --git a/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_mergelinksbykeystovector.qmt b/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_mergelinksbykeystovector.qmt
index 00ec3cb76c6c410aa623dc26e24318def997bfad..278e373b5f93a341b27dd63cef7d42c8f9b68dd6 100644
--- a/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_mergelinksbykeystovector.qmt
+++ b/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_mergelinksbykeystovector.qmt
@@ -15,6 +15,7 @@
<text>../options/test_mergelinksbykeystovector.py</text>
</set></argument>
<argument name="validator"><text>
-countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0})
+from GaudiConf.QMTest.LHCbExclusions import ignore_missing_hepmc_dicts
+countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0}, stdout=ignore_missing_hepmc_dicts(stdout))
</text></argument>
</extension>
diff --git a/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_mergerelationstables.qmt b/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_mergerelationstables.qmt
index 2cb21b9c9fdc76aa5dcb1de327f2dd37209d74ef..2b1146a21cffbe9fd4ed83ca341f96fc912ce54e 100644
--- a/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_mergerelationstables.qmt
+++ b/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_mergerelationstables.qmt
@@ -24,10 +24,15 @@
# but it's not counted as a 'Gaudi warning'. Either way, it's OK that it's
# there (the Python bindings aren't clever enough to detect that the return
# actually *is* being used).
+
+from GaudiConf.QMTest.LHCbExclusions import LineSkipper, ignore_missing_hepmc_dicts
countErrorLines(
{"FATAL": 0, "ERROR": 0, "WARNING": 0},
+ stdout=(ignore_missing_hepmc_dicts
# drop a warning line coming from incomplete UT geometry (in DD4hep)
- '\n'.join(l for l in stdout.splitlines() if 'The sub volume lvUX851InUT is NOT constructed' not in l)
+ + LineSkipper([
+ "The sub volume lvUX851InUT is NOT constructed",
+ ]))(stdout)
)
</text></argument>
</extension>
diff --git a/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_protoparticleassociator.qmt b/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_protoparticleassociator.qmt
index 106bc148da72f50fbb34abcdabbe1ed18f36ad15..949eb7bef9033a365ffae30c9bd277732848c82b 100644
--- a/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_protoparticleassociator.qmt
+++ b/Rec/GlobalRecoMCTools/tests/qmtest/globalrecomctools.qms/test_protoparticleassociator.qmt
@@ -24,10 +24,15 @@
# but it's not counted as a 'Gaudi warning'. Either way, it's OK that it's
# there (the Python bindings aren't clever enough to detect that the return
# actually *is* being used).
+
+from GaudiConf.QMTest.LHCbExclusions import LineSkipper, ignore_missing_hepmc_dicts
countErrorLines(
{"FATAL": 0, "ERROR": 0, "WARNING": 0},
+ stdout=(ignore_missing_hepmc_dicts
# drop a warning line coming from incomplete UT geometry (in DD4hep)
- '\n'.join(l for l in stdout.splitlines() if 'The sub volume lvUX851InUT is NOT constructed' not in l)
+ + LineSkipper([
+ "The sub volume lvUX851InUT is NOT constructed",
+ ]))(stdout)
)
</text></argument>
</extension>