diff --git a/AtlasTest/CITest/Athena.cmake b/AtlasTest/CITest/Athena.cmake index 21451a86104850189f42c1c78bd4cd358eb56213..ed07d143bf8b9535d7555bb2725cd7360ac4b463 100644 --- a/AtlasTest/CITest/Athena.cmake +++ b/AtlasTest/CITest/Athena.cmake @@ -246,10 +246,6 @@ atlas_add_citest( ACTS_Workflow_FastTracking SCRIPT ActsWorkflowFastTracking.sh LOG_IGNORE_PATTERN "ActsTrackFindingAlg.*ERROR Propagation reached the step count limit|ActsTrackFindingAlg.*ERROR Propagation failed: PropagatorError:3 Propagation reached the configured maximum number of steps with the initial parameters|ActsTrackFindingAlg.*ERROR CombinatorialKalmanFilter failed: CombinatorialKalmanFilterError:5 Propagation reaches max steps before track finding is finished with the initial parameters" ) -atlas_add_citest( Acts_Workflow_Conversion - SCRIPT ActsConversionWorkflow.sh - LOG_IGNORE_PATTERN "ActsTrackFindingAlg.*ERROR Propagation reached the step count limit|ActsTrackFindingAlg.*ERROR Propagation failed: PropagatorError:3 Propagation reached the configured maximum number of steps with the initial parameters|ActsTrackFindingAlg.*ERROR CombinatorialKalmanFilter failed: CombinatorialKalmanFilterError:5 Propagation reaches max steps before track finding is finished with the initial parameters" ) - atlas_add_citest( ACTS_Workflow_HeavyIons SCRIPT ActsWorkflowHeavyIons.sh LOG_IGNORE_PATTERN "ActsTrackFindingAlg.*ERROR Propagation reached the step count limit|ActsTrackFindingAlg.*ERROR Propagation failed: PropagatorError:3 Propagation reached the configured maximum number of steps with the initial parameters|ActsTrackFindingAlg.*ERROR CombinatorialKalmanFilter failed: CombinatorialKalmanFilterError:5 Propagation reaches max steps before track finding is finished with the initial parameters" ) diff --git a/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py b/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py index 61af01519ffb5298b156872924c0faa3e1ff32ea..7363d192445b987b2eba657dd9b49506210501b7 100644 --- a/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py +++ b/InnerDetector/InDetConfig/python/ITkTrackingSiPatternConfig.py @@ -168,17 +168,17 @@ def ITkTrackingSiPatternCfg(flags, TracksTruth=ResolvedTrackCollectionKey+"TruthCollection")) if runActsTrackTruth : - from ActsConfig.ActsTruthConfig import TrackToTruthAssociationCfg, TrackFindingValidationAlgCfg + from ActsConfig.ActsTruthConfig import ActsTrackToTruthAssociationAlgCfg, ActsTrackFindingValidationAlgCfg acts_tracks=f"{flags.Tracking.ActiveConfig.extension}Tracks" if not flags.Acts.doAmbiguityResolution else f"{flags.Tracking.ActiveConfig.extension}ResolvedTracks" - acc.merge(TrackToTruthAssociationCfg(flags, - name=f"{acts_tracks}TrackToTruthAssociationAlg", - ACTSTracksLocation=acts_tracks, - AssociationMapOut=acts_tracks+"ToTruthParticleAssociation")) - - acc.merge(TrackFindingValidationAlgCfg(flags, - name=f"{acts_tracks}TrackFindingValidationAlg", - TrackToTruthAssociationMap=acts_tracks+"ToTruthParticleAssociation" - )) + acc.merge(ActsTrackToTruthAssociationAlgCfg(flags, + name=f"{acts_tracks}TrackToTruthAssociationAlg", + ACTSTracksLocation=acts_tracks, + AssociationMapOut=acts_tracks+"ToTruthParticleAssociation")) + + acc.merge(ActsTrackFindingValidationAlgCfg(flags, + name=f"{acts_tracks}TrackFindingValidationAlg", + TrackToTruthAssociationMap=acts_tracks+"ToTruthParticleAssociation" + )) return acc diff --git a/InnerDetector/InDetConfig/python/SiliconPreProcessing.py b/InnerDetector/InDetConfig/python/SiliconPreProcessing.py index 70d6654e9637c75526a7fa8c8d3f9ea76a1995bf..94f875f3990228345396378966fced1c24abd4e3 100644 --- a/InnerDetector/InDetConfig/python/SiliconPreProcessing.py +++ b/InnerDetector/InDetConfig/python/SiliconPreProcessing.py @@ -179,9 +179,9 @@ def ITkRecPreProcessingSiliconCfg(flags): acc.merge(ITkPRD_MultiTruthMakerSiCfg(flags)) if flags.Tracking.ActiveConfig.doActsCluster or flags.Tracking.ActiveConfig.doAthenaToActsCluster: - from ActsConfig.ActsTruthConfig import ITkTruthAssociationCfg, TruthParticleHitCountAlgCfg - acc.merge(ITkTruthAssociationCfg(flags)) - acc.merge(TruthParticleHitCountAlgCfg(flags)) + from ActsConfig.ActsTruthConfig import ActsTruthAssociationAlgCfg, ActsTruthParticleHitCountAlgCfg + acc.merge(ActsTruthAssociationAlgCfg(flags)) + acc.merge(ActsTruthParticleHitCountAlgCfg(flags)) return acc diff --git a/Tracking/Acts/ActsConfig/python/ActsTruthConfig.py b/Tracking/Acts/ActsConfig/python/ActsTruthConfig.py index 2d9b1698bb7dc59b9f7d31ad07575138715ea541..83408009268089ad0a2dfe8e9da9767319cbb9f4 100644 --- a/Tracking/Acts/ActsConfig/python/ActsTruthConfig.py +++ b/Tracking/Acts/ActsConfig/python/ActsTruthConfig.py @@ -5,86 +5,103 @@ from AthenaConfiguration.ComponentFactory import CompFactory from ActsInterop import UnitConstants from ActsConfig.ActsUtilities import extractChildKwargs -def MapToInDetSimDataWrapCfg(flags, - collection_name: str) -> ComponentAccumulator: +def MapToInDetSimDataWrapSvcCfg(flags, + *, + collectionName: str) -> ComponentAccumulator: acc = ComponentAccumulator() AddressRemappingSvc = CompFactory.AddressRemappingSvc( - TypeKeyOverwriteMaps = ["InDetSimDataCollection#%s->InDetSimDataCollectionWrap#%s" % (collection_name, collection_name) ] + TypeKeyOverwriteMaps = [f"InDetSimDataCollection#{collectionName}->InDetSimDataCollectionWrap#{collectionName}"] ) acc.addService(AddressRemappingSvc) return acc -def PixelClusterToTruthAssociationCfg(flags, - name: str = 'PixelClusterToTruthAssociationAlg', - **kwargs) -> ComponentAccumulator: +def ActsPixelClusterToTruthAssociationAlgCfg(flags, + name: str = 'ActsPixelClusterToTruthAssociationAlg', + **kwargs: dict) -> ComponentAccumulator: acc = ComponentAccumulator() - acc.merge( MapToInDetSimDataWrapCfg(flags, 'ITkPixelSDO_Map') ) - kwargs.setdefault('InputTruthParticleLinks','xAODTruthLinks') - kwargs.setdefault('SimData','ITkPixelSDO_Map') - kwargs.setdefault('DepositedEnergyMin',300) # @TODO revise ? From PRD_MultiTruthBuilder.h; should be 1/10 of threshold - kwargs.setdefault('Measurements','ITkPixelClusters') - kwargs.setdefault('AssociationMapOut','ITkPixelClustersToTruthParticles') + acc.merge( MapToInDetSimDataWrapSvcCfg(flags, collectionName='ITkPixelSDO_Map') ) + + kwargs.setdefault('InputTruthParticleLinks', 'xAODTruthLinks') + kwargs.setdefault('SimData', 'ITkPixelSDO_Map') + kwargs.setdefault('DepositedEnergyMin', 300) # @TODO revise ? From PRD_MultiTruthBuilder.h; should be 1/10 of threshold + kwargs.setdefault('Measurements', 'ITkPixelClusters') + kwargs.setdefault('AssociationMapOut', 'ITkPixelClustersToTruthParticles') + acc.addEventAlgo( CompFactory.ActsTrk.PixelClusterToTruthAssociationAlg(name=name, **kwargs) ) return acc -def StripClusterToTruthAssociationCfg(flags, - name: str = 'StripClusterToTruthAssociationAlg', - **kwargs) -> ComponentAccumulator: +def ActsStripClusterToTruthAssociationAlgCfg(flags, + name: str = 'ActsStripClusterToTruthAssociationAlg', + **kwargs: dict) -> ComponentAccumulator: acc = ComponentAccumulator() - acc.merge( MapToInDetSimDataWrapCfg(flags, 'ITkStripSDO_Map') ) + acc.merge( MapToInDetSimDataWrapSvcCfg(flags, collectionName='ITkStripSDO_Map') ) - kwargs.setdefault('InputTruthParticleLinks','xAODTruthLinks') - kwargs.setdefault('SimData','ITkStripSDO_Map') - kwargs.setdefault('DepositedEnergyMin',600) # @TODO revise ? From PRD_MultiTruthBuilder.h; should be 1/10 of threshold - kwargs.setdefault('Measurements','ITkStripClusters') - kwargs.setdefault('AssociationMapOut','ITkStripClustersToTruthParticles') + kwargs.setdefault('InputTruthParticleLinks', 'xAODTruthLinks') + kwargs.setdefault('SimData', 'ITkStripSDO_Map') + kwargs.setdefault('DepositedEnergyMin', 600) # @TODO revise ? From PRD_MultiTruthBuilder.h; should be 1/10 of threshold + kwargs.setdefault('Measurements', 'ITkStripClusters') + kwargs.setdefault('AssociationMapOut', 'ITkStripClustersToTruthParticles') + acc.addEventAlgo( CompFactory.ActsTrk.StripClusterToTruthAssociationAlg(name=name, **kwargs) ) return acc -def TrackToTruthAssociationCfg(flags, - name: str = 'ActsTracksToTruthAssociationAlg', - **kwargs) -> ComponentAccumulator: +def ActsTrackToTruthAssociationAlgCfg(flags, + name: str = 'ActsTracksToTruthAssociationAlg', + **kwargs: dict) -> ComponentAccumulator: acc = ComponentAccumulator() - acc.merge( MapToInDetSimDataWrapCfg(flags, 'ITkStripSDO_Map') ) + acc.merge( MapToInDetSimDataWrapSvcCfg(flags, collectionName='ITkStripSDO_Map') ) + kwargs.setdefault('ACTSTracksLocation','ActsTracks') kwargs.setdefault('PixelClustersToTruthAssociationMap','ITkPixelClustersToTruthParticles') kwargs.setdefault('StripClustersToTruthAssociationMap','ITkStripClustersToTruthParticles') kwargs.setdefault('AssociationMapOut','ActsTracksToTruthParticles') kwargs.setdefault('MaxEnergyLoss',1e3*UnitConstants.TeV) + + if 'TrackingGeometryTool' not in kwargs: + from ActsConfig.ActsGeometryConfig import ActsTrackingGeometryToolCfg + kwargs.setdefault("TrackingGeometryTool", acc.popToolsAndMerge(ActsTrackingGeometryToolCfg(flags))) + acc.addEventAlgo( CompFactory.ActsTrk.TrackToTruthAssociationAlg(name=name, **kwargs) ) return acc -def TruthParticleHitCountAlgCfg(flags, - name: str = 'TruthParticleHitCountAlg', - **kwargs) -> ComponentAccumulator: +def ActsTruthParticleHitCountAlgCfg(flags, + name: str = 'ActsTruthParticleHitCountAlg', + **kwargs: dict) -> ComponentAccumulator: acc = ComponentAccumulator() - acc.merge( MapToInDetSimDataWrapCfg(flags, 'ITkStripSDO_Map') ) - from ActsConfig.ActsGeometryConfig import ActsTrackingGeometryToolCfg - kwargs.setdefault("TrackingGeometryTool", acc.popToolsAndMerge(ActsTrackingGeometryToolCfg(flags))) + acc.merge( MapToInDetSimDataWrapSvcCfg(flags, collectionName='ITkStripSDO_Map') ) + kwargs.setdefault('PixelClustersToTruthAssociationMap','ITkPixelClustersToTruthParticles') kwargs.setdefault('StripClustersToTruthAssociationMap','ITkStripClustersToTruthParticles') kwargs.setdefault('TruthParticleHitCountsOut','TruthParticleHitCounts') kwargs.setdefault('MaxEnergyLoss',1e3*UnitConstants.TeV) # @TODO introduce flag and synchronise with TrackToTruthAssociationAlg kwargs.setdefault('NHitsMin',4) + + if 'TrackingGeometryTool' not in kwargs: + from ActsConfig.ActsGeometryConfig import ActsTrackingGeometryToolCfg + kwargs.setdefault("TrackingGeometryTool", acc.popToolsAndMerge(ActsTrackingGeometryToolCfg(flags))) + acc.addEventAlgo( CompFactory.ActsTrk.TruthParticleHitCountAlg(name=name, **kwargs) ) return acc -def ITkTruthAssociationCfg(flags, - **kwargs) -> ComponentAccumulator: +def ActsTruthAssociationAlgCfg(flags, + **kwargs: dict) -> ComponentAccumulator: acc = ComponentAccumulator() - if flags.Detector.EnableITkPixel : - acc.merge(PixelClusterToTruthAssociationCfg(flags, **extractChildKwargs(prefix="PixelClusterToTruthAssociation.", **kwargs) )) - if flags.Detector.EnableITkStrip : - acc.merge(StripClusterToTruthAssociationCfg(flags, **extractChildKwargs(prefix="StripClusterToTruthAssociation.", **kwargs) )) + + if flags.Detector.EnableITkPixel: + acc.merge(ActsPixelClusterToTruthAssociationAlgCfg(flags, **extractChildKwargs(prefix="PixelClusterToTruthAssociationAlg.", **kwargs) )) + + if flags.Detector.EnableITkStrip: + acc.merge(ActsStripClusterToTruthAssociationAlgCfg(flags, **extractChildKwargs(prefix="StripClusterToTruthAssociationAlg.", **kwargs) )) + return acc - - -def TrackFindingValidationAlgCfg(flags, - name: str = 'ActsTracksValidationAlg', - **kwargs) -> ComponentAccumulator: + + +def ActsTrackFindingValidationAlgCfg(flags, + name: str = 'ActsTracksValidationAlg', + **kwargs: dict) -> ComponentAccumulator: acc = ComponentAccumulator() kwargs.setdefault('TruthParticleHitCounts','TruthParticleHitCounts') kwargs.setdefault('TrackToTruthAssociationMap','ActsTracksToTruthParticles') @@ -99,11 +116,12 @@ def TrackFindingValidationAlgCfg(flags, kwargs.setdefault('StatisticPtBins',[1e3,2.5e3,5e3,10e3,100e3]) kwargs.setdefault('ShowDetailedTables',False) kwargs.setdefault('PdgIdCategorisation',False) + kwargs.setdefault('StatisticEtaBins',[eta/10. for eta in range(5, 40, 5)]) + if 'TruthSelectionTool' not in kwargs: from InDetPhysValMonitoring.InDetPhysValMonitoringConfig import InDetRttTruthSelectionToolCfg kwargs.setdefault("TruthSelectionTool", acc.popToolsAndMerge( InDetRttTruthSelectionToolCfg(flags))) - kwargs.setdefault('StatisticEtaBins',[eta/10. for eta in range(5, 40, 5)]) acc.addEventAlgo( CompFactory.ActsTrk.TrackFindingValidationAlg(name=name, **kwargs) ) return acc diff --git a/Tracking/Acts/ActsConfig/test/ActsConversionWorkflow.sh b/Tracking/Acts/ActsConfig/test/ActsConversionWorkflow.sh deleted file mode 100755 index 798a5387a1b8ad875a38a0896aa04591c428d646..0000000000000000000000000000000000000000 --- a/Tracking/Acts/ActsConfig/test/ActsConversionWorkflow.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/bash -# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration - -# ttbar mu=200 input -input_rdo=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/RDO/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8481_s4149_r14700/RDO.33629020._000047.pool.root.1 -n_events=2 - - -ignore_pattern="ActsTrackFindingAlg.+ERROR.+Propagation.+reached.+the.+step.+count.+limit,ActsTrackFindingAlg.+ERROR.+Propagation.+failed:.+PropagatorError:3.+Propagation.+reached.+the.+configured.+maximum.+number.+of.+steps.+with.+the.+initial.+parameters,ActsTrackFindingAlg.Acts.+ERROR.+CombinatorialKalmanFilter.+failed:.+CombinatorialKalmanFilterError:5.+Propagation.+reaches.+max.+steps.+before.+track.+finding.+is.+finished.+with.+the.+initial.+parameters" - -export ATHENA_CORE_NUMBER=1 -Reco_tf.py --CA \ - --preExec "flags.Acts.doITkConversion=True;flags.Tracking.doITkConversion=False;" \ - --preInclude "ActsConfig.ActsCIFlags.actsWorkflowFlags" \ - --ignorePatterns "${ignore_pattern}" \ - --inputRDOFile ${input_rdo} \ - --outputAODFile AOD.pool.root \ - --maxEvents ${n_events} \ - --multithreaded diff --git a/Tracking/Acts/ActsConfig/test/ActsWorkflow.sh b/Tracking/Acts/ActsConfig/test/ActsWorkflow.sh index e8317ff0ac8a2bdb2a2bb48be3e0a9e1e4c5da08..bb49797aa79b89497340363054a075371c1693de 100755 --- a/Tracking/Acts/ActsConfig/test/ActsWorkflow.sh +++ b/Tracking/Acts/ActsConfig/test/ActsWorkflow.sh @@ -1,18 +1,19 @@ #!/usr/bin/bash -# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration + +# This test schedules both Athena and Acts workflows in parallel +# For Acts we schedule both primary and secondary passes without the caching mechanism # ttbar mu=200 input input_rdo=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/RDO/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8481_s4149_r14700/RDO.33629020._000047.pool.root.1 -n_events=10 - +n_events=5 ignore_pattern="ActsTrackFindingAlg.+ERROR.+Propagation.+reached.+the.+step.+count.+limit,ActsTrackFindingAlg.+ERROR.+Propagation.+failed:.+PropagatorError:3.+Propagation.+reached.+the.+configured.+maximum.+number.+of.+steps.+with.+the.+initial.+parameters,ActsTrackFindingAlg.Acts.+ERROR.+CombinatorialKalmanFilter.+failed:.+CombinatorialKalmanFilterError:5.+Propagation.+reaches.+max.+steps.+before.+track.+finding.+is.+finished.+with.+the.+initial.+parameters" Reco_tf.py --CA \ - --preExec "flags.Exec.FPE=500;" \ - --preInclude "InDetConfig.ConfigurationHelpers.OnlyTrackingPreInclude,ActsConfig.ActsCIFlags.actsWorkflowFlags" \ + --preExec "flags.Exec.FPE=500;" "flags.Acts.doITkConversion=True;flags.Tracking.doITkConversion=False;" "flags.Acts.doLargeRadius=True;" \ + --preInclude "ActsConfig.ActsCIFlags.actsWorkflowFlags" \ --ignorePatterns "${ignore_pattern}" \ --inputRDOFile ${input_rdo} \ --outputAODFile AOD.pool.root \ - --outputESDFile ESD.pool.root \ --maxEvents ${n_events} diff --git a/Tracking/Acts/ActsConfig/test/ActsWorkflowCached.sh b/Tracking/Acts/ActsConfig/test/ActsWorkflowCached.sh index c1d5631af06281427128d812fd900e5f7657667e..c43e85bba1c214bf79831ae92e3b2a40a6577fe3 100755 --- a/Tracking/Acts/ActsConfig/test/ActsWorkflowCached.sh +++ b/Tracking/Acts/ActsConfig/test/ActsWorkflowCached.sh @@ -1,6 +1,9 @@ #!/usr/bin/bash # Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration +# This test schedules both Athena and Acts workflows in parallel +# For Acts we schedule both primary and secondary passes with the caching mechanism + # ttbar mu=200 input input_rdo=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/RDO/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8481_s4149_r14700/RDO.33629020._000047.pool.root.1 n_events=5 @@ -8,12 +11,10 @@ n_events=5 ignore_pattern="ActsTrackFindingAlg.+ERROR.+Propagation.+reached.+the.+step.+count.+limit,ActsTrackFindingAlg.+ERROR.+Propagation.+failed:.+PropagatorError:3.+Propagation.+reached.+the.+configured.+maximum.+number.+of.+steps.+with.+the.+initial.+parameters,ActsTrackFindingAlg.Acts.+ERROR.+CombinatorialKalmanFilter.+failed:.+CombinatorialKalmanFilterError:5.+Propagation.+reaches.+max.+steps.+before.+track.+finding.+is.+finished.+with.+the.+initial.+parameters" -export ATHENA_CORE_NUMBER=1 Reco_tf.py --CA \ - --preExec "flags.Exec.FPE=500;" "flags.Acts.doITkConversion=True;flags.Tracking.doITkConversion=False;" "flags.Acts.useCache=True;" \ + --preExec "flags.Exec.FPE=500;" "flags.Acts.doITkConversion=True;flags.Tracking.doITkConversion=False;" "flags.Acts.doLargeRadius=True;" "flags.Acts.useCache=True;" "flags.Tracking.doTruth=True;" \ --preInclude "ActsConfig.ActsCIFlags.actsWorkflowFlags" \ --ignorePatterns "${ignore_pattern}" \ --inputRDOFile ${input_rdo} \ --outputAODFile AOD.pool.root \ - --maxEvents ${n_events} \ - --multithreaded + --maxEvents ${n_events} diff --git a/Tracking/Acts/ActsTruth/src/MeasurementToTruthAssociationAlg.icc b/Tracking/Acts/ActsTruth/src/MeasurementToTruthAssociationAlg.icc index c649e85cf800f858db0241323f482bb318b59aef..159b419ccccc44f0b94d08658d63de8ec18989da 100644 --- a/Tracking/Acts/ActsTruth/src/MeasurementToTruthAssociationAlg.icc +++ b/Tracking/Acts/ActsTruth/src/MeasurementToTruthAssociationAlg.icc @@ -95,11 +95,14 @@ namespace ActsTrk ATH_MSG_ERROR("No sim data for key " << m_simDataKey.key() ); return StatusCode::FAILURE; } + + ATH_MSG_DEBUG("Retrieving measurement collection with key: " << m_measurementKey.key()); SG::ReadHandle<T_MeasurementCollection> measurementHandle = SG::makeHandle(m_measurementKey, ctx); if (!measurementHandle.isValid()) { ATH_MSG_ERROR("No measurements for key " << m_measurementKey.key() ); return StatusCode::FAILURE; } + ATH_MSG_DEBUG("Retrieved " << measurementHandle->size() << " input measurements" ); association->resize( measurementHandle->size() ); const T_TruthEventCollection *truth_event_collection=nullptr; diff --git a/Tracking/Acts/ActsTruth/src/TrackToTruthAssociationAlg.h b/Tracking/Acts/ActsTruth/src/TrackToTruthAssociationAlg.h index 6b481217d7c23e603b92547c59c5ed90ce7ad73d..c418c27837120f12524d5b9b4c164d3a414db47e 100644 --- a/Tracking/Acts/ActsTruth/src/TrackToTruthAssociationAlg.h +++ b/Tracking/Acts/ActsTruth/src/TrackToTruthAssociationAlg.h @@ -53,18 +53,18 @@ namespace ActsTrk private: ToolHandle<IActsTrackingGeometryTool> m_trackingGeometryTool - {this, "TrackingGeometryTool", "ActsTrackingGeometryTool"}; + {this, "TrackingGeometryTool", ""}; SG::ReadHandleKey<ActsTrk::TrackContainer> m_tracksContainerKey - {this, "ACTSTracksLocation", "SiSPSeededActsTrackContainer","Track collection (ActsTrk variant)"}; + {this, "ACTSTracksLocation", "","Track collection (ActsTrk variant)"}; SG::ReadHandleKey<MeasurementToTruthParticleAssociation> m_pixelClustersToTruth - {this, "PixelClustersToTruthAssociationMap","", "Association map from pixel measurements to generator particles." }; + {this, "PixelClustersToTruthAssociationMap", "", "Association map from pixel measurements to generator particles." }; SG::ReadHandleKey<MeasurementToTruthParticleAssociation> m_stripClustersToTruth - {this, "StripClustersToTruthAssociationMap","", "Association map from strip measurements to generator particles." }; + {this, "StripClustersToTruthAssociationMap", "", "Association map from strip measurements to generator particles." }; SG::WriteHandleKey<TrackToTruthParticleAssociation> m_trackToTruthOut - {this, "AssociationMapOut","", "Output association map from measurements to generator particles." }; + {this, "AssociationMapOut", "", "Output association map from measurements to generator particles." }; Gaudi::Property<float> m_maxEnergyLoss {this, "MaxEnergyLoss", 10e12, "Stop moving up the decay chain if the energy loss is above this value." }; diff --git a/Tracking/Acts/ActsTruth/src/TruthParticleHitCountAlg.h b/Tracking/Acts/ActsTruth/src/TruthParticleHitCountAlg.h index 8782f61489354039d58aa59e66b994da25f1e5fd..4781a1c1b1f816e669d200e23fd326d41eedd7a4 100644 --- a/Tracking/Acts/ActsTruth/src/TruthParticleHitCountAlg.h +++ b/Tracking/Acts/ActsTruth/src/TruthParticleHitCountAlg.h @@ -53,15 +53,15 @@ namespace ActsTrk private: ToolHandle<IActsTrackingGeometryTool> m_trackingGeometryTool - {this, "TrackingGeometryTool", "ActsTrackingGeometryTool"}; + {this, "TrackingGeometryTool", ""}; SG::ReadHandleKey<MeasurementToTruthParticleAssociation> m_pixelClustersToTruth - {this, "PixelClustersToTruthAssociationMap","", "Association map from pixel measurements to generator particles." }; + {this, "PixelClustersToTruthAssociationMap", "", "Association map from pixel measurements to generator particles." }; SG::ReadHandleKey<MeasurementToTruthParticleAssociation> m_stripClustersToTruth - {this, "StripClustersToTruthAssociationMap","", "Association map from strip measurements to generator particles." }; + {this, "StripClustersToTruthAssociationMap", "", "Association map from strip measurements to generator particles." }; SG::WriteHandleKey<TruthParticleHitCounts> m_truthHitCountsOut - {this, "TruthParticleHitCountsOut","", "Map from truth particle to hit counts." }; + {this, "TruthParticleHitCountsOut", "", "Map from truth particle to hit counts." }; Gaudi::Property<float> m_maxEnergyLoss {this, "MaxEnergyLoss", 10e12, "Stop moving up the decay chain if the energy loss is above this value." };