From fed25c78d4b9e6b8345242f1118f02d01a7d6363 Mon Sep 17 00:00:00 2001
From: Vakho Tsulaia <vakhtang.tsulaia@cern.ch>
Date: Sat, 28 Nov 2020 05:49:33 +0100
Subject: [PATCH] Cleanup of duplicate includes (CommissionRec, GeoModel,
ForwardDetectors and LWHists)
Partially addresses ATEAM-677
---
Commission/CommissionRec/src/ComTimeRec.cxx | 4 ----
.../GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx | 4 ----
DetectorDescription/GeoModelXml/src/MakeElement.cxx | 1 -
.../AFP_LocReco/AFP_LocReco/AFP_SIDLocReco.h | 9 ---------
.../ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx | 10 ----------
.../ALFA/ALFA_Ntuple/ALFA_Ntuple/ALFA_Ntuple.h | 5 -----
.../ALFA_GloRec/ALFA_GloRec/ALFA_GloRec.h | 3 ---
.../ALFA_GloRec/share/glorecplots.C | 1 -
ForwardDetectors/FPTracker/src/Point.cxx | 1 -
ForwardDetectors/FPTracker/src/TransversePoint.cxx | 1 -
.../FPTracker/src/getAlfaMagnetConfigFiles.cxx | 1 -
.../FPTracker/src/getMagnetConfigFiles.cxx | 1 -
.../ZDC/ZdcAnalysis/tools/ZDCTreeAnalysis.C | 6 ------
.../ZdcByteStream/ZdcByteStreamRawDataV2.h | 2 --
ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx | 7 -------
.../ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx | 1 -
Tools/LWHists/src/FlexBinChunk.icc | 2 --
17 files changed, 59 deletions(-)
diff --git a/Commission/CommissionRec/src/ComTimeRec.cxx b/Commission/CommissionRec/src/ComTimeRec.cxx
index 7d3d63ee312..fc82bd90879 100755
--- a/Commission/CommissionRec/src/ComTimeRec.cxx
+++ b/Commission/CommissionRec/src/ComTimeRec.cxx
@@ -10,13 +10,9 @@
#include "CommissionEvent/ComTime.h"
-// #include "TrackRecord/TimedTrackRecordCollection.h"
-// #include "TrackRecord/TimedTrackRecord.h"
#include "TrackRecord/TrackRecordCollection.h"
#include "TrackRecord/TrackRecord.h"
-#include "CLHEP/Units/SystemOfUnits.h"
-
#include <algorithm>
//----------------------------------------------------------------
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx b/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx
index e1cb4ef40a8..33de1a7d6d2 100644
--- a/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx
@@ -10,10 +10,6 @@
* Based on GeoAccessVolumeAction.
*/
-
-#include "GeoModelUtilities/GeoVisitVolumes.h"
-
-
#include "GeoModelUtilities/GeoVisitVolumes.h"
#include "GeoModelKernel/GeoNameTag.h"
#include "GeoModelKernel/GeoSerialDenominator.h"
diff --git a/DetectorDescription/GeoModelXml/src/MakeElement.cxx b/DetectorDescription/GeoModelXml/src/MakeElement.cxx
index c12e1fe38f7..e37ceffd214 100644
--- a/DetectorDescription/GeoModelXml/src/MakeElement.cxx
+++ b/DetectorDescription/GeoModelXml/src/MakeElement.cxx
@@ -6,7 +6,6 @@
#include <xercesc/dom/DOM.hpp>
#include "GeoModelKernel/RCBase.h"
#include "GeoModelKernel/Units.h"
-#include "GeoModelKernel/Units.h"
#include "GeoModelKernel/GeoElement.h"
#include "GeoModelXml/translate.h"
#include "GeoModelXml/GmxUtil.h"
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocReco.h b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocReco.h
index b12b42b015b..6729f8efdad 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocReco.h
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/AFP_LocReco/AFP_SIDLocReco.h
@@ -12,7 +12,6 @@
#include <vector>
#include <fstream>
-//#include "GaudiKernel/Algorithm.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ObjectVector.h"
@@ -31,12 +30,6 @@
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
-//#include "AFP_RawEv/AFP_RawData.h"
-//#include "AFP_RawEv/AFP_RawDataContainer.h"
-//#include "AFP_RawEv/AFP_RawDataCollection.h"
-//#include "AFP_RawEv/AFP_SIDDigitCollection.h"
-//#include "AFP_RawEv/AFP_TDDigitCollection.h"
-
#include "AFP_Geometry/AFP_constants.h"
#include "AFP_Geometry/AFP_Geometry.h"
#include "AFP_Geometry/AFP_ConfigParams.h"
@@ -45,8 +38,6 @@
#include "AFP_DigiEv/AFP_SiDigiCollection.h"
#include "AFP_LocRecoEv/AFP_SIDLocRecoEvCollection.h"
-//#include "AFP_LocRecoEv/AFP_SIDLocRecoEvCollection.h"
-
#include "AFP_LocReco/AFP_UserObjects.h"
#include "AFP_LocReco/AFP_SIDBasicKalman.h"
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
index d3274fe48e8..ad5c86de060 100644
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
+++ b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
@@ -14,13 +14,6 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "GeneratorObjects/McEventCollection.h"
-
-
-
-
// FrameWork includes
#include "GaudiKernel/ITHistSvc.h"
#include "Gaudi/Property.h"
@@ -48,9 +41,6 @@ ALFA_BeamTransport::ALFA_BeamTransport(const std::string& name, ISvcLocator* pSv
:
AthAlgorithm(name,pSvcLocator)
{
- // template for property decalration
- //declareProperty("PropertyName", m_propertyName);
-
declareProperty("ConfDir", m_FPConfig.ConfDir="./config");
declareProperty("UseALFA", m_FPConfig.UseALFA=true);
declareProperty("Debug", m_WriteDebugOutput=false);
diff --git a/ForwardDetectors/ALFA/ALFA_Ntuple/ALFA_Ntuple/ALFA_Ntuple.h b/ForwardDetectors/ALFA/ALFA_Ntuple/ALFA_Ntuple/ALFA_Ntuple.h
index d6b02c64227..470cd17eff1 100644
--- a/ForwardDetectors/ALFA/ALFA_Ntuple/ALFA_Ntuple/ALFA_Ntuple.h
+++ b/ForwardDetectors/ALFA/ALFA_Ntuple/ALFA_Ntuple/ALFA_Ntuple.h
@@ -7,8 +7,6 @@
#include "AthenaBaseComps/AthHistogramAlgorithm.h"
-//#include "GaudiKernel/Algorithm.h"
-//#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/StoreGateSvc.h"
#include "AthenaKernel/IIOVSvc.h"
@@ -16,7 +14,6 @@
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
-//#include "CoralBase/Blob.h"
#include <string>
#include <iostream>
@@ -44,8 +41,6 @@
#include "TF1.h"
#include "TLatex.h"
#include "TList.h"
-
-#include "TMath.h"
#include "TMathBase.h"
//for truth particles
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/ALFA_GloRec/ALFA_GloRec.h b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/ALFA_GloRec/ALFA_GloRec.h
index a05aa65651c..f29ee724702 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/ALFA_GloRec/ALFA_GloRec.h
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/ALFA_GloRec/ALFA_GloRec.h
@@ -15,14 +15,12 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <dirent.h>
-//#include "typeinfo.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/Algorithm.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/Kernel.h"
-//#include "GaudiKernel/PropertyCallbackFunctor.h"
#include "StoreGate/StoreGateSvc.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
@@ -61,7 +59,6 @@
#include "TGraph.h"
#include "TApplication.h"
#include "TH2F.h"
-#include "TCanvas.h"
#include "TPad.h"
#include "TObjArray.h"
#include "TObjString.h"
diff --git a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/glorecplots.C b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/glorecplots.C
index 46cc8e6d1e2..16473dd08af 100644
--- a/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/glorecplots.C
+++ b/ForwardDetectors/ALFA/ALFA_Reconstruction/ALFA_GloRec/share/glorecplots.C
@@ -17,7 +17,6 @@
#include <cstdlib>
#include <stdio.h>
#include <string>
-#include <iostream>
#include <fstream>
#include <ctype.h>
diff --git a/ForwardDetectors/FPTracker/src/Point.cxx b/ForwardDetectors/FPTracker/src/Point.cxx
index f3084da4dd8..5a277b32f2e 100644
--- a/ForwardDetectors/FPTracker/src/Point.cxx
+++ b/ForwardDetectors/FPTracker/src/Point.cxx
@@ -7,7 +7,6 @@
#include <sstream>
#include <cmath>
#include <stdexcept>
-#include <sstream>
#include <iomanip>
namespace FPTracker{
Point::Point():m_x(0.), m_y(0.), m_z(0.){
diff --git a/ForwardDetectors/FPTracker/src/TransversePoint.cxx b/ForwardDetectors/FPTracker/src/TransversePoint.cxx
index 64a93feb5f8..cb8cf072783 100644
--- a/ForwardDetectors/FPTracker/src/TransversePoint.cxx
+++ b/ForwardDetectors/FPTracker/src/TransversePoint.cxx
@@ -7,7 +7,6 @@
#include <cmath>
#include <iomanip>
#include <stdexcept>
-#include <sstream>
namespace FPTracker{
TransversePoint::TransversePoint():m_x(0.), m_y(0.){
}
diff --git a/ForwardDetectors/FPTracker/src/getAlfaMagnetConfigFiles.cxx b/ForwardDetectors/FPTracker/src/getAlfaMagnetConfigFiles.cxx
index 4a8ffdb6c7a..f11606bfd52 100644
--- a/ForwardDetectors/FPTracker/src/getAlfaMagnetConfigFiles.cxx
+++ b/ForwardDetectors/FPTracker/src/getAlfaMagnetConfigFiles.cxx
@@ -7,7 +7,6 @@
#include "FPTracker/SimpleLogger.h"
#include "../src/openFile.tpl"
#include <sstream>
-#include <sstream>
#include <stdexcept>
namespace FPTracker{
diff --git a/ForwardDetectors/FPTracker/src/getMagnetConfigFiles.cxx b/ForwardDetectors/FPTracker/src/getMagnetConfigFiles.cxx
index ea4adeb61f4..9d0cbafa56f 100644
--- a/ForwardDetectors/FPTracker/src/getMagnetConfigFiles.cxx
+++ b/ForwardDetectors/FPTracker/src/getMagnetConfigFiles.cxx
@@ -7,7 +7,6 @@
#include "FPTracker/SimpleLogger.h"
#include "../src/openFile.tpl"
#include <sstream>
-#include <sstream>
#include <iostream>
#include <stdexcept>
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCTreeAnalysis.C b/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCTreeAnalysis.C
index 223f0137777..0153fc93c00 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCTreeAnalysis.C
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/tools/ZDCTreeAnalysis.C
@@ -8,10 +8,6 @@
#include <algorithm>
#include <cmath>
-#include <TH2.h>
-#include <TStyle.h>
-#include <TCanvas.h>
-
#include <TH2.h>
#include <TStyle.h>
#include <TCanvas.h>
@@ -21,8 +17,6 @@
#include <TLatex.h>
#include <TPaveStats.h>
-#include <cmath>
-
template <typename T> T Sqr(const T& inT) {return inT*inT;}
void ZDCTreeAnalysis::InitInternal()
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamRawDataV2.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamRawDataV2.h
index b9c63fc5f0b..7794d763919 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamRawDataV2.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamRawDataV2.h
@@ -29,8 +29,6 @@ class StatusCode;
class ZdcDigits;
class ZdcDigitsCollection;
-#include "xAODTrigL1Calo/TriggerTowerContainer.h"
-
class ZdcByteStreamRawDataV2: public AthReentrantAlgorithm
{
public:
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx
index 0b2fbe8312e..b2a0d03ccbf 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelTool.cxx
@@ -22,22 +22,15 @@
#include <math.h>
-//#include <gsl/gsl_errno.h>
-//#include <gsl/gsl_spline.h>
-
#include "TMath.h"
-//#include "Identifier/HWIdentifier.h"
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/MsgStream.h"
-
-
#include "ZdcEvent/ZdcDigits.h"
#include "ZdcEvent/ZdcDigitsCollection.h"
#include "ZdcRec/ZdcRecChannelTool.h"
#include "ZdcRec/ZdcSignalSinc.h"
-//#include "ZdcIdentifier/ZdcID.h"
#include "ZdcIdentifier/ZdcID.h"
#include "ZdcConditions/ZdcCablingService.h"
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
index 4ce9f9be544..7feaba6ec0e 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
@@ -32,7 +32,6 @@
#include "ZdcByteStream/ZdcToString.h"
-//#include "ZdcIdentifier/ZdcID.h"
#include "ZdcIdentifier/ZdcID.h"
#include "ZdcConditions/ZdcCablingService.h"
diff --git a/Tools/LWHists/src/FlexBinChunk.icc b/Tools/LWHists/src/FlexBinChunk.icc
index 1b046bfe81e..b06694a7acb 100644
--- a/Tools/LWHists/src/FlexBinChunk.icc
+++ b/Tools/LWHists/src/FlexBinChunk.icc
@@ -9,8 +9,6 @@
#define FLEXBINCHUNK_ALLCHARSTAGE (static_cast<uint32_t>(0x55555555))
#define FLEXBINCHUNK_ALLSHORTSTAGE (static_cast<uint32_t>(0xAAAAAAAA))
-#include <cmath>
-
template <class T> inline unsigned FlexBinChunk_stageByType() { return 0x3; }
template <> inline unsigned FlexBinChunk_stageByType<uint8_t>() { return 0x1; }
template <> inline unsigned FlexBinChunk_stageByType<uint16_t>() { return 0x2; }
--
GitLab