From 6abf10c12b1d13cd0f9de2bb27762a0d5b088039 Mon Sep 17 00:00:00 2001 From: Sylvester Joosten <sjoosten@anl.gov> Date: Fri, 24 Sep 2021 23:24:01 +0000 Subject: [PATCH] Use SourceLinker, not SourcesLinker --- .../far_forward/options/far_forward_reconstruction.py | 1 - benchmarks/track_finding/options/track_reconstruction.py | 6 +----- benchmarks/track_fitting/options/track_reconstruction.py | 5 +---- benchmarks/tracking/options/track_reconstruction.py | 6 +----- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/benchmarks/far_forward/options/far_forward_reconstruction.py b/benchmarks/far_forward/options/far_forward_reconstruction.py index e3cc04cd..0a28e70b 100644 --- a/benchmarks/far_forward/options/far_forward_reconstruction.py +++ b/benchmarks/far_forward/options/far_forward_reconstruction.py @@ -20,7 +20,6 @@ from Configurables import Jug__Digi__UFSDTrackerDigi as TrackerDigi from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerReco from Configurables import Jug__Reco__TrackerSourceLinker as TrackerSourceLinker -#from Configurables import Jug__Reco__TrackingHitsSourceLinker as TrackingHitsSourceLinker from Configurables import Jug__Reco__TrackParamTruthInit as TrackParamTruthInit from Configurables import Jug__Reco__FarForwardParticles as FarForwardParticles diff --git a/benchmarks/track_finding/options/track_reconstruction.py b/benchmarks/track_finding/options/track_reconstruction.py index 5c8b8f74..0831e95f 100644 --- a/benchmarks/track_finding/options/track_reconstruction.py +++ b/benchmarks/track_finding/options/track_reconstruction.py @@ -24,15 +24,12 @@ from Configurables import Jug__Base__InputCopier_dd4pod__Geant4ParticleCollectio from Configurables import Jug__Base__InputCopier_dd4pod__CalorimeterHitCollection_dd4pod__CalorimeterHitCollection_ as CalCopier from Configurables import Jug__Base__InputCopier_dd4pod__TrackerHitCollection_dd4pod__TrackerHitCollection_ as TrkCopier -from Configurables import Jug__Digi__ExampleCaloDigi as ExampleCaloDigi -from Configurables import Jug__Digi__UFSDTrackerDigi as TrackerDigi -from Configurables import Jug__Digi__EMCalorimeterDigi as EMCalorimeterDigi +from Configurables import Jug__Digi__SiliconTrackerDigi as TrackerDigi from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerHitReconstruction from Configurables import Jug__Reco__TrackingHitsCollector2 as TrackingHitsCollector from Configurables import Jug__Reco__TrackerSourceLinker as TrackerSourceLinker -#from Configurables import Jug__Reco__TrackingHitsSourceLinker as TrackingHitsSourceLinker from Configurables import Jug__Reco__TrackParamTruthInit as TrackParamTruthInit from Configurables import Jug__Reco__TrackParamClusterInit as TrackParamClusterInit from Configurables import Jug__Reco__TrackParamVertexClusterInit as TrackParamVertexClusterInit @@ -40,7 +37,6 @@ from Configurables import Jug__Reco__TrackParamVertexClusterInit as TrackParamVe from Configurables import Jug__Reco__ConformalXYPeakProtoTracks as ConformalXYPeakProtoTracks from Configurables import Jug__Reco__TrackFindingAlgorithm as TrackFindingAlgorithm from Configurables import Jug__Reco__ParticlesFromTrackFit as ParticlesFromTrackFit -from Configurables import Jug__Reco__EMCalReconstruction as EMCalReconstruction from Configurables import Jug__Reco__SimpleClustering as SimpleClustering diff --git a/benchmarks/track_fitting/options/track_reconstruction.py b/benchmarks/track_fitting/options/track_reconstruction.py index 120deacb..b46c8804 100644 --- a/benchmarks/track_fitting/options/track_reconstruction.py +++ b/benchmarks/track_fitting/options/track_reconstruction.py @@ -24,9 +24,7 @@ from Configurables import Jug__Base__InputCopier_dd4pod__Geant4ParticleCollectio from Configurables import Jug__Base__InputCopier_dd4pod__CalorimeterHitCollection_dd4pod__CalorimeterHitCollection_ as CalCopier from Configurables import Jug__Base__InputCopier_dd4pod__TrackerHitCollection_dd4pod__TrackerHitCollection_ as TrkCopier -from Configurables import Jug__Digi__ExampleCaloDigi as ExampleCaloDigi -from Configurables import Jug__Digi__UFSDTrackerDigi as TrackerDigi -from Configurables import Jug__Digi__EMCalorimeterDigi as EMCalorimeterDigi +from Configurables import Jug__Digi__SiliconTrackerDigi as TrackerDigi from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerHitReconstruction from Configurables import Jug__Reco__TrackingHitsCollector2 as TrackingHitsCollector @@ -39,7 +37,6 @@ from Configurables import Jug__Reco__TrackParamVertexClusterInit as TrackParamVe from Configurables import Jug__Reco__TrackFindingAlgorithm as TrackFindingAlgorithm from Configurables import Jug__Reco__ParticlesFromTrackFit as ParticlesFromTrackFit -from Configurables import Jug__Reco__EMCalReconstruction as EMCalReconstruction from Configurables import Jug__Reco__SimpleClustering as SimpleClustering diff --git a/benchmarks/tracking/options/track_reconstruction.py b/benchmarks/tracking/options/track_reconstruction.py index 0e3f3e72..7086d8a9 100644 --- a/benchmarks/tracking/options/track_reconstruction.py +++ b/benchmarks/tracking/options/track_reconstruction.py @@ -24,22 +24,18 @@ from Configurables import Jug__Base__InputCopier_dd4pod__Geant4ParticleCollectio from Configurables import Jug__Base__InputCopier_dd4pod__CalorimeterHitCollection_dd4pod__CalorimeterHitCollection_ as CalCopier from Configurables import Jug__Base__InputCopier_dd4pod__TrackerHitCollection_dd4pod__TrackerHitCollection_ as TrkCopier -from Configurables import Jug__Digi__ExampleCaloDigi as ExampleCaloDigi -from Configurables import Jug__Digi__UFSDTrackerDigi as TrackerDigi -from Configurables import Jug__Digi__EMCalorimeterDigi as EMCalorimeterDigi +from Configurables import Jug__Digi__SiliconTrackerDigi as TrackerDigi from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerHitReconstruction from Configurables import Jug__Reco__TrackingHitsCollector2 as TrackingHitsCollector from Configurables import Jug__Reco__TrackerSourceLinker as TrackerSourceLinker -#from Configurables import Jug__Reco__TrackingHitsSourceLinker as TrackingHitsSourceLinker from Configurables import Jug__Reco__TrackParamTruthInit as TrackParamTruthInit from Configurables import Jug__Reco__TrackParamClusterInit as TrackParamClusterInit from Configurables import Jug__Reco__TrackParamVertexClusterInit as TrackParamVertexClusterInit from Configurables import Jug__Reco__TrackFindingAlgorithm as TrackFindingAlgorithm from Configurables import Jug__Reco__ParticlesFromTrackFit as ParticlesFromTrackFit -from Configurables import Jug__Reco__EMCalReconstruction as EMCalReconstruction from Configurables import Jug__Reco__SimpleClustering as SimpleClustering -- GitLab