From f5408591bcc3a4f7cd502ff1f68d301ad4b5143b Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Wed, 23 Nov 2016 09:25:23 +0100
Subject: [PATCH] * Follow link prescription for Mac Os X
---
NPLib/CMakeLists.txt | 1 -
NPLib/ressources/CMake/NPTool_CMake_Preamble.cmake | 6 ++++++
NPSimulation/Detectors/AGATA/CMakeLists.txt | 2 +-
NPSimulation/Detectors/AnnularS1/CMakeLists.txt | 2 +-
NPSimulation/Detectors/ComptonTelescope/CMakeLists.txt | 2 +-
NPSimulation/Detectors/CsI/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Eurogam/CMakeLists.txt | 2 +-
NPSimulation/Detectors/FPDTamu/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Fatima/CMakeLists.txt | 2 +-
NPSimulation/Detectors/GASPARD/CMakeLists.txt | 2 +-
NPSimulation/Detectors/GeTAMU/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Helios/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Helios2/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Hira/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Hyde2/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Lassa/CMakeLists.txt | 2 +-
NPSimulation/Detectors/MUST2/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Microball/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Miniball/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Nana/CMakeLists.txt | 2 +-
NPSimulation/Detectors/NeutronWall/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Paris/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Plastic/CMakeLists.txt | 2 +-
NPSimulation/Detectors/QQQ/CMakeLists.txt | 2 +-
NPSimulation/Detectors/SSSD/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Sharc/CMakeLists.txt | 2 +-
NPSimulation/Detectors/TRex/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Tiara/CMakeLists.txt | 2 +-
NPSimulation/Detectors/Tigress/CMakeLists.txt | 2 +-
NPSimulation/Detectors/W1/CMakeLists.txt | 2 +-
Projects/S1554/macro/MgCSLab.cxx | 8 +++++---
31 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/NPLib/CMakeLists.txt b/NPLib/CMakeLists.txt
index e4d38fb00..0d550ea6c 100644
--- a/NPLib/CMakeLists.txt
+++ b/NPLib/CMakeLists.txt
@@ -9,7 +9,6 @@ cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
# include the nptool standard CMake preamble
include("ressources/CMake/NPTool_CMake_Preamble.cmake")
-
# Major change in the Core/Physics (affecting the detector/analysis/simulation)
set(NPLIB_VERSION_MAJOR 2)
# Minor change in the Core/Physics (not affecting any other part)
diff --git a/NPLib/ressources/CMake/NPTool_CMake_Preamble.cmake b/NPLib/ressources/CMake/NPTool_CMake_Preamble.cmake
index 6383ff35a..3589e9dd8 100644
--- a/NPLib/ressources/CMake/NPTool_CMake_Preamble.cmake
+++ b/NPLib/ressources/CMake/NPTool_CMake_Preamble.cmake
@@ -13,6 +13,12 @@ cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
# This suppress the Up-to-Date message of file installed for cmake 3.1 and above
set(CMAKE_INSTALL_MESSAGE LAZY)
+# Set the Search path for library
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+# set NPLib/lib as one of the link directory
+link_directories(${NPTOOL_LIB_DIR})
+
# Check for user disabling of c++11 support
string(COMPARE EQUAL "${CPP11}" "no" nocpp11)
if(nocpp11)
diff --git a/NPSimulation/Detectors/AGATA/CMakeLists.txt b/NPSimulation/Detectors/AGATA/CMakeLists.txt
index d1e57aaaf..2d92b07a6 100644
--- a/NPSimulation/Detectors/AGATA/CMakeLists.txt
+++ b/NPSimulation/Detectors/AGATA/CMakeLists.txt
@@ -1,5 +1,5 @@
# Check for gdml support
if(Geant4_gdml_FOUND)
add_library(NPSAGATA SHARED AGATA.cc)
-target_link_libraries(NPSAGATA NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPAGATA)
+target_link_libraries(NPSAGATA NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPAGATA)
endif()
diff --git a/NPSimulation/Detectors/AnnularS1/CMakeLists.txt b/NPSimulation/Detectors/AnnularS1/CMakeLists.txt
index d92dba833..7b4e4318b 100644
--- a/NPSimulation/Detectors/AnnularS1/CMakeLists.txt
+++ b/NPSimulation/Detectors/AnnularS1/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSAnnularS1 SHARED AnnularS1.cc)
-target_link_libraries(NPSAnnularS1 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPAnnularS1)
+target_link_libraries(NPSAnnularS1 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPAnnularS1)
diff --git a/NPSimulation/Detectors/ComptonTelescope/CMakeLists.txt b/NPSimulation/Detectors/ComptonTelescope/CMakeLists.txt
index d48945290..08c4db528 100644
--- a/NPSimulation/Detectors/ComptonTelescope/CMakeLists.txt
+++ b/NPSimulation/Detectors/ComptonTelescope/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSComptonTelescope SHARED ComptonTelescope.cc ComptonTelescopeScorers.cc)
-target_link_libraries(NPSComptonTelescope NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPComptonTelescope)
+target_link_libraries(NPSComptonTelescope NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPComptonTelescope)
diff --git a/NPSimulation/Detectors/CsI/CMakeLists.txt b/NPSimulation/Detectors/CsI/CMakeLists.txt
index 9d266067a..f9b862abb 100644
--- a/NPSimulation/Detectors/CsI/CMakeLists.txt
+++ b/NPSimulation/Detectors/CsI/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSCsI SHARED CsI.cc)
-target_link_libraries(NPSCsI NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPCsI)
+target_link_libraries(NPSCsI NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPCsI)
diff --git a/NPSimulation/Detectors/Eurogam/CMakeLists.txt b/NPSimulation/Detectors/Eurogam/CMakeLists.txt
index 33f2e2ef9..d55524846 100644
--- a/NPSimulation/Detectors/Eurogam/CMakeLists.txt
+++ b/NPSimulation/Detectors/Eurogam/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSEurogam SHARED Eurogam.cc)
-target_link_libraries(NPSEurogam NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPEurogam)
+target_link_libraries(NPSEurogam NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPEurogam)
diff --git a/NPSimulation/Detectors/FPDTamu/CMakeLists.txt b/NPSimulation/Detectors/FPDTamu/CMakeLists.txt
index efdea8820..1c707e9b1 100644
--- a/NPSimulation/Detectors/FPDTamu/CMakeLists.txt
+++ b/NPSimulation/Detectors/FPDTamu/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSFPDTamu SHARED FPDTamu.cc)
-target_link_libraries(NPSFPDTamu NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPFPDTamu)
+target_link_libraries(NPSFPDTamu NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPFPDTamu)
diff --git a/NPSimulation/Detectors/Fatima/CMakeLists.txt b/NPSimulation/Detectors/Fatima/CMakeLists.txt
index 64db64589..91f9fe0d5 100644
--- a/NPSimulation/Detectors/Fatima/CMakeLists.txt
+++ b/NPSimulation/Detectors/Fatima/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSFatima SHARED Fatima.cc)
-target_link_libraries(NPSFatima NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPFatima)
+target_link_libraries(NPSFatima NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPFatima)
diff --git a/NPSimulation/Detectors/GASPARD/CMakeLists.txt b/NPSimulation/Detectors/GASPARD/CMakeLists.txt
index 4799f4f45..d4a4e0c4f 100644
--- a/NPSimulation/Detectors/GASPARD/CMakeLists.txt
+++ b/NPSimulation/Detectors/GASPARD/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSGASPARD SHARED GaspardScorers.cc GaspardTracker.cc GaspardTrackerAnnular.cc GaspardTrackerDummyShape.cc GaspardTrackerModule.cc GaspardTrackerRectangle.cc GaspardTrackerSquare.cc GaspardTrackerTrapezoid.cc)
-target_link_libraries(NPSGASPARD NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPGASPARD)
+target_link_libraries(NPSGASPARD NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPGASPARD)
diff --git a/NPSimulation/Detectors/GeTAMU/CMakeLists.txt b/NPSimulation/Detectors/GeTAMU/CMakeLists.txt
index 8dca64106..846344366 100644
--- a/NPSimulation/Detectors/GeTAMU/CMakeLists.txt
+++ b/NPSimulation/Detectors/GeTAMU/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSGeTAMU SHARED GeTAMU.cc )
-target_link_libraries(NPSGeTAMU NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPGeTAMU)
+target_link_libraries(NPSGeTAMU NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPGeTAMU)
diff --git a/NPSimulation/Detectors/Helios/CMakeLists.txt b/NPSimulation/Detectors/Helios/CMakeLists.txt
index 6928bf3e5..487bf390a 100644
--- a/NPSimulation/Detectors/Helios/CMakeLists.txt
+++ b/NPSimulation/Detectors/Helios/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSHelios SHARED Helios.cc HeliosDetDummyShape.cc HeliosModule.cc HeliosScorers.cc)
-target_link_libraries(NPSHelios NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPHelios)
+target_link_libraries(NPSHelios NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPHelios)
diff --git a/NPSimulation/Detectors/Helios2/CMakeLists.txt b/NPSimulation/Detectors/Helios2/CMakeLists.txt
index 8118e68ca..be643a240 100644
--- a/NPSimulation/Detectors/Helios2/CMakeLists.txt
+++ b/NPSimulation/Detectors/Helios2/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSHelios2 SHARED Helios2.cc)
-target_link_libraries(NPSHelios2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPHelios2)
+target_link_libraries(NPSHelios2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPHelios2)
diff --git a/NPSimulation/Detectors/Hira/CMakeLists.txt b/NPSimulation/Detectors/Hira/CMakeLists.txt
index 2d325b9fa..a2f53fd2d 100644
--- a/NPSimulation/Detectors/Hira/CMakeLists.txt
+++ b/NPSimulation/Detectors/Hira/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSHira SHARED Hira.cc)
-target_link_libraries(NPSHira NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPHira)
+target_link_libraries(NPSHira NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPHira)
diff --git a/NPSimulation/Detectors/Hyde2/CMakeLists.txt b/NPSimulation/Detectors/Hyde2/CMakeLists.txt
index 605400686..78c1c91f3 100644
--- a/NPSimulation/Detectors/Hyde2/CMakeLists.txt
+++ b/NPSimulation/Detectors/Hyde2/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSHyde2 SHARED Hyde2Scorers.cc Hyde2Tracker.cc Hyde2TrackerModule.cc Hyde2TrackerSquare1.cc Hyde2TrackerTrapezoid1.cc Hyde2TrackerTrapezoid2.cc)
-target_link_libraries(NPSHyde2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPHYDE2)
+target_link_libraries(NPSHyde2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPHYDE2)
diff --git a/NPSimulation/Detectors/Lassa/CMakeLists.txt b/NPSimulation/Detectors/Lassa/CMakeLists.txt
index 179d211e9..b1e6c5f95 100644
--- a/NPSimulation/Detectors/Lassa/CMakeLists.txt
+++ b/NPSimulation/Detectors/Lassa/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSLassa SHARED Lassa.cc)
-target_link_libraries(NPSLassa NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPLassa)
+target_link_libraries(NPSLassa NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPLassa)
diff --git a/NPSimulation/Detectors/MUST2/CMakeLists.txt b/NPSimulation/Detectors/MUST2/CMakeLists.txt
index 575f80c78..3a3bbb812 100644
--- a/NPSimulation/Detectors/MUST2/CMakeLists.txt
+++ b/NPSimulation/Detectors/MUST2/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSMUST2 SHARED MUST2Array.cc MUST2Scorers.cc)
-target_link_libraries(NPSMUST2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPMUST2)
+target_link_libraries(NPSMUST2 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPMUST2)
diff --git a/NPSimulation/Detectors/Microball/CMakeLists.txt b/NPSimulation/Detectors/Microball/CMakeLists.txt
index e6671135e..57ec8665a 100644
--- a/NPSimulation/Detectors/Microball/CMakeLists.txt
+++ b/NPSimulation/Detectors/Microball/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSMicroball SHARED Microball.cc)
-target_link_libraries(NPSMicroball NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPMicroball)
+target_link_libraries(NPSMicroball NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPMicroball)
diff --git a/NPSimulation/Detectors/Miniball/CMakeLists.txt b/NPSimulation/Detectors/Miniball/CMakeLists.txt
index b10ddc4e1..b1a100149 100644
--- a/NPSimulation/Detectors/Miniball/CMakeLists.txt
+++ b/NPSimulation/Detectors/Miniball/CMakeLists.txt
@@ -1,5 +1,5 @@
# Check for gdml support
if(Geant4_gdml_FOUND)
add_library(NPSMiniball SHARED Miniball.cc)
-target_link_libraries(NPSMiniball NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPMiniball)
+target_link_libraries(NPSMiniball NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPMiniball)
endif()
diff --git a/NPSimulation/Detectors/Nana/CMakeLists.txt b/NPSimulation/Detectors/Nana/CMakeLists.txt
index 9eaa1f6ef..76107e6cc 100644
--- a/NPSimulation/Detectors/Nana/CMakeLists.txt
+++ b/NPSimulation/Detectors/Nana/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSNana SHARED Nana.cc)
-target_link_libraries(NPSNana NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPNana)
+target_link_libraries(NPSNana NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPNana)
diff --git a/NPSimulation/Detectors/NeutronWall/CMakeLists.txt b/NPSimulation/Detectors/NeutronWall/CMakeLists.txt
index e0dcd1fbe..dd4b536c4 100644
--- a/NPSimulation/Detectors/NeutronWall/CMakeLists.txt
+++ b/NPSimulation/Detectors/NeutronWall/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSNeutronWall SHARED NeutronWall.cc)
-target_link_libraries(NPSNeutronWall NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPNeutronWall)
+target_link_libraries(NPSNeutronWall NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPNeutronWall)
diff --git a/NPSimulation/Detectors/Paris/CMakeLists.txt b/NPSimulation/Detectors/Paris/CMakeLists.txt
index 618fde020..762aecbf2 100644
--- a/NPSimulation/Detectors/Paris/CMakeLists.txt
+++ b/NPSimulation/Detectors/Paris/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSParis SHARED Paris.cc)
-target_link_libraries(NPSParis NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPParis)
+target_link_libraries(NPSParis NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPParis)
diff --git a/NPSimulation/Detectors/Plastic/CMakeLists.txt b/NPSimulation/Detectors/Plastic/CMakeLists.txt
index d7994b4e9..b34ff69c1 100644
--- a/NPSimulation/Detectors/Plastic/CMakeLists.txt
+++ b/NPSimulation/Detectors/Plastic/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSPlastic SHARED Plastic.cc)
-target_link_libraries(NPSPlastic NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPPlastic)
+target_link_libraries(NPSPlastic NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPPlastic)
diff --git a/NPSimulation/Detectors/QQQ/CMakeLists.txt b/NPSimulation/Detectors/QQQ/CMakeLists.txt
index 87313bebd..c979e23e6 100644
--- a/NPSimulation/Detectors/QQQ/CMakeLists.txt
+++ b/NPSimulation/Detectors/QQQ/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSQQQ SHARED QQQ.cc)
-target_link_libraries(NPSQQQ NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPQQQ)
+target_link_libraries(NPSQQQ NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPQQQ)
diff --git a/NPSimulation/Detectors/SSSD/CMakeLists.txt b/NPSimulation/Detectors/SSSD/CMakeLists.txt
index ca38832e5..c8977eea9 100644
--- a/NPSimulation/Detectors/SSSD/CMakeLists.txt
+++ b/NPSimulation/Detectors/SSSD/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSSSSD SHARED SSSD.cc)
-target_link_libraries(NPSSSSD NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPSSSD)
+target_link_libraries(NPSSSSD NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPSSSD)
diff --git a/NPSimulation/Detectors/Sharc/CMakeLists.txt b/NPSimulation/Detectors/Sharc/CMakeLists.txt
index eb358ec9b..9d0bdc5fc 100644
--- a/NPSimulation/Detectors/Sharc/CMakeLists.txt
+++ b/NPSimulation/Detectors/Sharc/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSSharc SHARED Sharc.cc)
-target_link_libraries(NPSSharc NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPSharc)
+target_link_libraries(NPSSharc NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPSharc)
diff --git a/NPSimulation/Detectors/TRex/CMakeLists.txt b/NPSimulation/Detectors/TRex/CMakeLists.txt
index 400fc9ca5..4bd7a204c 100644
--- a/NPSimulation/Detectors/TRex/CMakeLists.txt
+++ b/NPSimulation/Detectors/TRex/CMakeLists.txt
@@ -1,5 +1,5 @@
# Check for gdml support
if(Geant4_gdml_FOUND)
add_library(NPSTRex SHARED TRex.cc)
-target_link_libraries(NPSTRex NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPTRex)
+target_link_libraries(NPSTRex NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPTRex)
endif()
diff --git a/NPSimulation/Detectors/Tiara/CMakeLists.txt b/NPSimulation/Detectors/Tiara/CMakeLists.txt
index aa2f6600f..02661ba8c 100644
--- a/NPSimulation/Detectors/Tiara/CMakeLists.txt
+++ b/NPSimulation/Detectors/Tiara/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSTiara SHARED Tiara.cc)
-target_link_libraries(NPSTiara NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPTiara)
+target_link_libraries(NPSTiara NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPTiara)
diff --git a/NPSimulation/Detectors/Tigress/CMakeLists.txt b/NPSimulation/Detectors/Tigress/CMakeLists.txt
index c93d4e4c1..5a8080b9e 100644
--- a/NPSimulation/Detectors/Tigress/CMakeLists.txt
+++ b/NPSimulation/Detectors/Tigress/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSTigress SHARED Tigress.cc)
-target_link_libraries(NPSTigress NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPTigress)
+target_link_libraries(NPSTigress NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPTigress)
diff --git a/NPSimulation/Detectors/W1/CMakeLists.txt b/NPSimulation/Detectors/W1/CMakeLists.txt
index 409e42829..7bb530317 100644
--- a/NPSimulation/Detectors/W1/CMakeLists.txt
+++ b/NPSimulation/Detectors/W1/CMakeLists.txt
@@ -1,2 +1,2 @@
add_library(NPSW1 SHARED W1.cc W1Scorers.cc)
-target_link_libraries(NPSW1 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPW1)
+target_link_libraries(NPSW1 NPSCore ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} NPW1)
diff --git a/Projects/S1554/macro/MgCSLab.cxx b/Projects/S1554/macro/MgCSLab.cxx
index dad050953..d089f10f3 100644
--- a/Projects/S1554/macro/MgCSLab.cxx
+++ b/Projects/S1554/macro/MgCSLab.cxx
@@ -14,10 +14,10 @@ void MgCSLab(){
TH2* Eff = (TH2*) file->FindObjectAny("SolidAngleLab_2D");
Goodfile = new TFile("GoodExThetaLab.root");
- TH2D* goodEx = (TH2D*) Goodfile->FindObjectAny("hexcmG");
+ TH2D* goodEx = (TH2D*) Goodfile->FindObjectAny("hEL");
Badfile = new TFile("BadExThetaLab.root");
- TH2D* badEx = (TH2D*) Badfile->FindObjectAny("hexcmB");
+ TH2D* badEx = (TH2D*) Badfile->FindObjectAny("hbEL");
TH2D* h = goodEx;
badEx->Scale(7./(145-1+300-160));
@@ -37,12 +37,14 @@ void MgCSLab(){
// Full Ex
p = h->ProjectionY(Form("p%i",nn++),h->GetXaxis()->FindBin(0.),h->GetXaxis()->FindBin(50.));
p->Draw();
-
+ cout << 5 << endl;
+
new TCanvas();
h->Draw("colz");
// CS
TCanvas* c = new TCanvas("CS","CS",1000,1000);
c->Divide(2,2);
+cout << 6 << endl;
// Region
current = Region(-0.1,0.4,h,c,nn++,Eff);
--
GitLab