From ef5ee15113810342dd48d98b34c639e47bcdc6f5 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Mon, 12 Oct 2020 15:37:42 +0200
Subject: [PATCH] cmake cleanup, add missing FASTJETCONTRIB include and
dependency
---
.../JetSubStructureMomentTools/CMakeLists.txt | 30 +++----------------
.../Root/NSubjettinessTool.cxx | 5 +++-
2 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt b/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt
index e7d097fec6e..d51d10d5413 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt
@@ -1,33 +1,11 @@
-################################################################################
-# Package: JetSubStructureMomentTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetSubStructureMomentTools )
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
- set( extra_deps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODJet
- Reconstruction/Jet/JetInterface
- Reconstruction/Jet/JetRec
- PRIVATE
- Control/CxxUtils
- Event/xAOD/xAODMuon
- Reconstruction/Jet/JetEDM
- Reconstruction/Jet/JetSubStructureUtils
- ${extra_deps} )
-
# External dependencies:
find_package( FastJet )
+find_package( FastJetContrib COMPONENTS Nsubjettiness EnergyCorrelator )
find_package( ROOT COMPONENTS Core Hist )
# Component(s) in the package:
@@ -42,9 +20,9 @@ endif()
atlas_add_library( JetSubStructureMomentToolsLib
JetSubStructureMomentTools/*.h Root/*.cxx ${extra_srcs}
PUBLIC_HEADERS JetSubStructureMomentTools
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${FASTJETCONTRIB_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS}
LINK_LIBRARIES AsgTools xAODCaloEvent xAODJet JetInterface JetRecLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${FASTJET_LIBRARIES} xAODMuon CxxUtils
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${FASTJETCONTRIB_LIBRARIES} ${FASTJET_LIBRARIES} xAODMuon CxxUtils
JetEDM JetSubStructureUtils ${extra_libs} )
if( NOT XAOD_STANDALONE )
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/Root/NSubjettinessTool.cxx b/Reconstruction/Jet/JetSubStructureMomentTools/Root/NSubjettinessTool.cxx
index 3999d0d7909..c69f7d9305c 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/Root/NSubjettinessTool.cxx
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/Root/NSubjettinessTool.cxx
@@ -6,7 +6,10 @@
#include "JetSubStructureUtils/Nsubjettiness.h"
#include "CxxUtils/ubsan_suppress.h"
-NSubjettinessTool::NSubjettinessTool(std::string name) :
+#include "fastjet/contrib/Nsubjettiness.hh"
+#include "fastjet/contrib/AxesDefinition.hh"
+
+NSubjettinessTool::NSubjettinessTool(std::string name) :
JetSubStructureMomentToolsBase(name)
{
declareProperty("Alpha", m_Alpha = 1.0);
--
GitLab