Skip to content
Snippets Groups Projects
Commit 63cd85e6 authored by Attila Krasznahorkay's avatar Attila Krasznahorkay Committed by Graeme Stewart
Browse files

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
parent 5ba0e221
No related branches found
No related tags found
No related merge requests found
# $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 )
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <vector>
#include "TH1F.h" #include "TH1F.h"
#include "L1TopoAlgorithms/DeltaEtaIncl1.h" #include "L1TopoAlgorithms/DeltaEtaIncl1.h"
...@@ -95,8 +96,8 @@ TCS::DeltaEtaIncl1::initialize() { ...@@ -95,8 +96,8 @@ TCS::DeltaEtaIncl1::initialize() {
TRG_MSG_INFO("number output : " << numberOutputBits()); TRG_MSG_INFO("number output : " << numberOutputBits());
// create strings for histogram names // create strings for histogram names
ostringstream MyAcceptHist[numberOutputBits()]; vector<ostringstream> MyAcceptHist(numberOutputBits());
ostringstream MyRejectHist[numberOutputBits()]; vector<ostringstream> MyRejectHist(numberOutputBits());
for (unsigned int i=0;i<numberOutputBits();i++) { for (unsigned int i=0;i<numberOutputBits();i++) {
MyAcceptHist[i] << "Accept" << p_DeltaEtaMin[i] << "DEta"; MyAcceptHist[i] << "Accept" << p_DeltaEtaMin[i] << "DEta";
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <vector>
#include "TH1F.h" #include "TH1F.h"
#include "L1TopoAlgorithms/DeltaEtaIncl2.h" #include "L1TopoAlgorithms/DeltaEtaIncl2.h"
...@@ -92,8 +93,8 @@ TCS::DeltaEtaIncl2::initialize() { ...@@ -92,8 +93,8 @@ TCS::DeltaEtaIncl2::initialize() {
TRG_MSG_INFO("number output : " << numberOutputBits()); TRG_MSG_INFO("number output : " << numberOutputBits());
// create strings for histogram names // create strings for histogram names
ostringstream MyAcceptHist[numberOutputBits()]; vector<ostringstream> MyAcceptHist(numberOutputBits());
ostringstream MyRejectHist[numberOutputBits()]; vector<ostringstream> MyRejectHist(numberOutputBits());
for (unsigned int i=0;i<numberOutputBits();i++) { for (unsigned int i=0;i<numberOutputBits();i++) {
MyAcceptHist[i] << "Accept" << p_DeltaEtaMin[i] << "DEta"; MyAcceptHist[i] << "Accept" << p_DeltaEtaMin[i] << "DEta";
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <vector>
#include "TH1F.h" #include "TH1F.h"
#include "L1TopoAlgorithms/DeltaPhiIncl2.h" #include "L1TopoAlgorithms/DeltaPhiIncl2.h"
...@@ -90,8 +91,8 @@ TCS::DeltaPhiIncl2::initialize() { ...@@ -90,8 +91,8 @@ TCS::DeltaPhiIncl2::initialize() {
TRG_MSG_INFO("number output : " << numberOutputBits()); TRG_MSG_INFO("number output : " << numberOutputBits());
// create strings for histogram names // create strings for histogram names
ostringstream MyAcceptHist[numberOutputBits()]; vector<ostringstream> MyAcceptHist(numberOutputBits());
ostringstream MyRejectHist[numberOutputBits()]; vector<ostringstream> MyRejectHist(numberOutputBits());
for (unsigned int i=0;i<numberOutputBits();i++) { for (unsigned int i=0;i<numberOutputBits();i++) {
MyAcceptHist[i] << "Accept" << p_DeltaPhiMin[i] << "DPHI" << p_DeltaPhiMax[i]; MyAcceptHist[i] << "Accept" << p_DeltaPhiMin[i] << "DPHI" << p_DeltaPhiMax[i];
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <vector>
#include "TH1F.h" #include "TH1F.h"
#include "L1TopoAlgorithms/InvariantMassInclusive1.h" #include "L1TopoAlgorithms/InvariantMassInclusive1.h"
...@@ -133,8 +134,8 @@ TCS::InvariantMassInclusive1::initialize() { ...@@ -133,8 +134,8 @@ TCS::InvariantMassInclusive1::initialize() {
TRG_MSG_INFO("number output : " << numberOutputBits()); TRG_MSG_INFO("number output : " << numberOutputBits());
// create strings for histogram names // create strings for histogram names
ostringstream MyAcceptHist[numberOutputBits()]; vector<ostringstream> MyAcceptHist(numberOutputBits());
ostringstream MyRejectHist[numberOutputBits()]; vector<ostringstream> MyRejectHist(numberOutputBits());
for (unsigned int i=0;i<numberOutputBits();i++) { for (unsigned int i=0;i<numberOutputBits();i++) {
MyAcceptHist[i] << "Accept" << sqrt(p_InvMassMin[i]) << "INVM"; MyAcceptHist[i] << "Accept" << sqrt(p_InvMassMin[i]) << "INVM";
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <vector>
#include "TH1F.h" #include "TH1F.h"
#include "L1TopoAlgorithms/JetHT.h" #include "L1TopoAlgorithms/JetHT.h"
...@@ -68,8 +69,8 @@ TCS::JetHT::initialize() { ...@@ -68,8 +69,8 @@ TCS::JetHT::initialize() {
TRG_MSG_INFO("number output : " << numberOutputBits()); TRG_MSG_INFO("number output : " << numberOutputBits());
// create strings for histogram names // create strings for histogram names
ostringstream MyAcceptHist[numberOutputBits()]; vector<ostringstream> MyAcceptHist(numberOutputBits());
ostringstream MyRejectHist[numberOutputBits()]; vector<ostringstream> MyRejectHist(numberOutputBits());
for (unsigned int i=0;i<numberOutputBits();i++) { for (unsigned int i=0;i<numberOutputBits();i++) {
MyAcceptHist[i] << "Accept" << p_HT[i] << "HT"; MyAcceptHist[i] << "Accept" << p_HT[i] << "HT";
......
...@@ -71,8 +71,8 @@ TCS::JetSimpleCone::initialize() { ...@@ -71,8 +71,8 @@ TCS::JetSimpleCone::initialize() {
TRG_MSG_INFO("number output : " << numberOutputBits()); TRG_MSG_INFO("number output : " << numberOutputBits());
// create strings for histogram names // create strings for histogram names
ostringstream MyAcceptHist[numberOutputBits()]; vector<ostringstream> MyAcceptHist(numberOutputBits());
ostringstream MyRejectHist[numberOutputBits()]; vector<ostringstream> MyRejectHist(numberOutputBits());
for (unsigned int i=0;i<numberOutputBits();i++) { for (unsigned int i=0;i<numberOutputBits();i++) {
MyAcceptHist[i] << "Accept" << p_SimpleCone[i] << "SimpleCone"; MyAcceptHist[i] << "Accept" << p_SimpleCone[i] << "SimpleCone";
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <vector>
#include <algorithm> #include <algorithm>
#include "TH1F.h" #include "TH1F.h"
...@@ -92,8 +93,8 @@ TCS::MinDeltaPhiIncl2::initialize() { ...@@ -92,8 +93,8 @@ TCS::MinDeltaPhiIncl2::initialize() {
TRG_MSG_INFO("nummber output : " << numberOutputBits()); TRG_MSG_INFO("nummber output : " << numberOutputBits());
// create strings for histogram names // create strings for histogram names
ostringstream MyAcceptHist[numberOutputBits()]; vector<ostringstream> MyAcceptHist(numberOutputBits());
ostringstream MyRejectHist[numberOutputBits()]; vector<ostringstream> MyRejectHist(numberOutputBits());
for (unsigned int i=0;i< numberOutputBits();i++) { for (unsigned int i=0;i< numberOutputBits();i++) {
MyAcceptHist[i] << "Accept" << p_DeltaPhiMin[i] << "MinDPhi2"; MyAcceptHist[i] << "Accept" << p_DeltaPhiMin[i] << "MinDPhi2";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment