diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref b/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
index 6241626fce0926a9629197935935a188282c7366..abbd8fdf265a64016a11881c3d5419d28425bde9 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
@@ -7,7 +7,6 @@ RootHistSvc INFO Writing ROOT histograms to: DV-examp
HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc
FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
UnpackChargedProtos.ChargedProto... INFO Using retuned RICH el and mu DLL values in combined DLLs
-FunctionalParticleMaker.LoKi::Hy... INFO CUT: ' ( (TrTYPE==3) &TrALL) '
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr INFO Application Manager Started successfully
EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc
@@ -62,10 +61,6 @@ ParticleRangeFilter INFO Number of counters : 1
|*"Cut selection efficiency" | 1059 | 21 |( 1.983003 +- 0.4284147)% |
ToolSvc.HybridFactory INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
-ToolSvc.PPFactoryHybridFactory INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
-ToolSvc.TrackFunctorFactory INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
UnpackBestTracks INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "# Unpacked Tracks" | 10 | 4101 | 410.10 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
index c64e85dcadd16b37eaf9e7cf8ddd53f6729b0d1d..19472682332a044fd4c6b6eee11558bfee3d2489 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
@@ -9,7 +9,6 @@ FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SV
MCTruthAndBkgCatAlg#1.DaVinciSma... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
MCTruthAndBkgCatAlg#1.DaVinciSma... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
MCTruthAndBkgCatAlg#1.Background... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
-FunctionalParticleMaker.LoKi::Hy... INFO CUT: ' ( (TrTYPE==3) &TrALL) '
MCTruthAndBkgCatAlg#2.DaVinciSma... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
MCTruthAndBkgCatAlg#2.DaVinciSma... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
MCTruthAndBkgCatAlg#2.Background... INFO Will look into [/Event/Spruce/HLT2/Relations/ChargedPP2MCP, /Event/Spruce/HLT2/Relations/NeutralPP2MCP]
@@ -101,7 +100,3 @@ SpruceDecReportsDecoder INFO Number of counters : 1
| " HltDecReports has a zero TCK, and it is not explicitly specified for decoding -- make sure that this really what you want"| 14 |
ToolSvc.HltFactory INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
-ToolSvc.PPFactoryHybridFactory INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
-ToolSvc.TrackFunctorFactory INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
diff --git a/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref b/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
index e62f89dc3bf1716c5913ee5b09987dac7d8cb61e..b7d3f437b24892e8c12df5d71e910d37612a869c 100644
--- a/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
+++ b/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
@@ -6,7 +6,6 @@ NTupleSvc INFO Added stream file:DV-test-array-ntp.
RootHistSvc INFO Writing ROOT histograms to: DV-test-array-his.root
HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc
FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
-FunctionalParticleMaker.LoKi::Hy... INFO CUT: ' ( (TrTYPE==3) &TrALL) '
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr INFO Application Manager Started successfully
EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc
@@ -63,7 +62,3 @@ ParticleUnpacker INFO Number of counters : 2
| "# UnpackedData" | 124 | 70084 | 565.19 |
ToolSvc.HltFactory INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
-ToolSvc.PPFactoryHybridFactory INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
-ToolSvc.TrackFunctorFactory INFO Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
diff --git a/Phys/DaVinci/python/DaVinci/common_particles.py b/Phys/DaVinci/python/DaVinci/common_particles.py
index 0a37a2157088fa8bc5ebff859ae1c246d7e4ee60..ae2fed916e0dd246d06c57f923473846288c5715 100644
--- a/Phys/DaVinci/python/DaVinci/common_particles.py
+++ b/Phys/DaVinci/python/DaVinci/common_particles.py
@@ -37,7 +37,7 @@ def _make_std_loose_particles(particles, pvs, name):
@configurable
def make_std_loose_kaons():
- with standard_protoparticle_filter.bind(Code='PP_HASRICH'):
+ with standard_protoparticle_filter.bind(Code=F.PPHASRICH):
return _make_std_loose_particles(
make_long_kaons(), _make_pvs_v2(), name='StdLooseKaons')
@@ -93,6 +93,6 @@ def make_long_pions():
particles = FunctionalParticleMaker(
InputProtoParticles=charged_protos,
ParticleID="pion",
- TrackSelector=get_long_track_selector(),
- ProtoParticleFilter=standard_protoparticle_filter()).Particles
+ TrackPredicate=get_long_track_selector(),
+ ProtoParticlePredicate=standard_protoparticle_filter()).Particles
return particles
diff --git a/Phys/DaVinci/python/DaVinci/filter_selectors.py b/Phys/DaVinci/python/DaVinci/filter_selectors.py
index 2c97ceab3e23b64e9f0291576618e43f4f991dde..deed091eb37d8390605cef2058c3abc6bb6d62ed 100644
--- a/Phys/DaVinci/python/DaVinci/filter_selectors.py
+++ b/Phys/DaVinci/python/DaVinci/filter_selectors.py
@@ -15,7 +15,6 @@ Definitions of:
"""
from GaudiKernel.SystemOfUnits import MeV
import Functors as F
-from Hlt2Conf.algorithms_thor import require_all
#################################
# Default particle cuts
@@ -26,4 +25,4 @@ def default_particle_cuts(pvs):
"""
Return a string with the default particle standard loose cuts.
"""
- return require_all(F.PT > 250 * MeV, F.MINIPCHI2(pvs) > 4)
+ return F.require_all(F.PT > 250 * MeV, F.MINIPCHI2(pvs) > 4)