Skip to content

Commit

Permalink
Remove ROOT Output, now in separate plugin. Closes #142
Browse files Browse the repository at this point in the history
  • Loading branch information
TobiasWinchen committed Jan 31, 2018
1 parent 117a267 commit b29898e
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 713 deletions.
16 changes: 1 addition & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -169,20 +169,7 @@ if (ENABLE_GALACTICMAGETICLENS)
list(APPEND CRPROPA_EXTRA_SOURCES src/magneticLens/ParticleMapsContainer.cpp)
endif (ENABLE_GALACTICMAGETICLENS)

# ROOT (optional for ROOT output)
option(ENABLE_ROOT "ROOT Output" ON)
if(ENABLE_ROOT)
find_package(ROOT)
if(ROOT_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CFLAGS}")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ROOT_LIBS}")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${ROOT_LIBS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ROOT_LIBS}")
add_definitions(-DCRPROPA_HAVE_ROOT)
list(APPEND CRPROPA_SWIG_DEFINES -DCRPROPA_HAVE_ROOT)
list(APPEND CRPROPA_EXTRA_LIBRARIES Core RIO Tree)
endif(ROOT_FOUND)
endif(ENABLE_ROOT)


# OpenMP (optional for shared memory multiprocessing)
option(ENABLE_OPENMP "OpenMP for multithreading" ON)
Expand Down Expand Up @@ -361,7 +348,6 @@ add_library(crpropa SHARED
src/module/Observer.cpp
src/module/Output.cpp
src/module/OutputCRPropa2.cpp
src/module/OutputROOT.cpp
src/module/OutputShell.cpp
src/module/ParticleCollector.cpp
src/module/PhotoDisintegration.cpp
Expand Down
21 changes: 0 additions & 21 deletions cmake/FindROOT.cmake

This file was deleted.

1 change: 0 additions & 1 deletion include/CRPropa.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include "crpropa/module/NuclearDecay.h"
#include "crpropa/module/Observer.h"
#include "crpropa/module/OutputCRPropa2.h"
#include "crpropa/module/OutputROOT.h"
#include "crpropa/module/OutputShell.h"
#include "crpropa/module/ParticleCollector.h"
#include "crpropa/module/PhotoDisintegration.h"
Expand Down
177 changes: 0 additions & 177 deletions include/crpropa/module/OutputROOT.h

This file was deleted.

1 change: 0 additions & 1 deletion python/2_headers.i
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@

%include "crpropa/module/HDF5Output.h"
%include "crpropa/module/OutputShell.h"
%include "crpropa/module/OutputROOT.h"
%include "crpropa/module/OutputCRPropa2.h"
%include "crpropa/module/EMCascade.h"
%include "crpropa/module/PhotonEleCa.h"
Expand Down
Loading

0 comments on commit b29898e

Please sign in to comment.