diff --git a/DDRec/CMakeLists.txt b/DDRec/CMakeLists.txt index 0fe6bf459abd698ef29d3e7dd6175779b1b09269..7b15d4b370285067b66329c6b16301d8c65ec25c 100644 --- a/DDRec/CMakeLists.txt +++ b/DDRec/CMakeLists.txt @@ -8,6 +8,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/DDCore/include) file(GLOB sources src/*.cpp) +file(GLOB plugin_sources src/plugins/*.cpp) set(rec_link_libraries DDCore ${DDSegmentation_LIBRARIES} ${ROOT_LIBRARIES} Geom Reflex) diff --git a/DDRec/src/plugins/createSurfaceManager.cpp b/DDRec/src/plugins/createSurfaceManager.cpp index 2d80fa0c124244a0957f6f82baa00a96b735cc6a..a6fcf406c5b653418af592acf0a5e6ffd1a56f48 100644 --- a/DDRec/src/plugins/createSurfaceManager.cpp +++ b/DDRec/src/plugins/createSurfaceManager.cpp @@ -1,6 +1,8 @@ #include "DD4hep/LCDD.h" #include "DD4hep/Factories.h" -#include "DD4hep/DD4hepUnits.h" +#include "DD4hep/Printout.h" + +#include "DDRec/SurfaceManager.h" namespace DD4hep{ namespace DDRec{ @@ -8,29 +10,25 @@ namespace DD4hep{ using namespace Geometry ; /** Plugin that creates a SurfaceManager object and attaches - * to lcdd as user extension. + * it to lcdd as a user extension object. * * @author F.Gaede, CERN/DESY * @date May, 11 2015 * @version $Id: $ */ - static long createSurfaceManager(LCDD& lcdd, int /*argc*/, char** /*argv*/) { - - std::cout << " ************* " << std::endl - << " **** running plugin SurfaceManagerPlugin ! " << std::endl - << " ************* " << std::endl - << std::endl ; - + printout(INFO,"InstallSurfaceManager","**** running plugin InstallSurfaceManager ! " ); - return 1; - } + lcdd.addExtension<SurfaceManager>( new SurfaceManager() ) ; + printout(INFO,"InstallSurfaceManager","%s" , lcdd.extension<SurfaceManager>()->toString().c_str() ); + return 1; + } } } -DECLARE_APPLY( SurfaceManagerPlugin, DD4hep::DDRec::createSurfaceManager ) +DECLARE_APPLY( InstallSurfaceManager, DD4hep::DDRec::createSurfaceManager )