From 3696e87cc3b95488d30e6b8897c2717601ef70d2 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 4 Nov 2020 11:20:41 +0100
Subject: [PATCH] tauRec: cmake cleanup
Remove unused `tauRecLib` and move headers to `src` directory. Cleanup
cmake configuration.
---
Reconstruction/tauRec/CMakeLists.txt | 30 ++++---------------
.../tauRec/src/ClusterCellRelinkAlg.cxx | 2 +-
.../{tauRec => src}/ClusterCellRelinkAlg.h | 0
.../tauRec/src/TauCellThinningAlg.cxx | 2 +-
.../{tauRec => src}/TauCellThinningAlg.h | 0
Reconstruction/tauRec/src/TauProcessorAlg.cxx | 2 +-
.../tauRec/{tauRec => src}/TauProcessorAlg.h | 0
Reconstruction/tauRec/src/TauRunnerAlg.cxx | 2 +-
.../tauRec/{tauRec => src}/TauRunnerAlg.h | 0
.../tauRec/src/components/tauRec_entries.cxx | 8 ++---
10 files changed, 13 insertions(+), 33 deletions(-)
rename Reconstruction/tauRec/{tauRec => src}/ClusterCellRelinkAlg.h (100%)
rename Reconstruction/tauRec/{tauRec => src}/TauCellThinningAlg.h (100%)
rename Reconstruction/tauRec/{tauRec => src}/TauProcessorAlg.h (100%)
rename Reconstruction/tauRec/{tauRec => src}/TauRunnerAlg.h (100%)
diff --git a/Reconstruction/tauRec/CMakeLists.txt b/Reconstruction/tauRec/CMakeLists.txt
index 58efb544278..6358a9be007 100644
--- a/Reconstruction/tauRec/CMakeLists.txt
+++ b/Reconstruction/tauRec/CMakeLists.txt
@@ -1,37 +1,17 @@
-################################################################################
-# Package: tauRec
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( tauRec )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- GaudiKernel
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- PhysicsAnalysis/AnalysisCommon/ParticleEvent
- Reconstruction/tauRecTools
- PRIVATE
- Reconstruction/tauEvent )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
# Component(s) in the package:
-atlas_add_library( tauRecLib
- src/*.cxx
- PUBLIC_HEADERS tauRec
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry ParticleEvent tauRecToolsLib CaloEvent xAODCaloEvent CaloUtilsLib
- PRIVATE_LINK_LIBRARIES tauEvent )
-
atlas_add_component( tauRec
+ src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel ParticleEvent tauRecToolsLib CaloEvent xAODCaloEvent CaloUtilsLib tauEvent tauRecLib )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps CaloEvent CaloInterfaceLib CaloUtilsLib GaudiKernel InDetReadoutGeometry NavFourMom StoreGateLib TRT_ReadoutGeometry tauRecToolsLib xAODCaloEvent xAODCore xAODJet xAODPFlow xAODParticleEvent xAODTau xAODTracking )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Reconstruction/tauRec/src/ClusterCellRelinkAlg.cxx b/Reconstruction/tauRec/src/ClusterCellRelinkAlg.cxx
index 6d27dbea8eb..3ec7b97d9d5 100644
--- a/Reconstruction/tauRec/src/ClusterCellRelinkAlg.cxx
+++ b/Reconstruction/tauRec/src/ClusterCellRelinkAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
*/
-#include "tauRec/ClusterCellRelinkAlg.h"
+#include "ClusterCellRelinkAlg.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
#include "xAODCaloEvent/CaloClusterAuxContainer.h"
diff --git a/Reconstruction/tauRec/tauRec/ClusterCellRelinkAlg.h b/Reconstruction/tauRec/src/ClusterCellRelinkAlg.h
similarity index 100%
rename from Reconstruction/tauRec/tauRec/ClusterCellRelinkAlg.h
rename to Reconstruction/tauRec/src/ClusterCellRelinkAlg.h
diff --git a/Reconstruction/tauRec/src/TauCellThinningAlg.cxx b/Reconstruction/tauRec/src/TauCellThinningAlg.cxx
index 15dcd85b8e4..83f32876faa 100644
--- a/Reconstruction/tauRec/src/TauCellThinningAlg.cxx
+++ b/Reconstruction/tauRec/src/TauCellThinningAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
*/
-#include "tauRec/TauCellThinningAlg.h"
+#include "TauCellThinningAlg.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/ThinningHandle.h"
#include "xAODCaloEvent/CaloCluster.h"
diff --git a/Reconstruction/tauRec/tauRec/TauCellThinningAlg.h b/Reconstruction/tauRec/src/TauCellThinningAlg.h
similarity index 100%
rename from Reconstruction/tauRec/tauRec/TauCellThinningAlg.h
rename to Reconstruction/tauRec/src/TauCellThinningAlg.h
diff --git a/Reconstruction/tauRec/src/TauProcessorAlg.cxx b/Reconstruction/tauRec/src/TauProcessorAlg.cxx
index 43136600269..0a904f8fa93 100644
--- a/Reconstruction/tauRec/src/TauProcessorAlg.cxx
+++ b/Reconstruction/tauRec/src/TauProcessorAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "tauRec/TauProcessorAlg.h"
+#include "TauProcessorAlg.h"
#include "xAODTau/TauJetAuxContainer.h"
#include "xAODTau/TauTrackAuxContainer.h"
#include "xAODCaloEvent/CaloClusterAuxContainer.h"
diff --git a/Reconstruction/tauRec/tauRec/TauProcessorAlg.h b/Reconstruction/tauRec/src/TauProcessorAlg.h
similarity index 100%
rename from Reconstruction/tauRec/tauRec/TauProcessorAlg.h
rename to Reconstruction/tauRec/src/TauProcessorAlg.h
diff --git a/Reconstruction/tauRec/src/TauRunnerAlg.cxx b/Reconstruction/tauRec/src/TauRunnerAlg.cxx
index d7c255f922c..fe7655a9536 100644
--- a/Reconstruction/tauRec/src/TauRunnerAlg.cxx
+++ b/Reconstruction/tauRec/src/TauRunnerAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "tauRec/TauRunnerAlg.h"
+#include "TauRunnerAlg.h"
#include "xAODJet/Jet.h"
#include "xAODJet/JetContainer.h"
diff --git a/Reconstruction/tauRec/tauRec/TauRunnerAlg.h b/Reconstruction/tauRec/src/TauRunnerAlg.h
similarity index 100%
rename from Reconstruction/tauRec/tauRec/TauRunnerAlg.h
rename to Reconstruction/tauRec/src/TauRunnerAlg.h
diff --git a/Reconstruction/tauRec/src/components/tauRec_entries.cxx b/Reconstruction/tauRec/src/components/tauRec_entries.cxx
index 53f12d8ea3b..b95afa30f2c 100644
--- a/Reconstruction/tauRec/src/components/tauRec_entries.cxx
+++ b/Reconstruction/tauRec/src/components/tauRec_entries.cxx
@@ -1,7 +1,7 @@
-#include "tauRec/TauProcessorAlg.h"
-#include "tauRec/TauRunnerAlg.h"
-#include "tauRec/TauCellThinningAlg.h"
-#include "tauRec/ClusterCellRelinkAlg.h"
+#include "../TauProcessorAlg.h"
+#include "../TauRunnerAlg.h"
+#include "../TauCellThinningAlg.h"
+#include "../ClusterCellRelinkAlg.h"
DECLARE_COMPONENT( TauProcessorAlg )
DECLARE_COMPONENT( TauRunnerAlg )
--
GitLab