Merge branch 'expected_hits_fix' into 'master'

ATLASRECTS-5057: An attempt to recover the lost in conversions

See merge request !26796

Reconstruction/egamma/egammaAlgs/src/EMBremCollectionBuilder.cxx

@@ -352,12 +352,6 @@ void EMBremCollectionBuilder::updateGSFTrack(const TrackWithIndex& Info,
     uint8_t deadPixel= original->summaryValue(dummy,xAOD::numberOfPixelDeadSensors)?dummy:0;
     summary->update(Trk::numberOfPixelDeadSensors,deadPixel);
     
-    uint8_t expectInnermostPixel= original->summaryValue(dummy,xAOD::expectInnermostPixelLayerHit)?dummy:0;
-    summary->update(Trk::expectInnermostPixelLayerHit,expectInnermostPixel);
-    
-    uint8_t expectNextToInnermostPixel = original->summaryValue(dummy,xAOD::expectNextToInnermostPixelLayerHit)?dummy:0;
-    summary->update(Trk::expectNextToInnermostPixelLayerHit,expectNextToInnermostPixel);
-  
     int nPixHitsRefitted = summary->get(Trk::numberOfPixelHits);
     int nPixOutliersRefitted = summary->get(Trk::numberOfPixelOutliers);
     int nPixHitsOriginal = original->summaryValue(dummy,xAOD::numberOfPixelHits) ? dummy:-1;

Tracking/TrkTools/TrkTrackSummaryTool/src/TrackSummaryTool.cxx

@@ -369,6 +369,8 @@ void Trk::TrackSummaryTool::updateTrackNoHoleSearch(Track& track, const Trk::PRD
   }
 
   track.m_trackSummary =  createSummary(track, prd_to_track_map, false, false).release();
+  m_idTool->updateExpectedHitInfo(track,  *track.m_trackSummary);
+
   return;
 }