diff --git a/NPSimulation/Core/PrimaryGeneratorAction.cc b/NPSimulation/Core/PrimaryGeneratorAction.cc index 8a5ab2947fd7d720b9629536b6c7d340f3d05508..d4670c2695b3d0cf4dd8a51a62bd7c558dbd4862 100644 --- a/NPSimulation/Core/PrimaryGeneratorAction.cc +++ b/NPSimulation/Core/PrimaryGeneratorAction.cc @@ -41,7 +41,7 @@ // Event Generator Class #include "EventGeneratorIsotropic.hh" -/* #include "EventGeneratorCosmic.hh" */ +#include "EventGeneratorCosmic.hh" #include "EventGeneratorMultipleParticle.hh" #include "EventGeneratorBeam.hh" @@ -111,13 +111,13 @@ void PrimaryGeneratorAction::ReadEventGeneratorFile(string Path){ m_EventGenerator.push_back(myEventGenerator); } blocks.clear(); - /* blocks = parser.GetAllBlocksWithToken("Cosmic"); */ - /* if (blocks.size()>0) { */ - /* NPS::VEventGenerator* myEventGenerator = new EventGeneratorCosmic(); */ - /* myEventGenerator->ReadConfiguration(parser); */ - /* myEventGenerator->InitializeRootOutput(); */ - /* m_EventGenerator.push_back(myEventGenerator); */ - /* } */ + blocks = parser.GetAllBlocksWithToken("Cosmic"); + if (blocks.size()>0) { + NPS::VEventGenerator* myEventGenerator = new EventGeneratorCosmic(); + myEventGenerator->ReadConfiguration(parser); + myEventGenerator->InitializeRootOutput(); + m_EventGenerator.push_back(myEventGenerator); + } m_Target=m_detector->GetTarget(); if(m_Target!=NULL){ diff --git a/NPSimulation/Detectors/beam_dump/cmake_install.cmake b/NPSimulation/Detectors/beam_dump/cmake_install.cmake deleted file mode 100644 index 0974316586c4759d2b0697085160a601e85d6888..0000000000000000000000000000000000000000 --- a/NPSimulation/Detectors/beam_dump/cmake_install.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# Install script for directory: /home/lenain/nptool/NPSimulation/Detectors/beam_dump - -# Set the install prefix -if(NOT DEFINED CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX "/usr/local") -endif() -string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - if(BUILD_TYPE) - string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - else() - set(CMAKE_INSTALL_CONFIG_NAME "Release") - endif() - message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -endif() - -# Set the component getting installed. -if(NOT CMAKE_INSTALL_COMPONENT) - if(COMPONENT) - message(STATUS "Install component: \"${COMPONENT}\"") - set(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - else() - set(CMAKE_INSTALL_COMPONENT) - endif() -endif() - -# Install shared libraries without execute permission? -if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - set(CMAKE_INSTALL_SO_NO_EXE "1") -endif() - -# Is this installation the result of a crosscompile? -if(NOT DEFINED CMAKE_CROSSCOMPILING) - set(CMAKE_CROSSCOMPILING "FALSE") -endif() - diff --git a/NPSimulation/EventGenerator/CMakeLists.txt b/NPSimulation/EventGenerator/CMakeLists.txt index 5a478e5119b7dfa61806f03673015a48091b008d..3bcc1361a6f2285bca1cbc0c19b6d88e650c4752 100644 --- a/NPSimulation/EventGenerator/CMakeLists.txt +++ b/NPSimulation/EventGenerator/CMakeLists.txt @@ -1,3 +1,2 @@ -#add_library(NPSEventGenerator OBJECT EventGeneratorBeam.cc EventGeneratorMultipleParticle.cc EventGeneratorCosmic.cc EventGeneratorIsotropic.cc VEventGenerator.cc) -add_library(NPSEventGenerator OBJECT EventGeneratorBeam.cc EventGeneratorMultipleParticle.cc EventGeneratorIsotropic.cc VEventGenerator.cc) +add_library(NPSEventGenerator OBJECT EventGeneratorBeam.cc EventGeneratorMultipleParticle.cc EventGeneratorCosmic.cc EventGeneratorIsotropic.cc VEventGenerator.cc) #target_link_libraries(NPSEventGenerator ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPInitialConditions -lNPInteractionCoordinates )