From 97f5a62eb82eebcdd1e73032c7d3fbbb8598a3f6 Mon Sep 17 00:00:00 2001
From: Nicolas Koehler <nicolas.koehler@cern.ch>
Date: Wed, 25 Nov 2020 12:04:36 +0000
Subject: [PATCH] Remove duplicated includes from MuonSpectrometer packages
---
.../scripts/chi2validation_x.cpp | 2 --
.../scripts/combineUnbiasedResPlots_x.cpp | 1 -
.../scripts/muontrackplots_x.cpp | 1 -
.../MuonAlignExample/scripts/plotCorr.C | 1 -
.../scripts/unbiasedResPlots_x.cpp | 1 -
.../src/TGCcablingServerSvc.cxx | 6 ------
.../MuonMDT_Cabling/MuonMDT_CablingSvc.h | 13 ++-----------
.../MdtCalibData/src/MdtRtRelation.cxx | 3 +--
.../MdtCalibRt/src/RtCalibrationAnalytic.cxx | 2 --
.../MdtCalibRt/src/RtCalibrationCurved.cxx | 2 --
.../MdtCalibT0/MdtCalibT0/T0CalibrationMT.h | 19 ++-----------------
.../MdtCalibUtils/RtData_t_r_reso.h | 1 -
.../src/ExtraTreeTrackFillerTool.cxx | 1 -
.../MuonCalibExtendedSegment.h | 1 -
.../src/EventHandler.cxx | 1 -
.../src/MuonCalibExtendedRawHits.cxx | 3 +--
.../src/MuonEventNtupleBranch.cxx | 1 -
.../MdtCalibIOSvc/MdtCalibOutputDbSvc.h | 2 --
.../src/RegionSelectionSvc.cxx | 1 -
.../MuonCSC_CnvTools/src/CscRDO_Decoder.h | 5 -----
.../src/MdtPrepDataContainerCnv.cxx | 4 +---
.../test/MuonSegmentCnv_p2_test.cxx | 3 +--
.../MuonJiveXML/TrigRpcDataRetriever.h | 5 -----
.../MuonRPC_CnvTools/src/RpcROD_Decoder.cxx | 2 --
.../MuonCondAlg/src/MdtCalibDbAlg.cxx | 1 -
.../MuonCondData/CscCondDataCollectionBase.h | 13 +++----------
.../MuonCondData/MuonCondData/CscCondDbData.h | 1 -
.../MuonCondData/MuonCondData/MdtCondDbData.h | 1 -
.../MuonCondData/MuonCondData/RpcCondDbData.h | 3 +--
.../MuonCondData/MuonCondData/TgcCondDbData.h | 3 +--
.../MuonCondSvc/CSC_DCSConditionsSvc.h | 2 --
.../MuonCondSvc/MDT_DCSConditionsRun2Svc.h | 2 --
.../MuonCondSvc/MDT_DCSConditionsSvc.h | 2 --
.../MuonCondSvc/MuonCondSvc/MdtCoolStrSvc.h | 2 +-
.../MuonCondSvc/RPC_DCSConditionsSvc.h | 2 --
.../MuonCondSvc/RPC_STATUSConditionsSvc.h | 2 --
.../MuonCondSvc/RPC_TriggerSvc_test.h | 2 --
.../MuonCondSvc/MuonCondSvc/RpcStatusDbSvc.h | 5 +----
.../MuonAGDD/src/MuonAGDDToolHelper.cxx | 1 -
.../src/CscReadoutElement.cxx | 3 ---
.../src/RpcReadoutElement.cxx | 1 -
.../src/CSC_RegionSelectorTable.cxx | 1 -
.../src/MDT_RegionSelectorTable.cxx | 1 -
.../src/MM_RegionSelectorTable.cxx | 1 -
.../src/TGC_RegionSelectorTable.cxx | 7 +------
.../src/sTGC_RegSelCondAlg.cxx | 6 ------
.../src/sTGC_RegionSelectorTable.cxx | 1 -
.../src/MuonStationBuilder.cxx | 6 ------
.../MM_ElectronicsResponseSimulation.h | 1 -
.../MM_StripsResponseSimulation.h | 1 -
.../src/MM_DigitizationTool.cxx | 7 -------
.../RPC_Digitization/RpcDigitizationTool.h | 3 ---
.../test/CheckDifferences.cxx | 16 +---------------
.../CscPeakThresholdClusterBuilderTool.cxx | 1 -
.../src/CscThresholdClusterBuilderTool.h | 3 ---
.../src/MuonTGMeasurementTool.cxx | 1 -
.../MuonLayerHough/src/LayerAnalysis.cxx | 1 -
.../src/MuonSegmentRegionRecoveryTool.h | 2 --
.../src/MuonTrackCleaner.h | 1 -
.../src/MuonTrackExtrapolationTool.cxx | 6 ------
.../src/MooCandidateMatchingTool.h | 2 --
.../src/MuPatCandidateTool.h | 1 -
.../src/MuonTrackSteering.cxx | 6 +-----
.../src/MuonTrackSteering.h | 2 --
.../TrackStateOnSurfaceComparisonFunction.h | 3 +--
.../src/DetailedMuonPatternTruthBuilder.cxx | 8 --------
.../src/DetailedMuonPatternTruthBuilder.h | 1 -
.../MMRawDataMonitoring/MMRawDataMonAlg.h | 1 -
.../MdtVsTgcRawDataValAlg.h | 1 -
.../MuonPRDTest/macros/NSWHitsTree.h | 4 +---
.../macros/NSWMatching_offline/NSWstudies.h | 9 ++-------
.../MuonTrackPerformanceAlg.h | 1 -
72 files changed, 22 insertions(+), 210 deletions(-)
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/chi2validation_x.cpp b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/chi2validation_x.cpp
index 894f7d73050..60e4294fe46 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/chi2validation_x.cpp
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/chi2validation_x.cpp
@@ -21,10 +21,8 @@
#include <TAxis.h>
#include "TFile.h"
#include "TH1F.h"
-#include "TStyle.h"
#include "TLine.h"
#include "TSystem.h"
-#include "TEventList.h"
#include "TMatrixD.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/combineUnbiasedResPlots_x.cpp b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/combineUnbiasedResPlots_x.cpp
index 1485dd76566..e1a0699d9ac 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/combineUnbiasedResPlots_x.cpp
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/combineUnbiasedResPlots_x.cpp
@@ -10,7 +10,6 @@
#include "TGraphErrors.h"
#include "TText.h"
#include "TLegend.h"
-#include "TF1.h"
#include "TChain.h"
#include "TPaveStats.h"
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/muontrackplots_x.cpp b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/muontrackplots_x.cpp
index 63d21254cc7..ef8b41cf98d 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/muontrackplots_x.cpp
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/muontrackplots_x.cpp
@@ -21,7 +21,6 @@
#include <TAxis.h>
#include "TFile.h"
#include "TH1F.h"
-#include "TStyle.h"
#include "TLine.h"
#include "TSystem.h"
#include "TH2F.h"
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/plotCorr.C b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/plotCorr.C
index 0d210ff4fa0..58474f7bf1f 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/plotCorr.C
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/plotCorr.C
@@ -10,7 +10,6 @@
#include "TGraphErrors.h"
#include "TText.h"
#include "TLegend.h"
-#include "TF1.h"
#include "TChain.h"
#include "TH2F.h"
#include "TProfile.h"
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/unbiasedResPlots_x.cpp b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/unbiasedResPlots_x.cpp
index 1a3aa685578..dddb507a461 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/unbiasedResPlots_x.cpp
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignExample/scripts/unbiasedResPlots_x.cpp
@@ -11,7 +11,6 @@
#include "TGraphErrors.h"
#include "TText.h"
#include "TLegend.h"
-#include "TF1.h"
#include "TChain.h"
#include "TPaveStats.h"
#include "TProfile.h"
diff --git a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
index 53ed1e7fb7b..c61391da535 100644
--- a/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
+++ b/MuonSpectrometer/MuonCablings/MuonCablingServers/src/TGCcablingServerSvc.cxx
@@ -5,14 +5,8 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/StatusCode.h"
-
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
-
#include "StoreGate/StoreGateSvc.h"
-
#include "MuonCablingServers/TGCcablingServerSvc.h"
-#include "GaudiKernel/MsgStream.h"
TGCcablingServerSvc::TGCcablingServerSvc(const std::string& name, ISvcLocator* sl) :
AthService( name, sl )
diff --git a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
index 771c38d822f..83770fdca77 100644
--- a/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
+++ b/MuonSpectrometer/MuonCablings/MuonMDT_Cabling/MuonMDT_Cabling/MuonMDT_CablingSvc.h
@@ -1,8 +1,7 @@
/*
- 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 MUONMDT_CABLING_MUONMDT_CABLINGSVC_H
#define MUONMDT_CABLING_MUONMDT_CABLINGSVC_H
@@ -11,15 +10,12 @@
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "AthenaKernel/IOVSvcDefs.h"
class MuonMDT_CablingMap;
class MdtMezzanineType;
class StoreGateSvc;
-//class IMDTcablingSvc;
class IMDTCablingDbTool;
class ITagInfoMgr;
-
class IdentifierHash;
#include <list>
@@ -27,12 +23,7 @@ class IdentifierHash;
static const InterfaceID IID_IMuonMDT_CablingSvc("MuonMDT_CablingSvc", 1, 0);
-
-
-class MuonMDT_CablingSvc : public AthService
- // virtual public IInterface,
-
-{
+class MuonMDT_CablingSvc : public AthService {
public:
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/MdtRtRelation.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/MdtRtRelation.cxx
index d5d532d063a..1f270f71030 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/MdtRtRelation.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData/src/MdtRtRelation.cxx
@@ -1,12 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MdtCalibData/IRtRelation.h"
#include "MdtCalibData/IRtResolution.h"
#include "MdtCalibData/TrRelation.h"
#include "MdtCalibData/MdtRtRelation.h"
-#include "MdtCalibData/TrRelation.h"
namespace MuonCalib {
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationAnalytic.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationAnalytic.cxx
index 1a3c8c07f56..c8bde808be2 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationAnalytic.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationAnalytic.cxx
@@ -37,8 +37,6 @@
#include "MdtCalibRt/RtParabolicExtrapolation.h"
#include "MdtCalibData/RtFromPoints.h"
#include "MdtCalibData/IRtRelation.h"
-#include "MdtCalibData/RtRelationLookUp.h"
-#include "MdtCalibRt/RtCalibrationOutput.h"
#include "MdtCalibInterfaces/IMdtCalibrationOutput.h"
#include "MuonCalibEventBase/MuonCalibSegment.h"
#include "MuonCalibMath/BaseFunction.h"
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationCurved.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationCurved.cxx
index 009f4ca9c93..58794f6b268 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationCurved.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibRt/src/RtCalibrationCurved.cxx
@@ -37,9 +37,7 @@
#include "MdtCalibRt/AdaptiveResidualSmoothing.h"
#include "MdtCalibInterfaces/IMdtCalibrationOutput.h"
#include "MdtCalibData/IRtRelation.h"
-#include "MdtCalibData/RtRelationLookUp.h"
#include "MdtCalibData/RtScaleFunction.h"
-#include "MdtCalibRt/RtCalibrationOutput.h"
#include "MdtCalibFitters/CurvedPatRec.h"
#include "MuonCalibEventBase/MuonCalibSegment.h"
#include "MuonCalibMath/BaseFunction.h"
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/MdtCalibT0/T0CalibrationMT.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/MdtCalibT0/T0CalibrationMT.h
index 709c49b5453..2f0b52808fa 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/MdtCalibT0/T0CalibrationMT.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/MdtCalibT0/T0CalibrationMT.h
@@ -1,17 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// T0CalibrationMT.h
-// Header file for class T0CalibrationMT
-///////////////////////////////////////////////////////////////////
-// (c) ATLAS Detector software
-///////////////////////////////////////////////////////////////////
-//
-///////////////////////////////////////////////////////////////////
-
#ifndef T0CALIBRATIONMT_H
#define T0CALIBRATIONMT_H
+
#include <iostream>
#include <string>
#include <vector>
@@ -20,12 +13,7 @@
#include "MdtCalibInterfaces/IMdtCalibration.h"
#include "MdtCalibData/MdtTubeFitContainer.h"
-#include "MdtCalibData/MdtTubeFitContainer.h"
#include "MuonCalibStandAloneBase/NtupleStationId.h"
-//#include "T0MTSettings.h"
-//#include "T0MTHistos.h"
-//#include "ADCMTHistos.h"
-//#include "HistogramId.h"
class TH1;
class TFile;
@@ -42,9 +30,6 @@ class T0ADCHistos;
class ADCMTHistos;
class HistogramId;
class MdtRelativeTubeT0;
-//class MdtTubeFitContainer;
-
-
/**@class T0CalibrationMT
Implementation of a T0 calibration using the MT approach.
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtData_t_r_reso.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtData_t_r_reso.h
index db61b0b4813..0fa9c32b975 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtData_t_r_reso.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtData_t_r_reso.h
@@ -7,7 +7,6 @@
#include <iostream>
#include <vector>
-#include <iostream>
namespace MuonCalib {
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/ExtraTreeTrackFillerTool.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/ExtraTreeTrackFillerTool.cxx
index 2574566541d..5fe2aeca076 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/ExtraTreeTrackFillerTool.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeAlg/src/ExtraTreeTrackFillerTool.cxx
@@ -22,7 +22,6 @@
#include "TrkDetElementBase/TrkDetElementBase.h"
#include "TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrack.h"
#include "TrkMeasurementBase/MeasurementBase.h"
-#include "TrkTrack/Track.h"
#include "TrkParameters/TrackParameters.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
#include "TrkEventPrimitives/ParamDefs.h"
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedSegment.h b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedSegment.h
index c2958702910..bfdcdbb0651 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedSegment.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedSegment.h
@@ -9,7 +9,6 @@
#include "MuonCalibExtraTreeEvent/MuonCalibTrackSummary.h"
#include "MuonCalibExtraUtils/MuonCalibLayerMapping.h"
-#include "MuonCalibEventBase/MuonCalibSegment.h"
#include "MuonCalibExtraTreeEvent/MuonCalibRawHitAssociationMap.h"
#include "CxxUtils/checker_macros.h"
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx
index 57932cef852..63602131f43 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx
@@ -23,7 +23,6 @@
#include "MuonCalibEventBase/MuonCalibPattern.h"
#include "MuonCalibEventBase/MuonCalibSegment.h"
#include "MuonCalibEventBase/MuonCalibRawHitCollection.h"
-#include "MuonCalibEventBase/MuonCalibTruthCollection.h"
#include "MuonCalibStl/DeleteObject.h"
#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/getMessageSvc.h"
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedRawHits.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedRawHits.cxx
index 34bb0434b3b..c4a41fcff3d 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedRawHits.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedRawHits.cxx
@@ -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
*/
#include "MuonCalibExtraTreeEvent/MuonCalibExtendedRawHits.h"
@@ -17,7 +17,6 @@
#include "MuonCalibExtraUtils/MuonFixedIdPrinter.h"
#include "MuonCalibExtraUtils/MuonFixedIdManipulator.h"
-#include "MuonCalibExtraUtils/MuonFixedIdPrinter.h"
#include <sstream>
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonEventNtupleBranch.cxx b/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonEventNtupleBranch.cxx
index ab5786a9cd0..609bfd4c253 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonEventNtupleBranch.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibNtuple/src/MuonEventNtupleBranch.cxx
@@ -10,7 +10,6 @@
//other packages
#include "CLHEP/Vector/ThreeVector.h"
#include "TTree.h"
-#include "TString.h"
// std packages
#include <iostream>
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/MdtCalibIOSvc/MdtCalibOutputDbSvc.h b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/MdtCalibIOSvc/MdtCalibOutputDbSvc.h
index 75e7b981669..bd860ed1156 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/MdtCalibIOSvc/MdtCalibOutputDbSvc.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/MdtCalibIOSvc/MdtCalibOutputDbSvc.h
@@ -43,8 +43,6 @@ namespace MuonCalib {
class IRtResolution;
class MdtTubeFitContainer;
}
-//class CalibDBCoral;
-#include "MdtCalibUtils/RtDataFromFile.h"
// interface to enable retrieving of a pointer to the singleton //
const InterfaceID IID_IMdtCalibOutputDbSvc("MdtCalibOutputDbSvc", 1, 0);
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionSelectionSvc.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionSelectionSvc.cxx
index d7f012df626..a8b7aa1c476 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionSelectionSvc.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionSelectionSvc.cxx
@@ -23,7 +23,6 @@
#include "TTree.h"
#include "TFile.h"
#include "TDirectory.h"
-#include "TTree.h"
#include "TKey.h"
using namespace MuonCalib;
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRDO_Decoder.h b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRDO_Decoder.h
index 405c511f94a..896ae449d7a 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRDO_Decoder.h
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscRDO_Decoder.h
@@ -11,12 +11,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-
#include "CSCcabling/CSCcablingSvc.h"
-
-#include "GaudiKernel/ServiceHandle.h"
-#include "CSCcabling/CSCcablingSvc.h"
-
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include <inttypes.h>
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx
index 67caf1c1dbd..a2525cc73c0 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/src/MdtPrepDataContainerCnv.cxx
@@ -1,11 +1,9 @@
/*
- 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 "MdtPrepDataContainerCnv.h"
-#include "MdtPrepDataContainerCnv.h"
-
// Gaudi
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSegmentCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSegmentCnv_p2_test.cxx
index ed5291264dd..0e6dbaf06c0 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSegmentCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/MuonSegmentCnv_p2_test.cxx
@@ -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
*/
// $Id$
@@ -18,7 +18,6 @@
#include "TrkEventPrimitives/FitQuality.h"
#include "TrkEventPrimitives/CurvilinearUVT.h"
#include "TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrack.h"
-#include "TrkEventTPCnv/SegmentCollectionCnv_tlp3.h"
#include "TestTools/leakcheck.h"
#include "TestTools/FLOATassert.h"
#include "GaudiKernel/MsgStream.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonJiveXML/MuonJiveXML/TrigRpcDataRetriever.h b/MuonSpectrometer/MuonCnv/MuonJiveXML/MuonJiveXML/TrigRpcDataRetriever.h
index b9e8f7dd1f2..f7e27ea3647 100644
--- a/MuonSpectrometer/MuonCnv/MuonJiveXML/MuonJiveXML/TrigRpcDataRetriever.h
+++ b/MuonSpectrometer/MuonCnv/MuonJiveXML/MuonJiveXML/TrigRpcDataRetriever.h
@@ -8,18 +8,13 @@
#include <string>
#include "JiveXML/IDataRetriever.h"
-
#include "AthenaBaseComps/AthAlgTool.h"
-
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "MuonReadoutGeometry/RpcReadoutElement.h"
#include "MuonRPC_CnvTools/IRPC_RDO_Decoder.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-
-#include "GaudiKernel/ServiceHandle.h"
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
-
#include "RPC_CondCabling/RpcCablingCondData.h"
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.cxx b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.cxx
index 55336736a6b..2befd4acdc5 100755
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcROD_Decoder.cxx
@@ -4,8 +4,6 @@
#include "RpcROD_Decoder.h"
-#include <algorithm>
-
#include <deque>
#include <vector>
#include <utility>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
index 8365ca781ac..7f9b8e53613 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
@@ -35,7 +35,6 @@
#include "MdtCalibData/BFieldCorFunc.h"
#include "MdtCalibData/WireSagCorFunc.h"
#include "MdtCalibData/MdtSlewCorFuncHardcoded.h"
-#include "MdtCalibData/CalibFunc.h"
#include "GaudiKernel/PhysicalConstants.h"
//TODO: use smart pointers
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDataCollectionBase.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDataCollectionBase.h
index 8b46e52202a..41fe3500f0f 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDataCollectionBase.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDataCollectionBase.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 CSCCONDDATACOLLECTIONBASE_H
@@ -13,20 +13,13 @@
Exists so that CscCondDataCollection objects of different types can be stored in the same vector, map, etc.
**/
-#include <sstream>
+
#include "AthContainers/DataVector.h"
#include "StoreGate/DataHandle.h"
-//#include "AthenaKernel/CLASS_DEF.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "MuonCondData/CscCondData.h"
-#include <sstream>
-class CondAttrListCollection;
-/*
-namespace std {
-typedef istringstream;
-}
- */
+#include <sstream>
namespace MuonCalib {
class CscCondDataCollectionBase
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDbData.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDbData.h
index 733d0af094a..40d27267e79 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDbData.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDbData.h
@@ -140,7 +140,6 @@ public:
};
CLASS_DEF( CscCondDbData, 10742890, 1)
-#include "AthenaKernel/CondCont.h"
CLASS_DEF( CondCont<CscCondDbData>, 43297256, 0)
#endif
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/MdtCondDbData.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/MdtCondDbData.h
index 8f8b09372ec..5c7fbf920d9 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/MdtCondDbData.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/MdtCondDbData.h
@@ -105,7 +105,6 @@ private:
};
CLASS_DEF( MdtCondDbData, 58088442, 1)
-#include "AthenaKernel/CondCont.h"
CLASS_DEF( CondCont<MdtCondDbData>, 62077248, 0)
#endif
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/RpcCondDbData.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/RpcCondDbData.h
index 8bb33673eae..521d934614c 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/RpcCondDbData.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/RpcCondDbData.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 MUONCONDDATA_RPCCONDDBDATA_H
@@ -120,7 +120,6 @@ public:
};
CLASS_DEF( RpcCondDbData, 25128902, 1)
-#include "AthenaKernel/CondCont.h"
CLASS_DEF( CondCont<RpcCondDbData>, 178635428, 0)
#endif
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/TgcCondDbData.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/TgcCondDbData.h
index 8660cc8d806..7c767e5b1c9 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/TgcCondDbData.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/TgcCondDbData.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 MUONCONDDATA_TGCCONDDBDATA_H
@@ -49,7 +49,6 @@ private:
};
CLASS_DEF( TgcCondDbData, 130737053, 1)
-#include "AthenaKernel/CondCont.h"
CLASS_DEF( CondCont<TgcCondDbData>, 178252645, 0)
#endif
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/CSC_DCSConditionsSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/CSC_DCSConditionsSvc.h
index c53cda4c93b..2f99c415b62 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/CSC_DCSConditionsSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/CSC_DCSConditionsSvc.h
@@ -14,10 +14,8 @@
#include "MuonCondInterface/ICSC_DCSConditionsTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/ServiceHandle.h"
#include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/IIOVDbSvc.h"
#include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsRun2Svc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsRun2Svc.h
index 74e287b8151..fd39b9800ec 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsRun2Svc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsRun2Svc.h
@@ -14,10 +14,8 @@
#include "MuonCondInterface/IMDT_DCSConditionsRun2Tool.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/ServiceHandle.h"
#include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/IIOVDbSvc.h"
#include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsSvc.h
index 1ea00c5723f..af72a04a36c 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MDT_DCSConditionsSvc.h
@@ -14,10 +14,8 @@
#include "MuonCondInterface/IMDT_DCSConditionsTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/ServiceHandle.h"
#include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/IIOVDbSvc.h"
#include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MdtCoolStrSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MdtCoolStrSvc.h
index 0f025daa0f6..d9aceb68644 100755
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MdtCoolStrSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/MdtCoolStrSvc.h
@@ -11,7 +11,7 @@
#include "AthenaBaseComps/AthService.h"
#include "MuonCondInterface/MdtICoolStrSvc.h"
-#include "GaudiKernel/Service.h"
+
namespace MuonCalib {
class MdtCoolStrSvc : public AthService, virtual MdtICoolStrSvc
{
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_DCSConditionsSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_DCSConditionsSvc.h
index ed944a6c07e..4878ac3d39f 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_DCSConditionsSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_DCSConditionsSvc.h
@@ -14,10 +14,8 @@
#include "MuonCondInterface/IRPC_DCSConditionsTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/ServiceHandle.h"
#include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/IIOVDbSvc.h"
#include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_STATUSConditionsSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_STATUSConditionsSvc.h
index c6455825d4d..8f7e0dcb400 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_STATUSConditionsSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_STATUSConditionsSvc.h
@@ -14,10 +14,8 @@
#include "MuonCondInterface/IRpcDetectorStatusDbTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/ServiceHandle.h"
#include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/IIOVDbSvc.h"
#include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_TriggerSvc_test.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_TriggerSvc_test.h
index e582c4e3f3a..dac0a12776f 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_TriggerSvc_test.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RPC_TriggerSvc_test.h
@@ -14,10 +14,8 @@
#include "MuonCondInterface/IRPC_TriggerSvc_test.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaKernel/IOVSvcDefs.h"
-#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/ServiceHandle.h"
#include "MuonCondSvc/MuonHierarchy.h"
-#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/IIOVDbSvc.h"
#include <vector>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RpcStatusDbSvc.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RpcStatusDbSvc.h
index fe0006a6f6e..9187420bf0f 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RpcStatusDbSvc.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/MuonCondSvc/RpcStatusDbSvc.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 MUONCONDSVC_RPCSTATUSDBSVC_H
@@ -12,9 +12,6 @@
#include "AthenaBaseComps/AthService.h"
#include "MuonCondInterface/IRpcDetectorStatusDbTool.h"
-//#include "MuonCondData/RpcCalibDataContainer.h"
-//#include "MuonCondData/RpcStripStatus.h"
-
class IIOVSvc;
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
index 0606e2b108e..4b205e39d39 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
@@ -20,7 +20,6 @@
#include "AGDDKernel/AliasStore.h"
#include "AGDDKernel/AGDDDetector.h"
#include "AGDDKernel/AGDDDetectorStore.h"
-#include "AGDD2GeoSvc/IAGDD2GeoSvc.h"
#include "RDBAccessSvc/IRDBAccessSvc.h"
#include "RDBAccessSvc/IRDBRecord.h"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx
index 1d59c4e3715..7d84ed60da0 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/CscReadoutElement.cxx
@@ -7,9 +7,6 @@
#include "MuonIdHelpers/CscIdHelper.h"
#include "GeoModelKernel/GeoPhysVol.h"
#include "GeoModelKernel/GeoFullPhysVol.h"
-
-#include "MuonAlignmentData/CscInternalAlignmentPar.h"
-
#include "TrkSurfaces/PlaneSurface.h"
#include "TrkSurfaces/TrapezoidBounds.h"
#include "TrkSurfaces/RotatedTrapezoidBounds.h"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx
index a5587a3c158..eca19e25dda 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx
@@ -15,7 +15,6 @@
#include "GaudiKernel/MsgStream.h"
#include "TrkSurfaces/PlaneSurface.h"
#include "TrkSurfaces/RectangleBounds.h"
-#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/getMessageSvc.h"
#include <TString.h> // for Form
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
index 9019b39bc19..faee8bc20a0 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/CSC_RegionSelectorTable.cxx
@@ -17,7 +17,6 @@
#include "MuonReadoutGeometry/RpcReadoutSet.h"
#include "MuonReadoutGeometry/MuonStation.h"
#include "CSCcabling/CSCcablingSvc.h"
-#include "RegSelLUT/RegSelSiLUT.h"
#include <iostream>
#include <vector>
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
index f1586dae8b3..c4ae68c060c 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MDT_RegionSelectorTable.cxx
@@ -16,7 +16,6 @@
#include "MuonReadoutGeometry/TgcReadoutElement.h"
#include "MuonReadoutGeometry/RpcReadoutSet.h"
#include "MuonReadoutGeometry/MuonStation.h"
-#include "RegSelLUT/RegSelSiLUT.h"
#include "MuonMDT_Cabling/MuonMDT_CablingSvc.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx
index 3e5567f828f..f8a07484ce9 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/MM_RegionSelectorTable.cxx
@@ -14,7 +14,6 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#include "MuonAGDDDescription/MMDetectorHelper.h"
#include "MuonAGDDDescription/MMDetectorDescription.h"
#include "MuonReadoutGeometry/MuonStation.h"
-#include "RegSelLUT/RegSelSiLUT.h"
#include <iostream>
#include <vector>
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
index 0bdbfe59bb1..8edafe06a46 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/TGC_RegionSelectorTable.cxx
@@ -5,11 +5,6 @@
#include "MuonRegionSelector/TGC_RegionSelectorTable.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "Identifier/IdentifierHash.h"
-
-#include <iostream>
-#include <fstream>
-#include <string>
-
#include "RegSelLUT/StoreGateIDRS_ClassDEF.h"
#include "RegSelLUT/RegSelModule.h"
#include "RegSelLUT/RegSelSiLUT.h"
@@ -17,12 +12,12 @@
#include "MuonReadoutGeometry/MuonReadoutElement.h"
#include "MuonReadoutGeometry/TgcReadoutElement.h"
#include "MuonReadoutGeometry/MuonStation.h"
-#include "RegSelLUT/RegSelSiLUT.h"
#include "MuonTGC_Cabling/MuonTGC_CablingSvc.h"
#include <iostream>
#include <vector>
#include <fstream>
+#include <string>
TGC_RegionSelectorTable::TGC_RegionSelectorTable(const std::string& type,
const std::string& name,
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx
index 5a93655c60d..65195f93172 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegSelCondAlg.cxx
@@ -32,12 +32,6 @@
#include "MuonReadoutGeometry/MuonStation.h"
-#include "RegSelLUT/RegSelSiLUT.h"
-
-
-/// not implemented yet
-/// #include "Muon_sTGC_Cabling/MuonMM_CablingSvc.h"
-
#include "sTGC_RegSelCondAlg.h"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx
index 7c6f9604d8d..2688f15610d 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonRegionSelector/src/sTGC_RegionSelectorTable.cxx
@@ -19,7 +19,6 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#include "MuonAGDDDescription/sTGCDetectorHelper.h"
#include "MuonAGDDDescription/sTGCDetectorDescription.h"
#include "MuonReadoutGeometry/MuonStation.h"
-#include "RegSelLUT/RegSelSiLUT.h"
#include <iostream>
#include <vector>
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
index 3102d20636f..030cf625672 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationBuilder.cxx
@@ -51,12 +51,6 @@
#include "GeoModelKernel/GeoPgon.h"
#include "GeoModelKernel/GeoPara.h"
#include "GeoModelKernel/GeoVolumeCursor.h"
-#include "GeoModelKernel/GeoShape.h"
-#include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/GeoShapeSubtraction.h"
-#include "GeoModelKernel/GeoBox.h"
-#include "GeoModelKernel/GeoTrd.h"
-#include "GeoModelKernel/GeoVolumeCursor.h"
#include <map>
#include <fstream>
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h
index 299bb496dd7..d3ba9e0f0c8 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_ElectronicsResponseSimulation.h
@@ -33,7 +33,6 @@
#include <iomanip>
#include <utility>
#include <string>
-#include <sstream>
#include <sys/stat.h>
#include <memory>
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
index 5ffebecd268..4907d9584be 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripsResponseSimulation.h
@@ -49,7 +49,6 @@ Comments to be added here...
#include <iomanip>
#include <utility>
#include <string>
-#include <sstream>
#include <sys/stat.h>
class MM_DigitToolInput;
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
index 381bdf51888..b950d26cebf 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
@@ -36,15 +36,8 @@
#include "MuonSimEvent/MicromegasHitIdHelper.h"
#include "TrkDetDescrUtils/GeometryStatics.h"
#include "TrkEventPrimitives/LocalDirection.h"
-#include "TrkSurfaces/Surface.h"
#include "PathResolver/PathResolver.h"
#include "AIDA/IHistogram1D.h"
-#include "MuonReadoutGeometry/MuonDetectorManager.h"
-#include "MuonReadoutGeometry/MMReadoutElement.h"
-#include "MuonReadoutGeometry/MuonChannelDesign.h"
-#include "MuonSimEvent/MicromegasHitIdHelper.h"
-#include "TrkDetDescrUtils/GeometryStatics.h"
-#include "TrkEventPrimitives/LocalDirection.h"
#include "TrkSurfaces/Surface.h"
//Truth
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h b/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h
index fa8b740b62f..96cf97e6051 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/RPC_Digitization/RpcDigitizationTool.h
@@ -1,5 +1,3 @@
-/* -*- C++ -*- */
-
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -47,7 +45,6 @@
#include "MuonSimEvent/RPCSimHit.h"
#include "MuonSimEvent/RPCSimHitCollection.h"
#include "HitManagement/TimedHitCollection.h"
-#include "MuonSimData/MuonSimDataCollection.h"
#include "MuonCondInterface/IRPCConditionsSvc.h"
#include "MuonCondData/RpcCondDbData.h"
diff --git a/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx b/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
index a16c23eac12..5d867fd7771 100644
--- a/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
+++ b/MuonSpectrometer/MuonGeoModelTest/test/CheckDifferences.cxx
@@ -1,24 +1,12 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include <fstream>
#include <iostream>
#include <string>
-//use the method defined at: http://annwm.lbl.gov/~leggett/Atlas/gcc-3.2.html
-// #ifdef HAVE_NEW_IOSTREAMS
-// #include <sstream>
-// typedef std::istringstream my_isstream;
-
-// #else
-// #include <strstream>
-// typedef strstream my_isstream;
-// #endif
-
#include <sstream>
typedef std::istringstream my_isstream;
-
-
#include <cmath>
#include <cassert>
@@ -27,8 +15,6 @@ typedef std::istringstream my_isstream;
//#define print_level 2 //info
#define print_level 3 //summary
-//
-
typedef enum iost {READ, WRITE} IOMaterialMap;
class Record
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
index 28befc2018e..c0bb9978b6e 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
@@ -2,7 +2,6 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// CscPeakThresholdClusterBuilderTool.cxx
#include "CscPeakThresholdClusterBuilderTool.h"
#include <sstream>
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.h b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.h
index 19f0b7b312d..6e44b57442c 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.h
@@ -2,8 +2,6 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// CscThresholdClusterBuilderTool.h
-
#ifndef CscThresholdClusterBuilderTool_H
#define CscThresholdClusterBuilderTool_H
@@ -62,7 +60,6 @@
#include "MuonPrepRawData/MuonPrepDataContainer.h"
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "CscClusterization/ICscClusterBuilder.h"
-#include "MuonPrepRawData/CscPrepDataContainer.h"
class ICscCalibTool;
class ICscStripFitter;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx
index 79bf4a14128..21389582bf0 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/src/MuonTGMeasurementTool.cxx
@@ -8,7 +8,6 @@
#include "TrkEventPrimitives/ParamDefs.h"
#include "TrkEventPrimitives/ParticleHypothesis.h"
#include "TrkEventPrimitives/FitQualityOnSurface.h"
-#include "TrkParameters/TrackParameters.h"
#include "TrkMeasurementBase/MeasurementBase.h"
#include "TrkSurfaces/DistanceSolution.h"
#include "TrkGeometry/Layer.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx
index 832a3480b4a..e7d857f7f07 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx
@@ -18,7 +18,6 @@
#include "TH1F.h"
#include "TH2F.h"
#include "TFile.h"
-#include "TTree.h"
#include "TStyle.h"
#include "TVector3.h"
#include <set>
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h
index 08a3ba94637..cc99d1a403c 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h
@@ -16,7 +16,6 @@
#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
#include "MuonRecToolInterfaces/IMuonHoleRecoveryTool.h"
#include "MuonRecToolInterfaces/IMuonTrackSegmentMatchingTool.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
#include "MuonRecToolInterfaces/IMdtDriftCircleOnTrackCreator.h"
#include "MuonRecToolInterfaces/IMuonClusterOnTrackCreator.h"
@@ -30,7 +29,6 @@
#include "MuidInterfaces/ICombinedMuonTrackBuilder.h"
#include "MuonChamberHoleRecoveryTool.h"
#include "MuonRecToolInterfaces/IMuonSeededSegmentFinder.h"
-#include "MuonChamberHoleRecoveryTool.h"
#include "IRegionSelector/IRegSelTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.h
index 2c9ca258f27..f6e86b22a97 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackCleaner.h
@@ -17,7 +17,6 @@
#include "MuonRecToolInterfaces/IMuonCompetingClustersOnTrackCreator.h"
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
#include "TrkFitterInterfaces/ITrackFitter.h"
#include "TrkExInterfaces/IExtrapolator.h"
#include "TrkToolInterfaces/IResidualPullCalculator.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx
index 37f5ba4f9d1..3fb1331cb3d 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackExtrapolationTool.cxx
@@ -5,18 +5,12 @@
#include "MuonTrackExtrapolationTool.h"
#include "MuonTrackMakerUtils/MuonTSOSHelper.h"
-
#include "TrkMeasurementBase/MeasurementBase.h"
#include "TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrack.h"
-
#include "TrkSurfaces/PerigeeSurface.h"
#include "TrkSurfaces/DistanceSolution.h"
-
#include "TrkTrack/TrackStateOnSurface.h"
#include "TrkTrack/Track.h"
-
-#include "TrkSurfaces/PerigeeSurface.h"
-
#include "TrkGeometry/TrackingVolume.h"
#include "TrkGeometry/TrackingGeometry.h"
#include "TrkGeometry/MagneticFieldProperties.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooCandidateMatchingTool.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooCandidateMatchingTool.h
index 0126b69d8ec..63a85c9d75a 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooCandidateMatchingTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooCandidateMatchingTool.h
@@ -15,7 +15,6 @@
#include "CxxUtils/checker_macros.h"
#include "EventPrimitives/EventPrimitives.h"
#include "GeoPrimitives/GeoPrimitives.h"
-// For magneticfield
#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
#include "MuonRecToolInterfaces/IMuonTrackSegmentMatchingTool.h"
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
@@ -23,7 +22,6 @@
#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
#include "MuonTrackMakerUtils/SortMeasurementsByPosition.h"
#include "MuonSegmentMakerToolInterfaces/IMuonSegmentMatchingTool.h"
-#include "MuonRecToolInterfaces/IMuonTrackSegmentMatchingTool.h"
#include "TrkExInterfaces/IExtrapolator.h"
#include "MuPatCandidateTool.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h
index cd3457a486d..d4943d12c82 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuPatCandidateTool.h
@@ -8,7 +8,6 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "AthenaKernel/SlotSpecificObj.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
#include "MuonTrackMakerUtils/MuonTrackMakerStlTools.h"
#include "TrkParameters/TrackParameters.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx
index c94eb116f07..b44dc2b6880 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.cxx
@@ -2,19 +2,15 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
#include "MuonTrackSteering.h"
-#include "MuonTrackSteeringStrategy.h"
+#include "MuonTrackSteeringStrategy.h"
#include "MuonSegment/MuonSegment.h"
#include "MuonSegment/MuonSegmentCombination.h"
-
#include "MuPatSegment.h"
#include "MuPatCandidateBase.h"
#include "MuPatTrack.h"
#include "MuonTrackMakerUtils/MuonTrackMakerStlTools.h"
-
-#include "MuonSegment/MuonSegment.h"
#include "TrkSegment/SegmentCollection.h"
#include "TrkTrack/TrackCollection.h"
#include "TrkParameters/TrackParameters.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.h
index 2c3fd2efb20..1907efe70c6 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MuonTrackSteering.h
@@ -18,8 +18,6 @@
#include "TrkParameters/TrackParameters.h"
#include "TrkTrack/TrackCollection.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
-
#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
#include "MuonSegmentMakerToolInterfaces/IMuonSegmentInOverlapResolvingTool.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/TrackStateOnSurfaceComparisonFunction.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/TrackStateOnSurfaceComparisonFunction.h
index afcd86070c2..30da57d158d 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/TrackStateOnSurfaceComparisonFunction.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerUtils/MuonTrackMakerUtils/TrackStateOnSurfaceComparisonFunction.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
*/
///////////////////////////////////////////////////////////////////
@@ -23,7 +23,6 @@
#include "TrkSurfaces/DiscSurface.h"
// extra-maths for cylinder intersections
#include "TrkSurfaces/CylinderSurface.h"
-#include "TrkSurfaces/CylinderSurface.h"
#include "TrkSurfaces/SurfaceBounds.h"
#include "TrkSurfaces/RectangleBounds.h"
#include "TrkSurfaces/TrapezoidBounds.h"
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.cxx b/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.cxx
index 5fea6adda78..7d23f3df3c4 100755
--- a/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.cxx
@@ -29,25 +29,17 @@
#include "MuonPrepRawData/MMPrepData.h"
#include "MuonPrepRawData/sTgcPrepData.h"
#include "TrkParameters/TrackParameters.h"
-#include "TrkTrack/Track.h"
#include "TrkFitterInterfaces/ITrackFitter.h"
#include "TrkExInterfaces/IExtrapolator.h"
#include "TrkSurfaces/PerigeeSurface.h"
#include "TrkDetElementBase/TrkDetElementBase.h"
-#include "TrkPrepRawData/PrepRawData.h"
-#include "TrkMeasurementBase/MeasurementBase.h"
-#include "TrkRIO_OnTrack/RIO_OnTrack.h"
#include "TrkPseudoMeasurementOnTrack/PseudoMeasurementOnTrack.h"
#include "TrackRecord/TrackRecordCollection.h"
#include "MuonRIO_OnTrack/MdtDriftCircleOnTrack.h"
#include "MuonRIO_OnTrack/MuonClusterOnTrack.h"
#include "MuonRIO_OnTrack/MMClusterOnTrack.h"
-#include "MuonPrepRawData/MdtPrepData.h"
-#include "MuonPrepRawData/MMPrepData.h"
-#include "MuonPrepRawData/sTgcPrepData.h"
#include "MuonPrepRawData/MuonCluster.h"
#include "MuonSegment/MuonSegment.h"
-#include "AtlasHepMC/GenParticle.h"
#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
#include "MuonRecToolInterfaces/IMdtDriftCircleOnTrackCreator.h"
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.h b/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.h
index ed21b33141d..104b9073ccc 100755
--- a/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.h
+++ b/MuonSpectrometer/MuonTruthAlgs/src/DetailedMuonPatternTruthBuilder.h
@@ -19,7 +19,6 @@
#include "MuonPattern/MuonPatternCombinationCollection.h"
#include "MuonPattern/DetailedMuonPatternTruthCollection.h"
#include "TrkToolInterfaces/ITruthTrajectoryBuilder.h"
-#include "TrkTruthData/DetailedTrackTruth.h"
#include "TrkTruthData/DetailedSegmentTruth.h"
#include "TrkTruthData/SubDetHitStatistics.h"
#include "TrkTruthData/DetailedTrackTruthCollection.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonAlg.h
index d63ec4b5066..03eaa12834e 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonitoring/MMRawDataMonAlg.h
@@ -28,7 +28,6 @@
#include "AthenaMonitoring/DQAtlasReadyFilterTool.h"
#include "xAODTrigger/MuonRoIContainer.h"
#include "xAODMuon/MuonContainer.h"
-#include "MuonPrepRawData/MuonPrepDataContainer.h"
#include "MuonPrepRawData/MMPrepDataContainer.h"
#include "MuonPrepRawData/MMPrepData.h"
#include "StoreGate/ReadHandleKey.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataValAlg.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataValAlg.h
index b8486bf7653..41a4450e7fc 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataValAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataMonitoring/MdtVsTgcRawDataValAlg.h
@@ -24,7 +24,6 @@
#include "MuonReadoutGeometry/TgcReadoutElement.h"
#include "MuonTrigCoinData/TgcCoinData.h"
#include "MuonTrigCoinData/TgcCoinDataContainer.h"
-#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "xAODMuon/MuonSegmentContainer.h"
#include "StoreGate/ReadHandleKey.h"
#include "MuonPrepRawData/MdtPrepDataContainer.h"
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.h
index 6059b7113b1..148919f1b09 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWHitsTree.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
*/
//////////////////////////////////////////////////////////
@@ -18,8 +18,6 @@
// Header file for the classes stored in the TTree if any.
#include <vector>
-#include <vector>
-#include <vector>
// Fixed size dimensions of array or collections stored in the TTree if any.
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.h
index cf996ee2678..a76d356c141 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.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
*/
//////////////////////////////////////////////////////////
@@ -17,12 +17,7 @@
#include <TFile.h>
// Header file for the classes stored in the TTree if any.
-#include "vector"
-#include "vector"
-#include "vector"
-#include "vector"
-#include "vector"
-#include "vector"
+#include <vector>
class NSWstudies {
public :
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackPerformanceAlg.h b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackPerformanceAlg.h
index 29f9ff37fd9..8a51e1f90a7 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackPerformanceAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackPerformanceAlg.h
@@ -22,7 +22,6 @@
#include "MuonSimData/MuonSimDataCollection.h"
#include "MuonSimData/CscSimDataCollection.h"
#include "TrackRecord/TrackRecordCollection.h"
-#include "TrkTrack/TrackCollection.h"
#include "StoreGate/ReadHandleKey.h"
#include "GeneratorObjects/McEventCollection.h"
#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
--
GitLab