From 709dd62c7b7344eed12f2018c51e0831e1f10cc0 Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Fri, 15 Mar 2019 23:16:33 +0100
Subject: [PATCH] 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
---
.../G4Sim/G4HiveEx/src/G4InputLoader.cxx | 9 +--------
.../Root/TrigBjetFexStandalone.cxx | 19 +------------------
.../TrigBphysHypo/src/TrigL2BMuMuHypo.cxx | 16 +---------------
.../TrigCostMonitor/src/TrigNtVarsTool.cxx | 5 +----
.../HLTResultByteStreamTool.h | 5 -----
5 files changed, 4 insertions(+), 50 deletions(-)
diff --git a/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx b/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx
index 6425c1a4d83..8daa1f348c6 100644
--- a/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx
+++ b/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx
@@ -1,5 +1,5 @@
/*
- 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")
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/Root/TrigBjetFexStandalone.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/Root/TrigBjetFexStandalone.cxx
index d2ac703dc75..56828d973ea 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/Root/TrigBjetFexStandalone.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/Root/TrigBjetFexStandalone.cxx
@@ -1,5 +1,5 @@
/*
- 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"
-
-
-
//** ----------------------------------------------------------------------------------------------------------------- **//
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.cxx
index a66867ec87e..d1c0281157e 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.cxx
@@ -1,7 +1,7 @@
// -*- 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")
diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtVarsTool.cxx b/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtVarsTool.cxx
index dcb67734088..8d73828a981 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtVarsTool.cxx
+++ b/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigNtVarsTool.cxx
@@ -1,5 +1,5 @@
/*
- 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"
diff --git a/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamTool.h b/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamTool.h
index 460255c7a8f..99dc34809a7 100755
--- a/Trigger/TrigSteer/TrigHLTResultByteStream/TrigHLTResultByteStream/HLTResultByteStreamTool.h
+++ b/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"
--
GitLab