Page MenuHomeHEPForge
Files F8308951

No OneTemporary
Actions

View Options

diff --git a/cmake/NuWroSetup.cmake b/cmake/NuWroSetup.cmake
index d3be683..2c6e04c 100644
--- a/cmake/NuWroSetup.cmake
+++ b/cmake/NuWroSetup.cmake
@@ -1,89 +1,97 @@
# Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
################################################################################
# This file is part of NUISANCE.
#
# NUISANCE is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# NUISANCE is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with NUISANCE. If not, see <http://www.gnu.org/licenses/>.
################################################################################
if(DEFINED BUILD_NuWro_FROM_FILE)
if(NOT EXISTS ${BUILD_NuWro_FROM_FILE})
cmessage(FATAL_ERROR "Expected -DBUILD_NuWro_FROM_FILE to point to a valid input file. Cannot find: '${BUILD_NuWro_FROM_FILE}'")
endif()
if(CMAKE_BUILD_TYPE MATCHES DEBUG)
BuildROOTProject(NuWro_event1 ${BUILD_NuWro_FROM_FILE} "event,vec,vect,particle,flags,params,line" STATIC)
SET(ROOTLIBNAME "libNuWro_event1.a")
else(CMAKE_BUILD_TYPE MATCHES RELEASE)
BuildROOTProject(NuWro_event1 ${BUILD_NuWro_FROM_FILE} "event,vec,vect,particle,flags,params,line" SHARED)
SET(ROOTLIBNAME "libNuWro_event1.so")
endif()
ADD_CUSTOM_TARGET(NuWro_event1HeaderLink ALL
COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_BINARY_DIR}/NuWro_event1/event.h
${CMAKE_BINARY_DIR}/NuWro_event1/event1.h
DEPENDS NuWro_event1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__NUWRO_ENABLED__ ")
LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/NuWro_event1)
set(RWENGINE_LINKER_FLAGS "${RWENGINE_LINKER_FLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${ROOTLIBNAME}")
LIST(APPEND PROJECTWIDE_EXTRA_DEPENDENCIES NuWro_event1HeaderLink)
install(TARGETS NuWro_event1 DESTINATION lib)
SET(NUWRO_BUILT_FROM_FILE 1)
else()
SET(NUWRO_BUILT_FROM_FILE 0)
if(NOT DEFINED ENV{NUWRO})
cmessage(FATAL_ERROR "Environment variable NUWRO is not defined. "
"This must be set to point to a prebuilt NuWro instance.")
endif()
set(NUWRO $ENV{NUWRO})
+ if(NOT DEFINED NO_NuWro_RW)
+ cmessage(STATUS "NO_NuWro_RW not defined, setting to false")
+ SET(NO_NuWro_RW 1)
+ endif()
+
# If you are using a version of NuWro without reweighting use this to compile.
if(DEFINED NO_NuWro_RW AND NO_NuWro_RW)
+ cmessage(STATUS "Compiling NuWro WITHOUT ReWeight")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__NUWRO_ENABLED__ ")
LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES ${NUWRO}/src)
set(RWENGINE_LINKER_FLAGS "${RWENGINE_LINKER_FLAGS} ${NUWRO}/bin/event1.so")
else()
+ cmessage(STATUS "Compiling NuWro WITH ReWeight")
+
if(DEFINED USE_EXP AND USE_EXP)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNW_READHISTFROMINP")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__NUWRO_ENABLED__ -D__NUWRO_REWEIGHT_ENABLED__ ")
LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES ${NUWRO}/src ${NUWRO}/src/reweight ${NUWRO}/build/src)
set(RWENGINE_LINKER_FLAGS "${RWENGINE_LINKER_FLAGS} -L${NUWRO}/build/${CMAKE_SYSTEM_NAME}/lib -lreweight -levent")
endif()
set(NEED_PYTHIA6 TRUE)
set(NEED_ROOTPYTHIA6 TRUE)
endif()
diff --git a/cmake/ReweightEnginesSetup.cmake b/cmake/ReweightEnginesSetup.cmake
index 8f99135..f16acb9 100644
--- a/cmake/ReweightEnginesSetup.cmake
+++ b/cmake/ReweightEnginesSetup.cmake
@@ -1,83 +1,83 @@
# Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
################################################################################
# This file is part of NUISANCE.
#
# NUISANCE is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# NUISANCE is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with NUISANCE. If not, see <http://www.gnu.org/licenses/>.
################################################################################
set(RWENGINE_INCLUDE_DIRECTORIES "")
################################## NEUT ######################################
if(DEFINED USE_NEUT AND USE_NEUT)
include(${CMAKE_SOURCE_DIR}/cmake/NEUTSetup.cmake)
- cmessage(STATUS "Using NEUT Reweight engine.")
+ cmessage(STATUS "Using NEUT engine.")
else()
set(USE_NEUT 0)
endif()
################################# NuWro ######################################
if(DEFINED USE_NuWro AND USE_NuWro)
include(${CMAKE_SOURCE_DIR}/cmake/NuWroSetup.cmake)
- cmessage(STATUS "Using NuWro Reweight engine.")
+ cmessage(STATUS "Using NuWro engine.")
else()
set(USE_NuWro 0)
endif()
################################## GENIE #####################################
if(DEFINED USE_GENIE AND USE_GENIE)
include(${CMAKE_SOURCE_DIR}/cmake/GENIESetup.cmake)
- cmessage(STATUS "Using GENIE Reweight engine.")
+ cmessage(STATUS "Using GENIE engine.")
else()
set(USE_GENIE 0)
endif()
if(DEFINED BUILD_GEVGEN AND BUILD_GEVGEN)
cmessage(STATUS "Building custom gevgen.")
else()
set(BUILD_GEVGEN 0)
endif()
################################## NIWG ######################################
if(DEFINED USE_NIWG AND USE_NIWG)
include(${CMAKE_SOURCE_DIR}/cmake/NIWGSetup.cmake)
cmessage(STATUS "Using NIWG Reweight engine.")
else()
set(USE_NIWG 0)
endif()
################################## T2K ######################################
if(DEFINED USE_T2K AND USE_T2K)
include(${CMAKE_SOURCE_DIR}/cmake/T2KSetup.cmake)
cmessage(STATUS "Using T2K Reweight engine.")
else()
set(USE_T2K 0)
endif()
################################# HEPMC ########################################
if(DEFINED USE_HEPMC AND USE_HEPMC)
include(${CMAKE_SOURCE_DIR}/cmake/HepMC.cmake)
cmessage(STATUS "Using HepMC engine.")
else()
set(USE_HEPMC 0)
endif()
cmessage(STATUS "Reweight engine include directories: ${RWENGINE_INCLUDE_DIRECTORIES}")
if(DEFINED NEED_ROOTEVEGEN AND NEED_ROOTEVEGEN)
cmessage(STATUS "Require ROOT eve generation libraries")
set(ROOT_LIBS Eve;EG;TreePlayer;Geom;Ged;Gui;${ROOT_LIBS})
endif()
if(DEFINED NEED_ROOTPYTHIA6 AND NEED_ROOTPYTHIA6)
cmessage(STATUS "Require ROOT Pythia6 libraries")
set(ROOT_LIBS ${ROOT_LIBS};EGPythia6;Pythia6)
endif()

File Metadata

Mime Type
text/x-diff
Expires
Sat, Dec 21, 1:42 PM (19 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4023003
Default Alt Text
(7 KB)

Event Timeline