Merge branch 'master' of eicweb.phy.anl.gov:eic_tools/gaudi

GaudiAlg/CMakeLists.txt

@@ -52,5 +52,5 @@ gaudi_add_library(GaudiAlgLib ${lib_sources}
                   INCLUDE_DIRS Boost ${aida_lib} ${RANGEV3_INCLUDE_DIRS}
                   PUBLIC_HEADERS GaudiAlg)
 gaudi_add_module(GaudiAlg ${module_sources}
-                 LINK_LIBRARIES GaudiAlgLib GaudiKernel ROOT
+                 LINK_LIBRARIES GaudiAlgLib GaudiKernel GaudiUtilsLib ROOT
                  INCLUDE_DIRS Boost ${aida_lib})

GaudiExamples/CMakeLists.txt

@@ -93,7 +93,7 @@ if( HEPPDT_FOUND )
    list( APPEND GaudiExamples_srcs src/PartProp/*.cpp )
 endif()
 if( CLHEP_FOUND )
-   list( APPEND GaudiExamples_srcs src/TupleEx/*.cpp )
+  #list( APPEND GaudiExamples_srcs src/TupleEx/*.cpp )
 endif()
 if( TARGET RootCnvLib )
   list( APPEND GaudiExamples_srcs src/MultiInput/*.cpp )
@@ -130,12 +130,12 @@ endif()
 
 # Now set up the libraries:
 gaudi_add_library( GaudiExamplesLib src/Lib/*.cpp
-   LINK_LIBRARIES GaudiKernel
+  LINK_LIBRARIES GaudiKernel GaudiUtilsLib GaudiAlgLib
    PUBLIC_HEADERS GaudiExamples Gaudi)
 
 gaudi_add_module( GaudiExamples ${GaudiExamples_srcs}
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${extra_includes}
-   LINK_LIBRARIES GaudiKernel GaudiAlgLib GaudiUtilsLib GaudiExamplesLib
+   LINK_LIBRARIES GaudiKernel GaudiAlgLib GaudiUtilsLib  GaudiExamplesLib 
    ${ROOT_LIBRARIES} ${extra_libs} )
 
 find_file(StatusCodeHeader NAMES GaudiKernel/StatusCode.h

GaudiKernel/src/Lib/GaudiMain.cpp

@@ -14,7 +14,7 @@
 //
 //------------------------------------------------------------------------------
 #include <Gaudi/Application.h>
-#include <gsl/span>
+#include "gsl/span"
 #include <iostream>
 #include <string_view>
 #include <type_traits>

GaudiPython/CMakeLists.txt

@@ -56,15 +56,15 @@ endif()
 
 #---Libraries---------------------------------------------------------------
 gaudi_add_library(GaudiPythonLib ${lib_sources}
-                  LINK_LIBRARIES GaudiAlgLib PythonLibs ${clhep_lib} ${aida_lib}
+                  LINK_LIBRARIES GaudiUtilsLib GaudiAlgLib PythonLibs ${clhep_lib} ${aida_lib}
                   INCLUDE_DIRS ${clhep_lib} ${aida_lib} PythonLibs
                   PUBLIC_HEADERS GaudiPython)
 gaudi_add_module(GaudiPython src/Services/*.cpp
-                 LINK_LIBRARIES GaudiPythonLib GaudiUtilsLib)
+                 LINK_LIBRARIES GaudiPythonLib GaudiUtilsLib GaudiAlgLib)
 
 #---Dictionaries------------------------------------------------------------
 gaudi_add_dictionary(GaudiPython dict/kernel.h dict/selection_kernel.xml
-                     LINK_LIBRARIES GaudiPythonLib GaudiUtilsLib)
+                     LINK_LIBRARIES GaudiPythonLib GaudiUtilsLib GaudiAlgLib)
 
 #---Test-----------------------------------------------------------------------
 gaudi_add_test(QMTest QMTEST)

GaudiPython/dict/kernel.h

@@ -106,6 +106,7 @@
 #  include "GaudiUtils/HistoStats.h"
 #  include "GaudiUtils/HistoStrings.h"
 #endif // AIDA_FOUND
+#include "GaudiUtils/HistoTableFormat.h"
 #include "GaudiUtils/IFileCatalog.h"
 #include "GaudiUtils/IFileCatalogMgr.h"
 #include "GaudiUtils/IIODataManager.h"

GaudiPython/dict/selection_kernel.xml

@@ -86,7 +86,7 @@
   <function name= "Gaudi::Utils::Histos::Formats::format" />
   <function name= "Gaudi::Utils::Histos::Formats::header" />
   <function name= "Gaudi::Utils::Histos::format" />
-  <class    name= "Gaudi::Utils::Histos::Table"  />
+  <!--<class    name= "Gaudi::Utils::Histos::Table"  />-->
   <class    name= "Gaudi::Utils::HistoStats"  />
 
   <function name= "Gaudi::Utils::QuasiRandom::mix" />

GaudiPython/src/Lib/TupleDecorator.cpp

@@ -43,6 +43,9 @@ namespace CLHEP {
 // ============================================================================
 #include "GaudiPython/TupleDecorator.h"
 #include "GaudiPython/Vector.h"
+#include "GaudiAlg/GaudiHistos.icpp"
+#include "GaudiAlg/GaudiTuples.icpp"
+
 // ===========================================================================
 /** @file
  *  Implementation file for class GaudiPython::TupleDecorator