Merge remote-tracking branch 'ric/master-vp1-porting-to-r22' into master-vp1dev

This incorporates some fixes from me and some from Ric, and increases the number of VP1 directories which are compiled. There are still some crashes etc (at least under OSX) but we're getting there!

Projects/Athena/package_filters.txt

@@ -26,6 +26,7 @@
 - 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
@@ -53,3 +54,7 @@
 - Reconstruction/Jet/JetAnalysisTools/JetTileCorrection
 - Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauMatching
 - Trigger/TrigFTK/FTKStandaloneMonitoring
+
++ Tools/XMLCoreParser
++ Control/CLIDComps
+

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 )

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} )
 
 
 

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  )
 

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 )
 

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

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} )
 
 
 

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 )
 

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 )
 

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

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);
+}

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

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 )