From 404adc5ab2cd8a9b2349e8a2162b784d6d40525d Mon Sep 17 00:00:00 2001
From: Nicolas Koehler <nicolas.koehler@cern.ch>
Date: Wed, 25 Nov 2020 15:39:12 +0000
Subject: [PATCH] Remove duplicated includes from muon packages

---
 Event/xAOD/xAODMuon/Root/Muon_v1.cxx                         | 2 --
 .../src/components/DerivationFrameworkMuons_entries.cxx      | 5 ++++-
 .../MuonAnalysisInterfaces/IMuonTriggerScaleFactors.h        | 1 -
 .../MuonMomentumCorrections/Regions.h                        | 3 ---
 .../MuonResonanceTools/Root/MuonResonancePlots.cxx           | 1 -
 .../MuonCombinedBaseTools/src/MuonSegmentTagTool.cxx         | 3 ---
 .../MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx   | 1 -
 Reconstruction/iPat/iPatTrackFitter/src/TrackFitter.cxx      | 3 +--
 8 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Event/xAOD/xAODMuon/Root/Muon_v1.cxx b/Event/xAOD/xAODMuon/Root/Muon_v1.cxx
index 05549747275..41c8f231a87 100644
--- a/Event/xAOD/xAODMuon/Root/Muon_v1.cxx
+++ b/Event/xAOD/xAODMuon/Root/Muon_v1.cxx
@@ -7,10 +7,8 @@
 
 // EDM include(s):
 #include "xAODCore/AuxStoreAccessorMacros.h"
-#include "xAODPrimitives/tools/getIsolationAccessor.h"
 #include "xAODTracking/TrackParticle.h"
 #include "xAODTracking/TrackSummaryAccessors_v1.h"
-
 #include "xAODPrimitives/tools/getIsolationAccessor.h"
 #include "xAODPrimitives/tools/getIsolationCorrectionAccessor.h"
 
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
index ba7662a3cb5..adb267e4f8d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
@@ -1,3 +1,7 @@
+/*
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
 #include "DerivationFrameworkMuons/dimuonTaggingTool.h"
 #include "DerivationFrameworkMuons/isolationDecorator.h"
 #include "DerivationFrameworkMuons/mcpDecorator.h"
@@ -7,7 +11,6 @@
 #include "DerivationFrameworkMuons/MuonJetDrTool.h"
 #include "DerivationFrameworkMuons/MuonTruthClassifierFallback.h"
 #include "DerivationFrameworkMuons/MuonTruthIsolationTool.h"
-#include "DerivationFrameworkMuons/MuonJetDrTool.h"
 #include "DerivationFrameworkMuons/MuonTPJpsiVertexFittingAlg.h"
 #include "DerivationFrameworkMuons/VertexDecoratorAlg.h"
 
diff --git a/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/MuonAnalysisInterfaces/IMuonTriggerScaleFactors.h b/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/MuonAnalysisInterfaces/IMuonTriggerScaleFactors.h
index 92ce4ec3a35..2610b5565a1 100644
--- a/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/MuonAnalysisInterfaces/IMuonTriggerScaleFactors.h
+++ b/PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces/MuonAnalysisInterfaces/IMuonTriggerScaleFactors.h
@@ -11,7 +11,6 @@
 #include "xAODMuon/Muon.h"
 #include "xAODMuon/MuonContainer.h"
 
-#include "PATInterfaces/CorrectionCode.h"
 #include <string>
 #include <vector>
 #include <map>
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/Regions.h b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/Regions.h
index bde501057bf..deba93525ca 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/Regions.h
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections/MuonMomentumCorrections/Regions.h
@@ -11,9 +11,6 @@
 #include "AsgMessaging/MessageCheck.h"
 
 ANA_MSG_HEADER(msgMMC)
-
-#include <AsgMessaging/MessageCheck.h>
-
 ANA_MSG_HEADER (msgMuonMomentumCorrections)
 
 class Regions{
diff --git a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/Root/MuonResonancePlots.cxx b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/Root/MuonResonancePlots.cxx
index 65367477477..d642245b8d9 100644
--- a/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/Root/MuonResonancePlots.cxx
+++ b/PhysicsAnalysis/MuonID/MuonPerformanceAnalysis/MuonResonanceTools/Root/MuonResonancePlots.cxx
@@ -4,7 +4,6 @@
 
 #include "MuonResonanceTools/MuonResonancePlots.h"
 #include "TLorentzVector.h"
-#include <iostream>
 #ifndef ROOTCORE
 #include "GaudiKernel/IToolSvc.h"
 #include "AthenaBaseComps/AthCheckMacros.h"
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonSegmentTagTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonSegmentTagTool.cxx
index cac554b54d0..23f42e6603d 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonSegmentTagTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonSegmentTagTool.cxx
@@ -23,12 +23,9 @@
 #include "MuonSegment/MuonSegment.h"
 #include "MSSurfaces.h"
 #include "MuonCombinedEvent/MuonSegmentInfo.h"
-#include "MuonCombinedEvent/SegmentTag.h"
 #include "xAODMuon/MuonSegmentContainer.h"
 #include "xAODMuon/MuonSegment.h"
 #include "AthLinks/ElementLink.h"
-#include "xAODMuon/MuonSegmentContainer.h"
-#include "xAODMuon/MuonSegment.h"
 #include "TrkCaloExtension/CaloExtension.h" 
 
 #include <iomanip>
diff --git a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx
index c2663c47ffb..78fe252974e 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedTrackFindingTools/src/MuonStauRecoTool.cxx
@@ -26,7 +26,6 @@
 #include "MdtCalibData/TrRelation.h"
 #include "MdtCalibData/IRtRelation.h"
 #include "MdtCalibData/IRtResolution.h"
-#include "EventPrimitives/EventPrimitivesHelpers.h"
 
 namespace MuonCombined {
 
diff --git a/Reconstruction/iPat/iPatTrackFitter/src/TrackFitter.cxx b/Reconstruction/iPat/iPatTrackFitter/src/TrackFitter.cxx
index 31453ef87a2..f3ac978a7f8 100755
--- a/Reconstruction/iPat/iPatTrackFitter/src/TrackFitter.cxx
+++ b/Reconstruction/iPat/iPatTrackFitter/src/TrackFitter.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
 */
 
 /***************************************************************************
@@ -13,7 +13,6 @@
 #include <cmath>
 #include <iomanip>
 #include "EventPrimitives/EventPrimitives.h"
-#include "EventPrimitives/EventPrimitives.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GeoPrimitives/GeoPrimitives.h"
 #include "TrkEventPrimitives/ParticleHypothesis.h"
-- 
GitLab