From 454b82a42db983ff265f4556737e035ecc0a55f4 Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Thu, 18 Jun 2020 02:56:55 +0200
Subject: [PATCH] Remove unnecessary include or forward declaration of
IRegSelSvc
---
.../InDetTrigParticleCreation/src/TrigParticleCreator.cxx | 3 +--
.../InDetTrigParticleCreation/src/TrigTrackingxAODCnv.cxx | 3 +--
.../InDetTrigVxSecondary/src/TrigVxSecondary.cxx | 3 +--
.../InDetTrigVxSecondary/src/TrigVxSecondaryCombo.cxx | 3 +--
.../TrigFastTrackFinder/src/TrigFastTrackFinder.cxx | 2 --
.../TrigFastTrackFinder/src/TrigFastTrackFinder.h | 1 -
.../TrigL2MuonSA/TrigL2MuonSA/MuFastDataPreparator.h | 1 -
.../TrigT2CaloCommon/TrigT2CaloCommon/ITrigDataAccess.h | 5 +++--
.../TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.h | 3 +--
.../TrigTRTHighTHitCounter/src/TrigTRTHTHCounter.h | 4 +---
.../TrigAlgorithms/TrigTileMuId/src/TrigTileLookForMuAlg.cxx | 1 -
.../TrigAlgorithms/TrigTileMuId/src/TrigTileLookForMuAlg.h | 3 +--
.../TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.hxx | 2 --
.../TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx | 3 +--
.../src/TrigSpacePointConversionTool.cxx | 1 -
.../src/TrigSpacePointConversionTool.h | 4 ----
16 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigParticleCreator.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigParticleCreator.cxx
index cd171e94eb0..41d54cb5daa 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigParticleCreator.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigParticleCreator.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/ITHistSvc.h"
@@ -14,7 +14,6 @@
#include "Particle/TrackParticleContainer.h"
#include "TrkToolInterfaces/IPRD_AssociationTool.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
#include "TrkTrackSummary/TrackSummary.h"
#include <cmath>
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigTrackingxAODCnv.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigTrackingxAODCnv.cxx
index 626fd69222d..b9723a7c846 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigTrackingxAODCnv.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigParticleCreation/src/TrigTrackingxAODCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/ITHistSvc.h"
@@ -17,7 +17,6 @@
#include "Particle/TrackParticleContainer.h"
#include "TrkToolInterfaces/IPRD_AssociationTool.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
#include "TrkTrackSummary/TrackSummary.h"
#include "Identifier/Identifier.h"
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondary.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondary.cxx
index 5763e49b3a3..3770590294e 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondary.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondary.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetTrigVxSecondary/TrigVxSecondary.h"
@@ -11,7 +11,6 @@
#include "InDetBeamSpotService/IBeamCondSvc.h"
#include "TrigInDetEvent/TrigVertexCollection.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
#include <sstream>
#include <TLorentzVector.h>
#include "xAODBase/IParticle.h"
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondaryCombo.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondaryCombo.cxx
index 8d406973cc6..a5216ec2559 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondaryCombo.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/src/TrigVxSecondaryCombo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetTrigVxSecondary/TrigVxSecondaryCombo.h"
@@ -12,7 +12,6 @@
#include "InDetBeamSpotService/IBeamCondSvc.h"
#include "TrigInDetEvent/TrigVertexCollection.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "IRegionSelector/IRegSelSvc.h"
#include <sstream>
#include <TLorentzVector.h>
#include "xAODBase/IParticle.h"
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
index 206ec3bd3a0..2491f08ee73 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
@@ -38,8 +38,6 @@
#include "TrkTrackSummary/TrackSummary.h"
#include "TrkToolInterfaces/ITrackSummaryTool.h"
-#include "IRegionSelector/IRegSelSvc.h"
-
#include "TrigInDetEvent/TrigSiSpacePointBase.h"
#include "InDetIdentifier/SCT_ID.h"
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
index d4f73491854..e44ad23760b 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
@@ -39,7 +39,6 @@ class ITrigSpacePointConversionTool;
class ITrigL2ResidualCalculator;
class ITrigInDetTrackFitter;
class ITrigZFinder;
-class IRegSelSvc;
class TrigRoiDescriptor;
class TrigSiSpacePointBase;
class Identifier;
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastDataPreparator.h b/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastDataPreparator.h
index b79f4232cb3..40b1865f6ae 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastDataPreparator.h
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/TrigL2MuonSA/MuFastDataPreparator.h
@@ -32,7 +32,6 @@
#include "TrigMuonBackExtrapolator/ITrigMuonBackExtrapolator.h"
#include "TrigL2MuonSA/PtEndcapLUTSvc.h"
-#include "RegionSelector/IRegSelSvc.h"
#include "RPC_CondCabling/RpcCablingCondData.h"
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/ITrigDataAccess.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/ITrigDataAccess.h
index 7a6fd0057a2..945d829fa8d 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/ITrigDataAccess.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/ITrigDataAccess.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/********************************************************************
@@ -25,7 +25,8 @@
#include "LArRecEvent/LArFebEnergyCollection.h"
#include "TileEvent/TileCellCollection.h"
#include "TileEvent/TileL2Container.h"
-#include "IRegionSelector/IRegSelSvc.h"
+#include "IRegionSelector/IRoiDescriptor.h"
+#include "IRegionSelector/RegSelEnums.h"
#include "CaloEvent/CaloCellContainer.h"
#include "ZdcEvent/ZdcRawChannelCollection.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.h b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.h
index abb9dc2f820..e1ae048b3b8 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePoints.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMINBIAS_TRIGCOUNTSPACEPOINTS_H
@@ -16,7 +16,6 @@ class SCT_ID;
class PixelID;
class TrigSpacePointCounts;
class IRegSelSvc;
-class IRegSelSvc;
/** @class TrigCountSpacePoints
diff --git a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHCounter.h b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHCounter.h
index 7258f0defc6..3ad5f917ea4 100644
--- a/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHCounter.h
+++ b/Trigger/TrigAlgorithms/TrigTRTHighTHitCounter/src/TrigTRTHTHCounter.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGTRTHTHCOUNTER_H
@@ -18,7 +18,6 @@
*/
class TRT_ID;
-class IRegSelSvc;
class ITrigTRT_DriftCircleProviderTool;
class IdentifierHash;
@@ -37,7 +36,6 @@ class TrigTRTHTHCounter: public HLT::FexAlgo {
const TRT_ID *m_trtHelper; //!< TRT ID helper
- // ServiceHandle<IRegSelSvc> m_regionSelector; //!< region selector service
std::vector<IdentifierHash> m_listOfTrtIds; //!< IDs of DE from regionSelector
diff --git a/Trigger/TrigAlgorithms/TrigTileMuId/src/TrigTileLookForMuAlg.cxx b/Trigger/TrigAlgorithms/TrigTileMuId/src/TrigTileLookForMuAlg.cxx
index f986cecb066..4f0265c5e8b 100755
--- a/Trigger/TrigAlgorithms/TrigTileMuId/src/TrigTileLookForMuAlg.cxx
+++ b/Trigger/TrigAlgorithms/TrigTileMuId/src/TrigTileLookForMuAlg.cxx
@@ -13,7 +13,6 @@
#include "GaudiKernel/ITHistSvc.h"
#include "TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-#include "RegionSelector/IRegSelSvc.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "CaloIdentifier/TileID.h"
#include "ByteStreamData/ROBData.h"
diff --git a/Trigger/TrigAlgorithms/TrigTileMuId/src/TrigTileLookForMuAlg.h b/Trigger/TrigAlgorithms/TrigTileMuId/src/TrigTileLookForMuAlg.h
index be9685ec38b..4aa9f20b71f 100755
--- a/Trigger/TrigAlgorithms/TrigTileMuId/src/TrigTileLookForMuAlg.h
+++ b/Trigger/TrigAlgorithms/TrigTileMuId/src/TrigTileLookForMuAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//****************************************************************************
@@ -30,7 +30,6 @@
namespace HLT {
class TriggerElement;
}
-class IRegSelSvc;
class Identifier;
class TileID;
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.hxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.hxx
index 1c899f4a209..9936bbd30c8 100755
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.hxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.hxx
@@ -19,8 +19,6 @@
#include "TrigSteering/LvlConverter.h"
#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
-class IRegSelSvc;
-
namespace HLT
{
class ILvl1ResultAccessTool;
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx
index 221bbaed6c7..b6f8e0fca95 100755
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -12,7 +12,6 @@
#include "EventInfo/TriggerInfo.h"
#include "EventInfo/EventInfo.h"
-#include "RegionSelector/IRegSelSvc.h"
#include "PathResolver/PathResolver.h"
#include "GaudiKernel/ITHistSvc.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx
index 6217d130fd8..aefb54809a0 100644
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx
@@ -13,7 +13,6 @@
#include "TrigInDetToolInterfaces/ITrigL2LayerNumberTool.h"
#include "SpacePointConversionUtils.h"
-#include "IRegionSelector/IRegSelSvc.h"
#include "IRegionSelector/IRegSelTool.h"
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.h b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.h
index 26b3e6e7da0..284bf60acc2 100644
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.h
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.h
@@ -21,7 +21,6 @@
class AtlasDetectorID;
class SCT_ID;
class PixelID;
-class IRegSelSvc;
class ITrigL2LayerNumberTool;
@@ -49,9 +48,6 @@ class TrigSpacePointConversionTool : virtual public ITrigSpacePointConversionToo
const SCT_ID* m_sctId;
const PixelID* m_pixelId;
- // std::string m_regionSelectorName;
- // IRegSelSvc* m_regionSelector;
-
SG::ReadCondHandleKey<InDet::BeamSpotData> m_beamSpotKey { this, "BeamSpotKey", "BeamSpotData", "SG key for beam spot" };
std::string m_pixelSpContName,m_sctSpContName;// offline/EF containers
--
GitLab