Merge branch 'master' of ssh://gitlab.cern.ch:7999/lhcb/DaVinci

Phys/Tesla/python/Tesla/Configuration.py

@@ -7,6 +7,7 @@ from Configurables import (
     AuditorSvc,
     CaloClusterMCTruth,
     CaloDigit2MCLinks2Table,
+    CaloDigitCloner,
     ChargedPP2MC,
     CopyLinePersistenceLocations,
     CopyParticle2PVRelationsFromLinePersistenceLocations,
@@ -35,6 +36,7 @@ from Configurables import (
     PackMCParticle,
     PackMCVertex,
     PackParticlesAndVertices,
+    ProtoParticleCloner,
     PrintDuplicates,
     RawEventFormatConf,
     RawEventJuggler,
@@ -48,6 +50,7 @@ from Configurables import (
     TeslaReportAlgo,
     TimingAuditor,
     TrackAssociator,
+    TrackClonerWithClusters,
     TrackSys,
     TurboConf,
     TurboPrescaler,
@@ -904,18 +907,40 @@ class Tesla(LHCbConfigurableUser):
             # about to unpacked locations, as it is the unpacked locations we
             # want to copy to stream-specific locations
             TCKLinePersistenceSvc().ContainerMap = packing.packedToOutputLocationMap()
+
             container_cloner = CopyLinePersistenceLocations(
                 namer('CopyLinePersistenceLocations'),
                 OutputPrefix=output_prefix,
                 LinesToCopy=decisions,
                 ILinePersistenceSvc=persistence_svc
             )
+            ppc = container_cloner.addTool(ProtoParticleCloner)
+            tcwc = container_cloner.addTool(TrackClonerWithClusters)
+            cdc = container_cloner.addTool(CaloDigitCloner)
+
+            # Use the Track cloner that copies associated track clusters
+            ppc.ICloneTrack = "TrackClonerWithClusters"
+            tcwc.CloneAncestors = False
+
+            # Look for input objects under /Event/Turbo
+            def prepend_base(configurable, property):
+                """Prepend Tesla.base to the configurable's property value."""
+                default = configurable.getDefaultProperty(property)
+                value = os.path.join(self.base, default)
+                configurable.setProp(property, value)
+            prepend_base(tcwc, 'VeloClusters')
+            prepend_base(tcwc, 'TTClusters')
+            prepend_base(tcwc, 'ITClusters')
+            prepend_base(cdc, 'EcalADCLocation')
+            prepend_base(cdc, 'PrsADCLocation')
+
             p2pv_cloner = CopyParticle2PVRelationsFromLinePersistenceLocations(
                 namer('CopyP2PVRelationsFromLinePersistenceLocations'),
                 OutputPrefix=output_prefix,
                 LinesToCopy=decisions,
                 ILinePersistenceSvc=persistence_svc
             )
+
             copy_line_outputs_seq = GaudiSequencer(
                 namer('TeslaCopyLineOutputsSequence'),
                 Members=[