Skip to content
Snippets Groups Projects

Make SiSpacePointsSeedTool_xk thread-safe (ATLASRECTS-3037)

Merged Make SiSpacePointsSeedTool_xk thread-safe (ATLASRECTS-3037)
oda/athena:master-SiSpacePointsSeedTool into master
Merged Susumu Oda requested to merge oda/athena:master-SiSpacePointsSeedTool into master

Unification of EventData of SiSpacePointsSeedTool_xk

https://its.cern.ch/jira/browse/ATLASRECTS-3037

  • Use std::vector instead of C array
  • Change l_vertex from std::list to std::set
  • The variable names were changed to avoid overlaps.
* mapOneSeeds
mapOneSeeds     ['std::multimap<float,InDet::SiSpacePointsSeed*>', 4]
mapOneSeeds_Pro ['std::multimap<float,InDet::SiSpacePointsProSeed*>', 1]
mapOneSeeds_ITK ['std::multimap<float,InDet::SiSpacePointsProSeedITK*>', 1]

* OneSeeds
OneSeeds     ['std::vector<InDet::SiSpacePointsSeed>', 4]
OneSeeds_Pro ['std::vector<InDet::SiSpacePointsProSeed>', 1]
OneSeeds_ITK ['std::vector<InDet::SiSpacePointsProSeedITK>', 1]

* l_seeds
l_seeds     ['std::list<InDet::SiSpacePointsSeed>', 4]
l_seeds_Pro ['std::list<InDet::SiSpacePointsProSeed>', 1]
l_seeds_ITK ['std::list<InDet::SiSpacePointsProSeedITK>', 1]
l_seeds_map ['std::multimap<float,InDet::SiSpacePointsSeed*>', 1]

* i_seed
i_seed     ['std::list<InDet::SiSpacePointsSeed>::iterator', 4]
i_seed_Pro ['std::list<InDet::SiSpacePointsProSeed>::iterator', 1]
i_seed_ITK ['std::list<InDet::SiSpacePointsProSeedITK>::iterator', 1]
i_seed_map ['std::multimap<float,InDet::SiSpacePointsSeed*>::iterator', 1]

* i_seede
i_seede     ['std::list<InDet::SiSpacePointsSeed>::iterator', 4]
i_seede_Pro ['std::list<InDet::SiSpacePointsProSeed>::iterator', 1]
i_seede_ITK ['std::list<InDet::SiSpacePointsProSeedITK>::iterator', 1]
i_seede_map ['std::multimap<float,InDet::SiSpacePointsSeed*>::iterator', 1]

* seeds
seeds     ['std::vector<InDet::SiSpacePointsSeed>', 1]
seeds_Pro ['std::multimap<float,InDet::SiSpacePointsProSeed*>', 1]
seeds_ITK ['std::multimap<float,InDet::SiSpacePointsProSeedITK*>', 1]

* seed
seed     ['std::multimap<float,InDet::SiSpacePointsSeed*>::iterator', 1]
seed_Pro ['std::multimap<float,InDet::SiSpacePointsProSeed*>::iterator', 1]
seed_ITK ['std::multimap<float,InDet::SiSpacePointsProSeedITK*>::iterator', 1]
  • Define a common EventData struct and use it.
  • Move EventData to SiSPSeededTrackFinderData package and rename it to SiSpacePointsSeedMakerEventData.
  • Algorithms or tools own SiSpacePointsSeedMakerEventData and pass it by reference to SiSpacePointsSeedTool_xk and SiZVertexTool.

RunTier0Tests.py was fine. RunTier0Tests.log

Edited by Susumu Oda

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply