Merge branch 'master-AFP_Digitization-EventInfo' into 'master'

Dropped redundant dependency on the EventInfo package from AFP_Digitization

See merge request atlas/athena!21731

ForwardDetectors/AFP/AFP_Digitization/AFP_Digitization/AFP_PileUpTool.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef AFP_DIGITIZATION_TOOL_H
 #define AFP_DIGITIZATION_TOOL_H
 
-#include "EventInfo/PileUpEventInfo.h"  /*SubEvent*/
 #include "PileUpTools/PileUpToolBase.h"
 #include "xAODEventInfo/EventInfo.h"             // NEW EDM
 #include "xAODEventInfo/EventAuxInfo.h"          // NEW EDM

ForwardDetectors/AFP/AFP_Digitization/CMakeLists.txt

@@ -10,7 +10,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/AthenaBaseComps
                           Control/AthenaKernel
                           Control/PileUpTools
-                          Event/EventInfo
                           Event/xAOD/xAODEventInfo
                           ForwardDetectors/AFP/AFP_DigiEv
                           ForwardDetectors/AFP/AFP_SimEv
@@ -28,7 +27,7 @@ atlas_add_component( AFP_Digitization
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib EventInfo xAODEventInfo AFP_DigiEv AFP_SimEv GaudiKernel HitManagement Identifier )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib xAODEventInfo AFP_DigiEv AFP_SimEv GaudiKernel HitManagement Identifier )
 
 # Install files from the package:
 atlas_install_headers( AFP_Digitization )

ForwardDetectors/AFP/AFP_Digitization/src/AFP_PileUpTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
 #include "AFP_Digitization/AFP_PileUpTool.h"
 #include <algorithm>
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
 #include "AFP_SimEv/AFP_TDSimHit.h"
 #include "AFP_SimEv/AFP_TDSimHitCollection.h"
 #include "AFP_DigiEv/AFP_TDDigiCollection.h"
@@ -17,7 +15,6 @@
 #include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGaussQ.h"
 #include "CLHEP/Random/RandPoissonQ.h"
-//#include "AFP_G4_SD/AFP_SensitiveDetector.h" 
 
 AFP_PileUpTool::AFP_PileUpTool(const std::string& type,
 			       const std::string& name,