Merge branch 'FastSiDigitizationTool_UpdateInterface_21.3' into '21.3'

Fix InnerDetector/InDetDigitization/FastSiDigitization PileUpTool interfaces

See merge request atlas/athena!10283

Former-commit-id: f9a942a0e080c3eec46221b7ff3450fd8c642b49

InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h

@@ -86,8 +86,8 @@ public:
   StatusCode initialize();
   StatusCode prepareEvent(unsigned int);
   StatusCode processBunchXing( int bunchXing,
-                               PileUpEventInfo::SubEvent::const_iterator bSubEvents,
-                               PileUpEventInfo::SubEvent::const_iterator eSubEvents );
+                               SubEventIterator bSubEvents,
+                               SubEventIterator eSubEvents );
   StatusCode processAllSubEvents();
   StatusCode mergeEvent();
   StatusCode digitize();

InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitizationTool.h

@@ -102,8 +102,8 @@ public:
   virtual StatusCode initialize();
   StatusCode prepareEvent( unsigned int );
   StatusCode processBunchXing( int bunchXing,
-                               PileUpEventInfo::SubEvent::const_iterator bSubEvents,
-                               PileUpEventInfo::SubEvent::const_iterator eSubEvents );
+                               SubEventIterator bSubEvents,
+                               SubEventIterator eSubEvents );
   StatusCode mergeEvent();
   StatusCode processAllSubEvents();
   StatusCode createAndStoreRIOs();

InnerDetector/InDetDigitization/FastSiDigitization/src/SCT_FastDigitizationTool.cxx

@@ -164,18 +164,18 @@ StatusCode SCT_FastDigitizationTool::prepareEvent(unsigned int)
 }
 
 StatusCode SCT_FastDigitizationTool::processBunchXing(int bunchXing,
-                                                      PileUpEventInfo::SubEvent::const_iterator bSubEvents,
-                                                      PileUpEventInfo::SubEvent::const_iterator eSubEvents)
+                                                      SubEventIterator bSubEvents,
+                                                      SubEventIterator eSubEvents)
 {
   m_seen.push_back(std::make_pair(std::distance(bSubEvents,eSubEvents), bunchXing));
   //decide if this event will be processed depending on HardScatterSplittingMode & bunchXing
   if (m_HardScatterSplittingMode == 2 && !m_HardScatterSplittingSkipper ) { m_HardScatterSplittingSkipper = true; return StatusCode::SUCCESS; }
   if (m_HardScatterSplittingMode == 1 && m_HardScatterSplittingSkipper )  { return StatusCode::SUCCESS; }
   if (m_HardScatterSplittingMode == 1 && !m_HardScatterSplittingSkipper ) { m_HardScatterSplittingSkipper = true; }
-  PileUpEventInfo::SubEvent::const_iterator iEvt(bSubEvents);
+  SubEventIterator iEvt(bSubEvents);
   while (iEvt != eSubEvents)
     {
-      StoreGateSvc& seStore(*iEvt->pSubEvtSG);
+      StoreGateSvc& seStore(*iEvt->ptr()->evtStore());
       PileUpTimeEventIndex thisEventIndex(PileUpTimeEventIndex(static_cast<int>(iEvt->time()),iEvt->index()));
       const SiHitCollection* seHitColl(nullptr);
       CHECK(seStore.retrieve(seHitColl,m_inputObjectName).isSuccess());