From 9fa755fc6f418c502f9b8e3b3d3ddf0d82afdc49 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Tue, 15 Dec 2020 15:13:13 +0100
Subject: [PATCH 1/4] tidy interface includes
---
.../InDetRecToolInterfaces/IInDetTestBLayerTool.h | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
index beef2f0ce1ed..036b88756d69 100755
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
@@ -4,17 +4,16 @@
#ifndef IInDetTestBLayerTool_H
#define IInDetTestBLayerTool_H
-#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/ThreadLocalContext.h"
-#include "TrkParameters/TrackParameters.h"
-#include "TrkEventPrimitives/ResidualPull.h"
+#include "GaudiKernel/ThreadLocalContext.h" //for Gaudi::Hive::currentContext()
#include <vector>
-#include <string>
namespace Trk {
-class Track;
-class IResidualPullCalculator;
+ class EventContext;
+ class Track;
+ class IResidualPullCalculator;
+ class ResidualPull;
+ class TrackParameters;
}
namespace InDet {
class TrackStateOnBLayerInfo;
--
GitLab
From dbc11d277bbfbb10285d2d9c20de3621c45a5b37 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Tue, 15 Dec 2020 15:13:47 +0100
Subject: [PATCH 2/4] copyrighht update
---
.../InDetRecToolInterfaces/IInDetTestBLayerTool.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
index 036b88756d69..14539d916b23 100755
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef IInDetTestBLayerTool_H
--
GitLab
From 5952a7b82b9a873b1d87e5eca40740b7495093e3 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Tue, 15 Dec 2020 15:46:38 +0100
Subject: [PATCH 3/4] tidy include statements
---
.../IInDetTestBLayerTool.h | 6 +++--
.../InDetTestBLayer/InDetTestBLayerTool.h | 15 +++++------
.../src/InDetTestBLayerTool.cxx | 27 +++++++------------
3 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
index 14539d916b23..4a2d1835a5b5 100755
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/IInDetTestBLayerTool.h
@@ -6,19 +6,21 @@
#define IInDetTestBLayerTool_H
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/ThreadLocalContext.h" //for Gaudi::Hive::currentContext()
+#include "TrkParameters/TrackParameters.h"
#include <vector>
namespace Trk {
- class EventContext;
class Track;
class IResidualPullCalculator;
class ResidualPull;
- class TrackParameters;
}
+
namespace InDet {
class TrackStateOnBLayerInfo;
}
+class EventContext;
+
namespace InDet {
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h b/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h
index 2924eb9357dd..3cb1da4f566a 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/InDetTestBLayer/InDetTestBLayerTool.h
@@ -8,25 +8,24 @@
#include "InDetRecToolInterfaces/IInDetTestBLayerTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ThreadLocalContext.h" //for Gaudi::Hive::currentContext()
#include "TrkParameters/TrackParameters.h"
-#include "TrkEventPrimitives/ResidualPull.h"
#include "TrkExInterfaces/IExtrapolator.h"
#include "TrkToolInterfaces/IResidualPullCalculator.h"
-
-#include "InDetTestBLayer/TrackStateOnBLayerInfo.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
#include <vector>
#include <string>
+#include <memory>
namespace Trk {
-class Track;
+ class Track;
+ class ResidualPull;
}
-namespace Rec { class TrackParticle; }
+
class AtlasDetectorID;
-class Identifier;
class PixelID;
-
+class TrackStateOnBLayerInfo;
+class EventContext;
namespace InDet {
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
index 871f24d9eeb5..583477a96cf3 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
@@ -1,40 +1,31 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#include "InDetTestBLayer/InDetTestBLayerTool.h"
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "AthenaBaseComps/AthService.h"
-
+#include "TrkEventPrimitives/ResidualPull.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "PixelReadoutGeometry/PixelModuleDesign.h"
-#include "InDetTestBLayer/InDetTestBLayerTool.h"
+#include "InDetTestBLayer/TrackStateOnBLayerInfo.h"
+#include "TrkEventPrimitives/ResidualPull.h"
#include "TrkTrack/Track.h"
-#include "TrkParameters/TrackParameters.h"
#include "Particle/TrackParticle.h"
#include "TrkMeasurementBase/MeasurementBase.h"
-
#include "TrkSurfaces/CylinderSurface.h"
-
#include "TrkGeometry/Layer.h"
-
#include "Identifier/Identifier.h"
#include "InDetIdentifier/PixelID.h"
#include "AtlasDetDescr/AtlasDetectorID.h"
#include "IdDictDetDescr/IdDictManager.h"
-
-
-#include <iostream>
-#include <sstream>
+#include "GaudiKernel/EventContext.h"
using Amg::Transform3D;
// don't want to include TrackSummary in the header
// therefore anonymous "static" definition in the implementation file
-//namespace {
- static const Trk::SummaryType s_layerSummaryTypeExpectHit[2] {
- Trk::expectInnermostPixelLayerHit,
- Trk::expectNextToInnermostPixelLayerHit
- };
-//}
+static const Trk::SummaryType s_layerSummaryTypeExpectHit[2] {
+ Trk::expectInnermostPixelLayerHit,
+ Trk::expectNextToInnermostPixelLayerHit
+};
namespace InDet {
--
GitLab
From 363c0190afef58c4fe4ddd5fc33f79529eb418b9 Mon Sep 17 00:00:00 2001
From: Shaun Roe <shaun.roe@cern.ch>
Date: Tue, 15 Dec 2020 22:45:23 +0100
Subject: [PATCH 4/4] add missing include
---
.../TrackD3PDMaker/src/PerigeeBLPredictionFillerTool.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/PerigeeBLPredictionFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/PerigeeBLPredictionFillerTool.cxx
index 1e7172b2637c..80a67a86219e 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/PerigeeBLPredictionFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/PerigeeBLPredictionFillerTool.cxx
@@ -12,7 +12,7 @@
#include "PerigeeBLPredictionFillerTool.h"
#include "InDetTestBLayer/InDetTestBLayerTool.h"
-//#include "TrkParameters/Perigee.h"
+#include "InDetTestBLayer/TrackStateOnBLayerInfo.h"
#include "AthenaKernel/errorcheck.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "InDetIdentifier/PixelID.h"
--
GitLab