From 8cdce837f06dbc37f6a27682c904b47dd73d3412 Mon Sep 17 00:00:00 2001
From: Elidiano Tronchin <elidiano.tronchin@gmail.com>
Date: Wed, 30 Jan 2019 17:02:10 +0100
Subject: [PATCH] * Decommenting Cosmic rqy generator - Someone commented
out the generqtor for some reasons
---
NPSimulation/Core/PrimaryGeneratorAction.cc | 16 ++++----
.../Detectors/beam_dump/cmake_install.cmake | 39 -------------------
NPSimulation/EventGenerator/CMakeLists.txt | 3 +-
3 files changed, 9 insertions(+), 49 deletions(-)
delete mode 100644 NPSimulation/Detectors/beam_dump/cmake_install.cmake
diff --git a/NPSimulation/Core/PrimaryGeneratorAction.cc b/NPSimulation/Core/PrimaryGeneratorAction.cc
index 8a5ab2947..d4670c269 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 097431658..000000000
--- 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 5a478e511..3bcc1361a 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 )
--
GitLab