Skip to content
Snippets Groups Projects
Commit 340ff2bc authored by Riccardo Maria Bianchi's avatar Riccardo Maria Bianchi :sunny: Committed by Graeme Stewart
Browse files

fixing nightly error about Qt and Boost while MOC compiling. Details:...

fixing nightly error about Qt and Boost while MOC compiling. Details: https://its.cern.ch/jira/browse/ATLASRECTS-3097 (VP1TriggerSystems-00-00-12)

    * fixing nightly error about Qt and Boost while MOC compiling. Details:
	  https://its.cern.ch/jira/browse/ATLASRECTS-3097
    * Tagging VP1TriggerSystems-00-00-12

2016-02-10  scott snyder  <snyder@bnl.gov>

	* Tagging VP1TriggerSystems-00-00-11.
	* src/VP1TriggerHandleEF.cxx (loadTrackContainer): Const fix.

2015-02-03 Riccardo.Maria.Bianchi@cern.ch
    * added a workaround for a Qt-BOOST bug.
	  Details here: https://its.cern.ch/jira/browse/ATLASVPONE-184
parent dcff3117
No related branches found
No related tags found
No related merge requests found
################################################################################
# Package: VP1TriggerSystems
################################################################################
# Declare the package name:
atlas_subdir( VP1TriggerSystems )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/StoreGate
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
Trigger/TrigAnalysis/TrigDecisionTool
Trigger/TrigAnalysis/TrigObjectMatching
Trigger/TrigEvent/TrigMuonEvent
Trigger/TrigEvent/TrigSteeringEvent
graphics/VP1/VP1Base
PRIVATE
DetectorDescription/GeoPrimitives
GaudiKernel
Tracking/TrkEvent/TrkParameters
Tracking/TrkEvent/TrkTrack )
# External dependencies:
find_package( Coin3D )
find_package( Eigen )
find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui )
include_directories( /usr/X11R6/include )
# Generate UI files automatically:
set( CMAKE_AUTOUIC TRUE )
# Generate MOC files automatically:
set( CMAKE_AUTOMOC TRUE )
set( CMAKE_AUTOMOC_MOC_OPTIONS "-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED")
# ### NOTE! ###
# "-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED" is needed when using Qt < 5.0 together with BOOST > 1.52.
# Details:
# - https://its.cern.ch/jira/browse/ATLASRECTS-3097
# - https://its.cern.ch/jira/browse/ATLASVPONE-184
# Generate resource files automatically:
set( CMAKE_AUTORCC TRUE )
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Component(s) in the package:
atlas_add_library( VP1TriggerSystems VP1TriggerSystems/*.h src/*.h src/*.cxx src/*.qrc
PUBLIC_HEADERS VP1TriggerSystems
INCLUDE_DIRS ${QT4_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES AnalysisTriggerEvent TrigMuonEvent TrigSteeringEvent VP1Base ${QT4_LIBRARIES} GL StoreGateLib SGtests TrigDecisionToolLib TrigObjectMatchingLib
PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} ${EIGEN_LIBRARIES} GeoPrimitives GaudiKernel TrkParameters TrkTrack
)
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/ */
#ifndef VP1TRIGGERUISYSTEM_H #ifndef VP1TRIGGERUISYSTEM_H
#define VP1TRIGGERUISYSTEM_H #define VP1TRIGGERUISYSTEM_H
...@@ -44,3 +45,4 @@ public: ...@@ -44,3 +45,4 @@ public:
VP1Trig::VP1TriggerTool * m_triggertool; VP1Trig::VP1TriggerTool * m_triggertool;
}; };
#endif #endif
...@@ -2,6 +2,7 @@ package VP1TriggerSystems ...@@ -2,6 +2,7 @@ package VP1TriggerSystems
author Manuel Proissl <mproissl@cern.ch> author Manuel Proissl <mproissl@cern.ch>
manager Manuel Proissl <mproissl@cern.ch> manager Manuel Proissl <mproissl@cern.ch>
manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
public public
use AtlasPolicy AtlasPolicy-* use AtlasPolicy AtlasPolicy-*
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "ui_tracksystemcontrollerform.h" #include "ui_tracksystemcontrollerform.h"
//Track includes //Track includes
#include "StoreGate/StoreGate.h" #include "StoreGate/StoreGateSvc.h"
#include "TrkTrack/Track.h" #include "TrkTrack/Track.h"
#include "TrkTrack/TrackCollection.h" #include "TrkTrack/TrackCollection.h"
#include "TrkParameters/TrackParameters.h" #include "TrkParameters/TrackParameters.h"
......
...@@ -154,7 +154,7 @@ bool VP1Trig::VP1TriggerHandleEF::loadTrackContainer() ...@@ -154,7 +154,7 @@ bool VP1Trig::VP1TriggerHandleEF::loadTrackContainer()
count_mg=0; count_mg=0;
if(m_containerEF->hasTrack()) { //Muon in RoI if(m_containerEF->hasTrack()) { //Muon in RoI
TrigMuonEFInfoTrackContainer *tc = m_containerEF->TrackContainer(); //TrackContainer: more than one muon in RoI const TrigMuonEFInfoTrackContainer *tc = m_containerEF->TrackContainer(); //TrackContainer: more than one muon in RoI
TrigMuonEFInfoTrackContainer::const_iterator TrackItr; TrigMuonEFInfoTrackContainer::const_iterator TrackItr;
for(TrackItr = tc->begin(); TrackItr!=tc->end(); TrackItr++) { for(TrackItr = tc->begin(); TrackItr!=tc->end(); TrackItr++) {
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
* @author : Manuel Proissl <mproissl@cern.ch> - University of Edinburgh * @author : Manuel Proissl <mproissl@cern.ch> - University of Edinburgh
***********************************************************************************/ ***********************************************************************************/
//Local includes //Local includes
#include "VP1TriggerSystems/VP1TriggerUISystem.h" #include "VP1TriggerSystems/VP1TriggerUISystem.h"
#include "VP1TriggerSystems/VP1TriggerTool.h" #include "VP1TriggerSystems/VP1TriggerTool.h"
......
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