From 63cd85e6313da272b6e93cd13d940010d41ee654 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay <krasznaa@cern.ch> Date: Thu, 17 Mar 2016 13:38:03 +0100 Subject: [PATCH] Fixing a silly mistake in the CMakeLists.txt file (L1TopoAlgorithms-00-00-62) * Managed to make a silly typo in the previous tag. Is fixed now. (For some reason only the very latest CMake version complained about it.) * Tagging as L1TopoAlgorithms-00-00-62 2016-03-17 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch> * Cleaned the package's CMakeLists.txt file such that it wouldn't torpedo rebuilding parts of an installed offline release. * Tagging as L1TopoAlgorithms-00-00-61 2016-02-26 Stewart Martin-Haugh <smh@cern.ch> * Fix use of variable-length array with non-POD (ATR-13483) * L1TopoAlgorithms-00-00-60 2016-02-12 Stewart Martin-Haugh <smh@cern.ch> * Add custom CMakeLists.txt (ATR-13355) * L1TopoAlgorithms-00-00-59 --- .../L1Topo/L1TopoAlgorithms/CMakeLists.txt | 66 +++++++++++++++++++ .../L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx | 5 +- .../L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx | 5 +- .../L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx | 5 +- .../Root/InvariantMassInclusive1.cxx | 5 +- .../L1Topo/L1TopoAlgorithms/Root/JetHT.cxx | 5 +- .../L1TopoAlgorithms/Root/JetSimpleCone.cxx | 4 +- .../Root/MinDeltaPhiIncl2.cxx | 5 +- 8 files changed, 86 insertions(+), 14 deletions(-) create mode 100644 Trigger/TrigT1/L1Topo/L1TopoAlgorithms/CMakeLists.txt diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/CMakeLists.txt b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/CMakeLists.txt new file mode 100644 index 00000000000..f732df52dd4 --- /dev/null +++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/CMakeLists.txt @@ -0,0 +1,66 @@ +# $Id: CMakeLists.txt 730711 2016-03-17 13:37:39Z krasznaa $ +################################################################################ +# Package: L1TopoAlgorithms +################################################################################ + +# Declare the package name: +atlas_subdir( L1TopoAlgorithms ) + +# Declare the package's dependencies: +atlas_depends_on_subdirs( + PUBLIC + Trigger/TrigT1/L1Topo/L1TopoEvent + Trigger/TrigT1/L1Topo/L1TopoInterfaces + PRIVATE + Trigger/TrigT1/L1Topo/L1TopoSimulationUtils ) + +# External dependencies: +find_package( Boost ) +find_package( ROOT COMPONENTS Core Hist ) + +# Make sure that the executable of the package gets linked against all of its +# dependencies: +string( REPLACE "-Wl,--as-needed" "" CMAKE_EXE_LINKER_FLAGS + "${CMAKE_EXE_LINKER_FLAGS}" ) + +# The component(s) in the package: +atlas_add_library( L1TopoAlgorithms + L1TopoAlgorithms/*.h Root/*.cxx + PUBLIC_HEADERS L1TopoAlgorithms + PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} + LINK_LIBRARIES L1TopoEvent L1TopoInterfaces + PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} + L1TopoSimulationUtils ) + +atlas_add_executable( TrigConfL1TopoGenPyAlg + src/test/L1TopoGenPyAlg.cxx + LINK_LIBRARIES L1TopoAlgorithms ) + +# Install files from the package: +atlas_install_python_modules( python/*.py ) + +# In release recompilation mode only parse the following if the package is +# being rebuilt: +if( ATLAS_RELEASE_RECOMPILE_DRYRUN ) + return() +endif() +if( ATLAS_RELEASE_MODE AND NOT ATLAS_PACKAGE_RECOMPILE ) + return() +endif() + +# Create an auto-generated python description of the available algorithms: +add_custom_command( OUTPUT + ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/L1TopoAlgorithms/L1TopoAlgConfig.py + COMMAND ${CMAKE_COMMAND} -E make_directory + ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/L1TopoAlgorithms + COMMAND ${CMAKE_BINARY_DIR}/atlas_build_run.sh TrigConfL1TopoGenPyAlg + ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/L1TopoAlgorithms/L1TopoAlgConfig.py + DEPENDS TrigConfL1TopoGenPyAlg ) +add_custom_target( L1TopoPyGenAlg ALL SOURCES + ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/L1TopoAlgorithms/L1TopoAlgConfig.py ) +add_dependencies( Package_L1TopoAlgorithms L1TopoPyGenAlg ) + +# Install the auto-generated file: +install( FILES + ${CMAKE_PYTHON_OUTPUT_DIRECTORY}/L1TopoAlgorithms/L1TopoAlgConfig.py + DESTINATION ${CMAKE_INSTALL_PYTHONDIR}/L1TopoAlgorithms OPTIONAL ) diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx index a3ad9768297..10a6908a06e 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx +++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl1.cxx @@ -13,6 +13,7 @@ #include <string> #include <iostream> #include <sstream> +#include <vector> #include "TH1F.h" #include "L1TopoAlgorithms/DeltaEtaIncl1.h" @@ -95,8 +96,8 @@ TCS::DeltaEtaIncl1::initialize() { TRG_MSG_INFO("number output : " << numberOutputBits()); // create strings for histogram names - ostringstream MyAcceptHist[numberOutputBits()]; - ostringstream MyRejectHist[numberOutputBits()]; + vector<ostringstream> MyAcceptHist(numberOutputBits()); + vector<ostringstream> MyRejectHist(numberOutputBits()); for (unsigned int i=0;i<numberOutputBits();i++) { MyAcceptHist[i] << "Accept" << p_DeltaEtaMin[i] << "DEta"; diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx index 157788dd8a1..bbb691d73e8 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx +++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaEtaIncl2.cxx @@ -13,6 +13,7 @@ #include <string> #include <iostream> #include <sstream> +#include <vector> #include "TH1F.h" #include "L1TopoAlgorithms/DeltaEtaIncl2.h" @@ -92,8 +93,8 @@ TCS::DeltaEtaIncl2::initialize() { TRG_MSG_INFO("number output : " << numberOutputBits()); // create strings for histogram names - ostringstream MyAcceptHist[numberOutputBits()]; - ostringstream MyRejectHist[numberOutputBits()]; + vector<ostringstream> MyAcceptHist(numberOutputBits()); + vector<ostringstream> MyRejectHist(numberOutputBits()); for (unsigned int i=0;i<numberOutputBits();i++) { MyAcceptHist[i] << "Accept" << p_DeltaEtaMin[i] << "DEta"; diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx index edb45232d9b..dc0131b27b8 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx +++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/DeltaPhiIncl2.cxx @@ -13,6 +13,7 @@ #include <string> #include <iostream> #include <sstream> +#include <vector> #include "TH1F.h" #include "L1TopoAlgorithms/DeltaPhiIncl2.h" @@ -90,8 +91,8 @@ TCS::DeltaPhiIncl2::initialize() { TRG_MSG_INFO("number output : " << numberOutputBits()); // create strings for histogram names - ostringstream MyAcceptHist[numberOutputBits()]; - ostringstream MyRejectHist[numberOutputBits()]; + vector<ostringstream> MyAcceptHist(numberOutputBits()); + vector<ostringstream> MyRejectHist(numberOutputBits()); for (unsigned int i=0;i<numberOutputBits();i++) { MyAcceptHist[i] << "Accept" << p_DeltaPhiMin[i] << "DPHI" << p_DeltaPhiMax[i]; diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx index c378920bccd..13753402a3d 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx +++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/InvariantMassInclusive1.cxx @@ -12,6 +12,7 @@ #include <string> #include <iostream> #include <sstream> +#include <vector> #include "TH1F.h" #include "L1TopoAlgorithms/InvariantMassInclusive1.h" @@ -133,8 +134,8 @@ TCS::InvariantMassInclusive1::initialize() { TRG_MSG_INFO("number output : " << numberOutputBits()); // create strings for histogram names - ostringstream MyAcceptHist[numberOutputBits()]; - ostringstream MyRejectHist[numberOutputBits()]; + vector<ostringstream> MyAcceptHist(numberOutputBits()); + vector<ostringstream> MyRejectHist(numberOutputBits()); for (unsigned int i=0;i<numberOutputBits();i++) { MyAcceptHist[i] << "Accept" << sqrt(p_InvMassMin[i]) << "INVM"; diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx index 07a0dd7754c..d48b1d4fd76 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx +++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetHT.cxx @@ -12,6 +12,7 @@ #include <string> #include <iostream> #include <sstream> +#include <vector> #include "TH1F.h" #include "L1TopoAlgorithms/JetHT.h" @@ -68,8 +69,8 @@ TCS::JetHT::initialize() { TRG_MSG_INFO("number output : " << numberOutputBits()); // create strings for histogram names - ostringstream MyAcceptHist[numberOutputBits()]; - ostringstream MyRejectHist[numberOutputBits()]; + vector<ostringstream> MyAcceptHist(numberOutputBits()); + vector<ostringstream> MyRejectHist(numberOutputBits()); for (unsigned int i=0;i<numberOutputBits();i++) { MyAcceptHist[i] << "Accept" << p_HT[i] << "HT"; diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSimpleCone.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSimpleCone.cxx index 3a63c5ad8af..59c348dbb7d 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSimpleCone.cxx +++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/JetSimpleCone.cxx @@ -71,8 +71,8 @@ TCS::JetSimpleCone::initialize() { TRG_MSG_INFO("number output : " << numberOutputBits()); // create strings for histogram names - ostringstream MyAcceptHist[numberOutputBits()]; - ostringstream MyRejectHist[numberOutputBits()]; + vector<ostringstream> MyAcceptHist(numberOutputBits()); + vector<ostringstream> MyRejectHist(numberOutputBits()); for (unsigned int i=0;i<numberOutputBits();i++) { MyAcceptHist[i] << "Accept" << p_SimpleCone[i] << "SimpleCone"; diff --git a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx index 30a3361b7d9..31721d2f843 100644 --- a/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx +++ b/Trigger/TrigT1/L1Topo/L1TopoAlgorithms/Root/MinDeltaPhiIncl2.cxx @@ -11,6 +11,7 @@ #include <string> #include <iostream> #include <sstream> +#include <vector> #include <algorithm> #include "TH1F.h" @@ -92,8 +93,8 @@ TCS::MinDeltaPhiIncl2::initialize() { TRG_MSG_INFO("nummber output : " << numberOutputBits()); // create strings for histogram names - ostringstream MyAcceptHist[numberOutputBits()]; - ostringstream MyRejectHist[numberOutputBits()]; + vector<ostringstream> MyAcceptHist(numberOutputBits()); + vector<ostringstream> MyRejectHist(numberOutputBits()); for (unsigned int i=0;i< numberOutputBits();i++) { MyAcceptHist[i] << "Accept" << p_DeltaPhiMin[i] << "MinDPhi2"; -- GitLab