Skip to content

Draft: multi-pmap-integration merge with main to resolve conflicts

Whitmaur Robert Castiglioni requested to merge wcastigl/athena:multi-pmap-integration into main

This is a merge request to resolve potential errors of this being out of date

FPGATrackSimLogicalHitsProcessAlg.cxx had std::vector const & hits_1st = m_logicEventHeader_1st->towers().at(regionID).hits(); chaged back to std::vector const & hits_1st = m_logicEventHeader_1st->towers().at(0).hits(); this fix only takes 1 regionID but fixes the issue if the regions are loaded without previous regions. Before if you loaded a region3 for example it would break as regionID is 4 but there is only 1 tower

changes to mapping files made to load multiple maps on 1 file. pmaps are now stored in a vector Changes to be committed: modified: Trigger/EFTracking/FPGATrackSim/FPGATrackSimAlgorithms/src/FPGATrackSimLogicalHitsProcessAlg.cxx modified: Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/FPGATrackSimMaps/FPGATrackSimPlaneMap.h modified: Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/FPGATrackSimMaps/IFPGATrackSimMappingSvc.h modified: Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/src/FPGATrackSimMappingSvc.cxx modified: Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/src/FPGATrackSimMappingSvc.h modified: Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/src/FPGATrackSimPlaneMap.cxx

Merge request reports