diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt index 4c20de1b25d9099e2d59d147dc2cfc4a03672ed8..1a44562101c35a8511f071526bccbfaeecd01612 100644 --- a/Projects/Athena/package_filters.txt +++ b/Projects/Athena/package_filters.txt @@ -20,21 +20,14 @@ - Generators/Herwigpp_i # Temporary VP1 compilation issues -+ graphics/VP1/VP1HEPVis -+ graphics/VP1/VP1Base -+ graphics/VP1/VP1UtilsBase -+ graphics/VP1/VP1Gui -+ graphics/VP1/VP1Algs -+ graphics/VP1/VP1Utils -+ graphics/VP1/VP1Systems/VP1AODSystems -+ graphics/VP1/VP1Plugins/VP1AODPlugin -+ graphics/VP1/VP1Systems/VP1GeometrySystems -+ graphics/VP1/VP1Plugins/VP1GeometryPlugin -+ graphics/VP1/VP1Systems/VP1GuideLineSystems -+ graphics/VP1/VP1Systems/VP1SimHitSystems -# + graphics/VP1/VP1Plugins/VP1TrackPlugin -# + graphics/VP1/VP1Systems/VP1TrackSystems -- graphics/VP1/.* +- graphics/VP1/VP1Systems/VP1UtilitySystems +- graphics/VP1/VP1Systems/VP1TriggerSystems +- graphics/VP1/VP1Systems/VP12DGeometrySystems +- graphics/VP1/VP1Systems/VP1MCSystems +- graphics/VP1/VP1Systems/VP1CaloSystems +- graphics/VP1/VP1Systems/VP1TriggerDecisionSystems +- graphics/VP1/VP1Systems/VP1BPhysSystems ++ graphics/VP1/.* # Some analysis packages that are not part of Athena - Control/AthLinksSA @@ -61,3 +54,4 @@ - Reconstruction/Jet/JetAnalysisTools/JetTileCorrection - Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauMatching - Trigger/TrigFTK/FTKStandaloneMonitoring + diff --git a/graphics/VP1/VP1AlgsBatch/CMakeLists.txt b/graphics/VP1/VP1AlgsBatch/CMakeLists.txt index af40e5daa0726edd66d1165ebac28436ba497335..c287fbce80418c26ab1f615ab0e96ede6dace48e 100644 --- a/graphics/VP1/VP1AlgsBatch/CMakeLists.txt +++ b/graphics/VP1/VP1AlgsBatch/CMakeLists.txt @@ -21,7 +21,7 @@ atlas_depends_on_subdirs( PUBLIC graphics/VP1/VP1UtilsBase ) # External dependencies: -find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui ) +find_package( Qt5 COMPONENTS Core OpenGL Gui HINTS ${QT5_ROOT} ) @@ -29,7 +29,7 @@ find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui ) atlas_add_component( VP1AlgsBatch src/*.cxx src/components/*.cxx - LINK_LIBRARIES ${QT4_LIBRARIES} GL AthenaBaseComps GaudiKernel CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc EventInfo PathResolver VP1UtilsBase ) + LINK_LIBRARIES ${QT5_LIBRARIES} GL AthenaBaseComps GaudiKernel CollectionBase CollectionUtilities POOLCore PersistencySvc StorageSvc EventInfo PathResolver VP1UtilsBase ) # Install files from the package: atlas_install_headers( VP1AlgsBatch ) diff --git a/graphics/VP1/VP1AlgsEventProd/CMakeLists.txt b/graphics/VP1/VP1AlgsEventProd/CMakeLists.txt index 916a38a55c1e29a5b029924931c51b00f85fc51c..5cf1eaf013df5a56b47077529c2db42c4b16b306 100644 --- a/graphics/VP1/VP1AlgsEventProd/CMakeLists.txt +++ b/graphics/VP1/VP1AlgsEventProd/CMakeLists.txt @@ -21,7 +21,7 @@ atlas_depends_on_subdirs( PUBLIC graphics/VP1/VP1UtilsBase ) # External dependencies: -find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui ) +find_package( Qt5 COMPONENTS Core OpenGL Gui HINTS ${QT5_ROOT} ) diff --git a/graphics/VP1/VP1Base/CMakeLists.txt b/graphics/VP1/VP1Base/CMakeLists.txt index a7e3f72c0227c3fca5b04bba76becba7c5b59a0f..b30cbcf6a87effe0f8ed832e439d85aecfbada51 100644 --- a/graphics/VP1/VP1Base/CMakeLists.txt +++ b/graphics/VP1/VP1Base/CMakeLists.txt @@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PRIVATE graphics/VP1/VP1HEPVis ) # Find the external dependencies: -find_package( Qt5 COMPONENTS Core OpenGL Gui PrintSupport ) +find_package( Qt5 COMPONENTS Core OpenGL Gui PrintSupport HINTS ${QT5_ROOT}) find_package( SoQt ) find_package( Coin3D ) diff --git a/graphics/VP1/VP1Gui/CMakeLists.txt b/graphics/VP1/VP1Gui/CMakeLists.txt index 8e7316800f76c3857124e975afd011127b6b37fe..9b7ceef081abcb336e353259a0675f82f3ae77e4 100644 --- a/graphics/VP1/VP1Gui/CMakeLists.txt +++ b/graphics/VP1/VP1Gui/CMakeLists.txt @@ -15,7 +15,7 @@ atlas_depends_on_subdirs( ) # External dependencies: -find_package( Qt5 COMPONENTS Core OpenGL Gui Network PrintSupport) +find_package( Qt5 COMPONENTS Core OpenGL Gui Network PrintSupport HINTS ${QT5_ROOT} ) find_package( Coin3D ) find_package( SoQt ) diff --git a/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx b/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx index 732707322ea647ba6e8ddcd3e8d01628940b92a8..736f4ed513d74c2c98dc046216afd33db2c798ed 100644 --- a/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx +++ b/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx @@ -734,8 +734,6 @@ QMap<QString,QString> VP1MainWindow::availableFiles(const QString& extension, vp1pluginpath<<VP1Settings::defaultFileSelectDirectory(); } - - //Add directories from pathvar (looking in subdir instareasubdir): QString varStr = QString(::getenv(pathvar.toStdString().c_str())); //VP1Msg::messageDebug("Add directories from pathvar... " + pathvar + " - " + varStr); diff --git a/graphics/VP1/VP1HEPVis/CMakeLists.txt b/graphics/VP1/VP1HEPVis/CMakeLists.txt index 3f9c21d42d3de7204fcc6692cc0ee18dedbe4d52..bfe70c4c602afc899f753f5b9a8b87376dfc904a 100644 --- a/graphics/VP1/VP1HEPVis/CMakeLists.txt +++ b/graphics/VP1/VP1HEPVis/CMakeLists.txt @@ -8,10 +8,15 @@ # Declare the package name: atlas_subdir( VP1HEPVis ) +message( "CMAKE_PREFIX_PATH = $ENV{CMAKE_PREFIX_PATH}" ) + # External dependencies: -find_package( Coin3D ) +find_package( Coin3D ) find_package( OpenGL ) +message("VP1HEPVis: '${COIN3D_FOUND}' '${COIN3D_INCLUDE_DIRS}' +'${COIN3D_LIBRARIES}' '${COIN3D_LIBRARY}' '${COIN3D_INCLUDE_DIR}' ") + # Component(s) in the package: atlas_add_library( VP1HEPVis src/*.cxx PUBLIC_HEADERS VP1HEPVis diff --git a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/CMakeLists.txt b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/CMakeLists.txt index 20ee7946d757c743ebd378a9b18471ca7865c5d1..65f26436b999ec73c90f3de9885eee80b0165893 100644 --- a/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/CMakeLists.txt +++ b/graphics/VP1/VP1Plugins/VP13DCocktailPlugin/CMakeLists.txt @@ -25,7 +25,7 @@ atlas_depends_on_subdirs( PUBLIC graphics/VP1/VP1Systems/VP1UtilitySystems ) # External dependencies: -find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui ) +find_package( Qt5 COMPONENTS Core OpenGL Gui HINTS ${QT5_ROOT} ) diff --git a/graphics/VP1/VP1Plugins/VP1AODPlugin/CMakeLists.txt b/graphics/VP1/VP1Plugins/VP1AODPlugin/CMakeLists.txt index 4e3603062591ad2ff453d2ce5b9769d2d6356436..8afd7e74a2cdf2d5017bd0419752272a96a7aef4 100644 --- a/graphics/VP1/VP1Plugins/VP1AODPlugin/CMakeLists.txt +++ b/graphics/VP1/VP1Plugins/VP1AODPlugin/CMakeLists.txt @@ -16,7 +16,7 @@ atlas_depends_on_subdirs( PUBLIC atlas_install_headers( VP1AODPlugin ) # External dependencies: -find_package( Qt5 COMPONENTS Core OpenGL Gui Widgets ) +find_package( Qt5 COMPONENTS Core OpenGL Gui Widgets HINTS ${QT5_ROOT} ) find_package( SoQt ) find_package( Coin3D ) diff --git a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/CMakeLists.txt b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/CMakeLists.txt index d86fb205b1e3dbdc871165e1e30f97501974cc5a..f6f3e9d71e6ac008a46cf578349efe0206adee05 100644 --- a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/CMakeLists.txt +++ b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/CMakeLists.txt @@ -14,7 +14,7 @@ atlas_depends_on_subdirs( PRIVATE atlas_install_headers( VP1GeometryPlugin ) # External dependencies: -find_package( Qt5 COMPONENTS Core OpenGL Gui Widgets ) +find_package( Qt5 COMPONENTS Core OpenGL Gui Widgets HINTS ${QT5_ROOT} ) find_package( SoQt ) find_package( Coin3D ) diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt index 8cb3b3ec40342db5c465c62abcb99e634b94c692..99cac9e432b55d8228607718bfcbc53404b3ed8f 100644 --- a/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt +++ b/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt @@ -28,7 +28,7 @@ atlas_depends_on_subdirs( # External dependencies: find_package( Coin3D ) -find_package( Qt5 COMPONENTS Core Gui Widgets ) +find_package( Qt5 COMPONENTS Core Gui Widgets HINTS ${QT5_ROOT} ) # Generate UI files automatically: # Note: add the "Widgets" component to "find_package( Qt5 ...)" if you have UI files, otherwise UIC, even if CMAKE_AUTOUIC is set to ON, is not run diff --git a/graphics/VP1/VP1Systems/VP1CaloSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1CaloSystems/CMakeLists.txt index b5dae4dc2198d561369a69e97f5ca8eeb719534f..41eb4a0ab4cc5825e1877ecfc7764f1d072654f1 100644 --- a/graphics/VP1/VP1Systems/VP1CaloSystems/CMakeLists.txt +++ b/graphics/VP1/VP1Systems/VP1CaloSystems/CMakeLists.txt @@ -33,7 +33,7 @@ atlas_depends_on_subdirs( # External dependencies: find_package( CLHEP ) find_package( Coin3D ) -find_package( Qt5 COMPONENTS Core Gui ) +find_package( Qt5 COMPONENTS Core Gui Widgets ) find_package( Qwt ) # Generate UI files automatically: diff --git a/graphics/VP1/VP1Systems/VP1MissingEtSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1MissingEtSystems/CMakeLists.txt index 671aaf7c718d50f48a5b3cb6ee5b7f331f407976..686d86c0ebaef8e61062720890e9d0a26c7a2dc7 100644 --- a/graphics/VP1/VP1Systems/VP1MissingEtSystems/CMakeLists.txt +++ b/graphics/VP1/VP1Systems/VP1MissingEtSystems/CMakeLists.txt @@ -15,9 +15,7 @@ atlas_depends_on_subdirs( PUBLIC # External dependencies: find_package( CLHEP ) find_package( Coin3D ) - - - +find_package( Qt5 COMPONENTS Core Gui Widgets ) # Generate UI files automatically: set( CMAKE_AUTOUIC TRUE ) diff --git a/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt index 828ae792443e3e96d0cc4968f47612dcab3c3afc..fa5f972f94b9a7989070d36f53fff3ec6e7930fb 100644 --- a/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt +++ b/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt @@ -24,7 +24,7 @@ atlas_depends_on_subdirs( PUBLIC # External dependencies: find_package( Coin3D ) find_package( Eigen ) - +find_package( Qt5 COMPONENTS Core Gui Widgets ) # Generate UI files automatically: set( CMAKE_AUTOUIC TRUE ) diff --git a/graphics/VP1/VP1Systems/VP1TestSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1TestSystems/CMakeLists.txt index 351ee00b7d225b963d8710349caf142e9f1a8ecd..8e29e65aa963e3b6e54e362c27d64959ae0cd248 100644 --- a/graphics/VP1/VP1Systems/VP1TestSystems/CMakeLists.txt +++ b/graphics/VP1/VP1Systems/VP1TestSystems/CMakeLists.txt @@ -20,7 +20,7 @@ atlas_depends_on_subdirs( PUBLIC # External dependencies: find_package( Coin3D ) find_package( Eigen ) -find_package( Qt5 COMPONENTS Core Gui ) +find_package( Qt5 COMPONENTS Core Gui Widgets ) # Generate UI files automatically: set( CMAKE_AUTOUIC TRUE ) diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollectionSettingsButton.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollectionSettingsButton.cxx index 005a6cbbfb69e084ac1b85d64bf2d34a4e864e8c..0936c5849db2b2424ffe88d8b07daee691a7388d 100644 --- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollectionSettingsButton.cxx +++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackCollectionSettingsButton.cxx @@ -25,6 +25,10 @@ #include <QDragEnterEvent> #include <QDropEvent> #include <QShortcut> +#include <QMimeData> +#include <QDrag> + + //____________________________________________________________________ class TrackCollectionSettingsButton::Imp { public: @@ -499,6 +503,10 @@ bool TrackCollectionSettingsButton::cutTruthExcludeNeutrals() const return d->editwindow_ui.checkBox_cut_truthtracks_excludeneutrals->isChecked(); } + + +// "POSSIBLECHANGE" SLOTS +//____________________________________________________________________ void TrackCollectionSettingsButton::possibleChange_useDefaultCuts() { if (d->last_useDefaultCuts==useDefaultCuts()) return; @@ -506,7 +514,7 @@ void TrackCollectionSettingsButton::possibleChange_useDefaultCuts() d->last_useDefaultCuts= useDefaultCuts(); emit useDefaultCutsChanged(d->last_useDefaultCuts); } - +//____________________________________________________________________ void TrackCollectionSettingsButton::possibleChange_cutAllowedPt() { messageVerbose("possibleChange_cutAllowedPt() "); @@ -516,7 +524,7 @@ void TrackCollectionSettingsButton::possibleChange_cutAllowedPt() d->last_cutAllowedPt= cutAllowedPt(); emit cutAllowedPtChanged(d->last_cutAllowedPt); } - +//____________________________________________________________________ void TrackCollectionSettingsButton::possibleChange_cutAllowedEta() { if (d->last_cutAllowedEta==cutAllowedEta()) return; @@ -524,7 +532,7 @@ void TrackCollectionSettingsButton::possibleChange_cutAllowedEta() d->last_cutAllowedEta=cutAllowedEta(); emit cutAllowedEtaChanged(d->last_cutAllowedEta); } - +//____________________________________________________________________ void TrackCollectionSettingsButton::possibleChange_cutAllowedPhi() { if (d->last_cutAllowedPhi==cutAllowedPhi()) return; @@ -532,7 +540,7 @@ void TrackCollectionSettingsButton::possibleChange_cutAllowedPhi() d->last_cutAllowedPhi=cutAllowedPhi(); emit cutAllowedPhiChanged(d->last_cutAllowedPhi); } - +//____________________________________________________________________ void TrackCollectionSettingsButton::possibleChange_cutRequiredNHits() { if (d->last_cutRequiredNHits!=cutRequiredNHits()) return; @@ -540,7 +548,7 @@ void TrackCollectionSettingsButton::possibleChange_cutRequiredNHits() d->last_cutRequiredNHits=cutRequiredNHits(); emit cutRequiredNHitsChanged(d->last_cutRequiredNHits); } - +//____________________________________________________________________ void TrackCollectionSettingsButton::possibleChange_cutTruthFromIROnly() { if (d->last_cutTruthFromIROnly!=cutTruthFromIROnly()) return; @@ -548,7 +556,7 @@ void TrackCollectionSettingsButton::possibleChange_cutTruthFromIROnly() d->last_cutTruthFromIROnly=cutTruthFromIROnly(); emit cutTruthFromIROnlyChanged(d->last_cutTruthFromIROnly); } - +//____________________________________________________________________ void TrackCollectionSettingsButton::possibleChange_cutExcludeBarcodeZero() { if (d->last_cutExcludeBarcodeZero!=cutExcludeBarcodeZero()) return; @@ -557,7 +565,7 @@ void TrackCollectionSettingsButton::possibleChange_cutExcludeBarcodeZero() emit cutExcludeBarcodeZeroChanged(d->last_cutExcludeBarcodeZero); } - +//____________________________________________________________________ void TrackCollectionSettingsButton::possibleChange_cutTruthExcludeNeutrals() { if (d->last_cutTruthExcludeNeutrals!=cutTruthExcludeNeutrals()) return; @@ -566,4 +574,11 @@ void TrackCollectionSettingsButton::possibleChange_cutTruthExcludeNeutrals() emit cutTruthExcludeNeutralsChanged(d->last_cutTruthExcludeNeutrals); } - +//____________________________________________________________________ +void TrackCollectionSettingsButton::possibleChange_cutOnlyVertexAssocTracks() +{ + if (d->last_cutOnlyVertexAssocTracks!=cutOnlyVertexAssocTracks()) return; + messageVerbose("cutOnlyVertexAssocTracks() changed"); + d->last_cutOnlyVertexAssocTracks=cutOnlyVertexAssocTracks(); + emit cutOnlyVertexAssocTracksChanged(d->last_cutOnlyVertexAssocTracks); +} diff --git a/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/CMakeLists.txt index 3ed9b09c6f198eeab119242b5533273de9b8712a..72b1e98ca491b7dafd120cd3b22e810d0935d510 100644 --- a/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/CMakeLists.txt +++ b/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/CMakeLists.txt @@ -23,7 +23,7 @@ atlas_depends_on_subdirs( PUBLIC # External dependencies: find_package( Coin3D ) find_package( Eigen ) -find_package( Qt5 COMPONENTS Core Gui ) +find_package( Qt5 COMPONENTS Core Gui Widgets ) # Generate UI files automatically: set( CMAKE_AUTOUIC TRUE ) diff --git a/graphics/VP1/VP1Systems/VP1VertexSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1VertexSystems/CMakeLists.txt index 93b24ed8ade0fff80deae345bc5823e10c2d70ba..a56ba86f3543428c61003c2f278fbae1125f1f98 100644 --- a/graphics/VP1/VP1Systems/VP1VertexSystems/CMakeLists.txt +++ b/graphics/VP1/VP1Systems/VP1VertexSystems/CMakeLists.txt @@ -22,7 +22,7 @@ atlas_depends_on_subdirs( PUBLIC find_package( Coin3D ) find_package( Eigen ) find_package( HepMC ) -find_package( Qt5 COMPONENTS Core Gui ) +find_package( Qt5 COMPONENTS Core Gui Widgets ) # Generate UI files automatically: set( CMAKE_AUTOUIC TRUE ) diff --git a/graphics/VP1/VP1Utils/CMakeLists.txt b/graphics/VP1/VP1Utils/CMakeLists.txt index d57a14603ee0682f3aeba82dae527e54385f9531..1566c883f2d85828d2110903deb8807a958c7be7 100644 --- a/graphics/VP1/VP1Utils/CMakeLists.txt +++ b/graphics/VP1/VP1Utils/CMakeLists.txt @@ -44,7 +44,7 @@ find_package( CLHEP ) find_package( Coin3D ) find_package( Eigen ) find_package( HepPDT ) -find_package( Qt5 COMPONENTS Core ) +find_package( Qt5 COMPONENTS Core HINTS ${QT5_ROOT} ) # CLHEP definitions: add_definitions( -DCLHEP_MAX_MIN_DEFINED diff --git a/graphics/VP1/VP1UtilsBase/CMakeLists.txt b/graphics/VP1/VP1UtilsBase/CMakeLists.txt index 8c05f5d3cce6dae38c4a6c6fe9c0a8dea90bd860..93b7084bc0121b9c1a26218071acf095260ceb69 100644 --- a/graphics/VP1/VP1UtilsBase/CMakeLists.txt +++ b/graphics/VP1/VP1UtilsBase/CMakeLists.txt @@ -8,9 +8,9 @@ atlas_subdir( VP1UtilsBase ) # External dependencies: -find_package( Qt4 COMPONENTS QtCore ) +find_package( Qt5 COMPONENTS Core HINTS ${QT5_ROOT} ) # Component(s) in the package: atlas_add_library( VP1UtilsBase src/*.cxx PUBLIC_HEADERS VP1UtilsBase - PRIVATE_LINK_LIBRARIES Qt4::QtCore ) + PRIVATE_LINK_LIBRARIES Qt5::Core )