Cleanup of commented-out includes of the old EventInfo

Several commented-out includes of the old EventInfo have been removed,
such that they won't show up in the search results

Simulation/G4Sim/G4HiveEx/src/G4InputLoader.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
 */
 
 /////////////////////////////////////////////////////////////////// 
@@ -11,16 +11,9 @@
 
 #include "GaudiKernel/Property.h"
 
-// #include "EventInfo/EventInfo.h"
 #include "GeneratorObjects/McEventCollection.h"
 #include "AthenaKernel/errorcheck.h"
 
-// #include "InDetIdentifier/PixelID.h"
-// #include "InDetSimEvent/SiHitCollection.h"
-// #include "InDetSimEvent/TRTUncompressedHitCollection.h"
-// #include "TrackRecord/TrackRecordCollection.h"
-
-
 G4InputLoader::G4InputLoader( const std::string& name, 
 			  ISvcLocator* pSvcLocator ) : 
   ::AthAlgorithm( name, pSvcLocator ), m_mcTruth("GEN_EVENT")

Trigger/TrigHypothesis/TrigBjetHypo/Root/TrigBjetFexStandalone.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
 */
 
 // ************************************************
@@ -19,23 +19,6 @@
 #include "TrigBjetHypo/TrigBjetTagger.h"
 #include "TrigBjetHypo/TuningLikelihood.h"
 
-//#include "TrigInDetEvent/TrigInDetTrackCollection.h"
-//#include "Particle/TrackParticleContainer.h"
-//#include "TrigInDetEvent/TrigVertexCollection.h"
-//#include "VxVertex/VxContainer.h"
-//#include "VxSecVertex/VxSecVertexInfo.h"
-//#include "VxSecVertex/VxSecVKalVertexInfo.h"
-//#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-//#include "EventInfo/EventInfo.h"
-//#include "EventInfo/EventID.h"
-
-//#include "TrigParticle/TrigL2BjetContainer.h"
-//#include "TrigParticle/TrigEFBjetContainer.h"
-
-//#include "TrigInDetEvent/TrigVertex.h"
-
-
-
 
 //** ----------------------------------------------------------------------------------------------------------------- **//
 

Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.cxx

 // -*- C++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**************************************************************************
@@ -18,30 +18,16 @@
  **
  **************************************************************************/
 
-//#include "TrigMuonEvent/CombinedMuonFeature.h"
-
 #include "TrigL2BMuMuHypo.h"
-//#include "TrigParticle/TrigL2BphysContainer.h"
-//
-//#include "StoreGate/StoreGateSvc.h"
-//#include "StoreGate/DataHandle.h"
 
 #include <math.h>
-//#include "EventInfo/EventInfo.h"
-//#include "EventInfo/EventID.h"
-//#include "TrigSteeringEvent/TrigPassBits.h"
 #include "xAODTrigger/TrigPassBits.h"
 #include "TrigNavigation/Navigation.h"
 
 #include "TrigBphysHelperUtilsTool.h"
-// additions of xAOD objects
-//#include "xAODEventInfo/EventInfo.h"
 #include "xAODTrigBphys/TrigBphys.h"
 #include "xAODTrigBphys/TrigBphysContainer.h"
 
-//class ISvcLocator;
-
-
 TrigL2BMuMuHypo::TrigL2BMuMuHypo(const std::string & name, ISvcLocator* pSvcLocator):
     HLT::HypoAlgo(name, pSvcLocator)
 ,m_bphysHelperTool("TrigBphysHelperUtilsTool")

Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtVarsTool.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
 */
 
 // C/C++
@@ -10,9 +10,6 @@
 #include "StoreGate/StoreGateSvc.h"
 
 // Reconstruction and MC
-// #include "EventInfo/EventInfo.h"
-// #include "EventInfo/EventType.h"
-// #include "EventInfo/PileUpEventInfo.h" // Old - not migrated to xAOD
 #include "GeneratorObjects/McEventCollection.h"
 #include "TruthHelper/IsGenStable.h"
 #include "TruthHelper/PileUpType.h"

Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamTool.h

@@ -21,11 +21,6 @@
 #include <stdint.h>
 #include "AthenaBaseComps/AthAlgTool.h"
 
-/* Needed to extract the evnum */
-//#include "EventInfo/EventInfo.h"
-//#include "EventInfo/EventID.h"
-//#include "StoreGate/StoreGateSvc.h"
-
 /* To be able to use OFFLINE_FRAGMENTS_NAMESPACE */
 #include "ByteStreamData/RawEvent.h"
 #include "ByteStreamData/ROBData.h"