From 7ba384a01f3d4591a9ed2bb68c24b576eee85ccc Mon Sep 17 00:00:00 2001
From: Matthew Basso <matthew.joseph.basso@cern.ch>
Date: Fri, 11 Dec 2020 21:07:54 +0100
Subject: [PATCH] Reorder includes to put STL includes at the end
---
.../EventUtils/src/ParticleSelectionAlg.cxx | 5 +----
.../EventUtils/src/ParticleSelectionAlg.h | 8 ++++----
.../EventUtils/src/ParticleSortingAlg.cxx | 4 ----
.../EventUtils/src/ParticleSortingAlg.h | 10 +++-------
.../EventUtils/src/ParticleSortingTool.cxx | 11 +++--------
.../EventUtils/src/ParticleSortingTool.h | 8 +++-----
6 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
index 9d6958eb67f..899ada0f482 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
@@ -12,8 +12,6 @@
// EventUtils includes
#include "ParticleSelectionAlg.h"
-// STL includes
-
// FrameWork includes
#include "Gaudi/Property.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
@@ -57,7 +55,6 @@
#include "xAODCutFlow/CutBookkeeperContainer.h"
#include "xAODCutFlow/CutBookkeeperAuxContainer.h"
-
///////////////////////////////////////////////////////////////////
// Public methods:
///////////////////////////////////////////////////////////////////
@@ -229,7 +226,7 @@ StatusCode ParticleSelectionAlg::start()
// Now, register one CutBookkeeper per cut that will be applied.
// For each of the registered tools, get the TAccept and ask it for all known cuts.
for ( std::size_t toolIdx=0; toolIdx < m_selTools.size(); ++toolIdx ){
- const ToolHandle<IAsgSelectionTool>& tool = m_selTools[toolIdx];
+ const TooHandle<IAsgSelectionTool>& tool = m_selTools[toolIdx];
// Fill the index bookkeeping at what index in the CutBookkeeperContainer
// the CutBookkeepers for this tool start.
m_selToolIdxOffset.push_back( cutBKCont->size() );
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h
index 55ba90ca3b1..b5acec334ad 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h
@@ -11,10 +11,6 @@
#ifndef EVENTUTILS_PARTICLESELECTIONALG_H
#define EVENTUTILS_PARTICLESELECTIONALG_H 1
-// STL includes
-#include <string>
-#include <vector>
-
// FrameWork includes
#include "GaudiKernel/ToolHandle.h"
// #include "GaudiKernel/ServiceHandle.h"
@@ -24,6 +20,10 @@
//#include "TrigDecisionTool/TrigDecisionTool.h"
#include "PATCore/IAsgSelectionTool.h"
+// STL includes
+#include <string>
+#include <vector>
+
// // Forward declarations
// namespace Trig{
// class TrigDecisionTool;
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
index 9f76e24362c..f5ad85275d7 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
@@ -12,15 +12,11 @@
// EventUtils includes
#include "ParticleSortingAlg.h"
-// STL includes
-
// FrameWork includes
#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
-
-
///////////////////////////////////////////////////////////////////
// Public methods:
///////////////////////////////////////////////////////////////////
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
index 5edbd3c45d2..763f04c952c 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
@@ -11,24 +11,20 @@
#ifndef EVENTUTILS_PARTICLESORTINGALG_H
#define EVENTUTILS_PARTICLESORTINGALG_H 1
-// STL includes
-#include <string>
-
// FrameWork includes
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
+// STL includes
+#include <string>
-// forward declarations
+// Forward declarations
class IJobOptionsSvc;
namespace DerivationFramework {
class IAugmentationTool;
}
-
-
-
class ParticleSortingAlg
: public ::AthAlgorithm
{
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.cxx
index f6be2697dd2..fa1702c32ef 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.cxx
@@ -9,16 +9,9 @@
// Author: Karsten Koeneke <karsten.koeneke@cern.ch>
///////////////////////////////////////////////////////////////////
-
// EventUtils includes
#include "ParticleSortingTool.h"
-// STL includes
-#include <vector>
-#include <string>
-
-// FrameWork includes
-
// EDM includes
#include "xAODBase/IParticle.h"
#include "xAODBase/IParticleContainer.h"
@@ -36,7 +29,9 @@
#include "xAODCaloEvent/CaloClusterContainer.h"
#include "AthContainers/ConstDataVector.h"
-
+// STL includes
+#include <vector>
+#include <string>
// Constructors
////////////////
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.h
index 96c68cd5b6c..4fb4ebe5b34 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingTool.h
@@ -11,10 +11,6 @@
#ifndef EVENTUTILS_PARTICLESORTINGTOOL_H
#define EVENTUTILS_PARTICLESORTINGTOOL_H 1
-// STL includes
-#include <vector>
-#include <string>
-
// FrameWork includes
#include "AthenaBaseComps/AthAlgTool.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
@@ -25,7 +21,9 @@
#include "xAODBase/IParticleContainer.h"
#include "AthContainers/ConstDataVector.h"
-
+// STL includes
+#include <vector>
+#include <string>
class ParticleSortingTool
: virtual public ::DerivationFramework::IAugmentationTool,
--
GitLab