diff --git a/NPLib/Detectors/AGATA/CMakeLists.txt b/NPLib/Detectors/AGATA/CMakeLists.txt
index 0e21e9bbde0782565ff5d9db8c19b65958c79349..eefb98e970153a025d407c63e01c484fe1a6e869 100644
--- a/NPLib/Detectors/AGATA/CMakeLists.txt
+++ b/NPLib/Detectors/AGATA/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TAGATAPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TAGATAPhysics.h TAGATAPhysicsDict.cxx TAGATAPhysics.rootmap libNPAGATA.dylib DEPENDS TAGATAPhysics.h)
-add_custom_command(OUTPUT TAGATADataDict.cxx COMMAND ../../scripts/build_dict.sh TAGATAData.h TAGATADataDict.cxx TAGATAData.rootmap libNPAGATA.dylib DEPENDS TAGATAData.h)
+add_custom_command(OUTPUT TAGATAPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TAGATAPhysics.h TAGATAPhysicsDict.cxx TAGATAPhysics.rootmap libNPAGATA.dylib DEPENDS TAGATAPhysics.h)
+add_custom_command(OUTPUT TAGATADataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TAGATAData.h TAGATADataDict.cxx TAGATAData.rootmap libNPAGATA.dylib DEPENDS TAGATAData.h)
add_library(NPAGATA SHARED TAGATASpectra.cxx TAGATAData.cxx TAGATAPhysics.cxx TAGATADataDict.cxx TAGATAPhysicsDict.cxx )
target_link_libraries(NPAGATA ${ROOT_LIBRARIES} NPCore)
install(FILES TAGATAData.h TAGATAPhysics.h TAGATASpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/AnnularCsI/CMakeLists.txt b/NPLib/Detectors/AnnularCsI/CMakeLists.txt
index 07e1b7135cf976ddb7ee3e54c2a5ae08ff2b2bac..dfa7d196f442b6d2a0f65474917f6166c5f80e24 100644
--- a/NPLib/Detectors/AnnularCsI/CMakeLists.txt
+++ b/NPLib/Detectors/AnnularCsI/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TAnnularCsIPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TAnnularCsIPhysics.h TAnnularCsIPhysicsDict.cxx TAnnularCsIPhysics.rootmap libNPAnnularCsI.dylib DEPENDS TAnnularCsIPhysics.h)
-add_custom_command(OUTPUT TAnnularCsIDataDict.cxx COMMAND ../../scripts/build_dict.sh TAnnularCsIData.h TAnnularCsIDataDict.cxx TAnnularCsIData.rootmap libNPAnnularCsI.dylib DEPENDS TAnnularCsIData.h)
+add_custom_command(OUTPUT TAnnularCsIPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TAnnularCsIPhysics.h TAnnularCsIPhysicsDict.cxx TAnnularCsIPhysics.rootmap libNPAnnularCsI.dylib DEPENDS TAnnularCsIPhysics.h)
+add_custom_command(OUTPUT TAnnularCsIDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TAnnularCsIData.h TAnnularCsIDataDict.cxx TAnnularCsIData.rootmap libNPAnnularCsI.dylib DEPENDS TAnnularCsIData.h)
add_library(NPAnnularCsI SHARED TAnnularCsISpectra.cxx TAnnularCsIData.cxx TAnnularCsIPhysics.cxx TAnnularCsIDataDict.cxx TAnnularCsIPhysicsDict.cxx AnnularCsI_Utils.cxx)
target_link_libraries(NPAnnularCsI ${ROOT_LIBRARIES} NPCore)
install(FILES TAnnularCsIData.h TAnnularCsIPhysics.h TAnnularCsISpectra.h AnnularCsI_Utils.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/AnnularS1/CMakeLists.txt b/NPLib/Detectors/AnnularS1/CMakeLists.txt
index b3317ab79dfac622852c05a475e86d2c825a12ae..d067d03dd2444a5c8c5f3490247987b7574f69c4 100644
--- a/NPLib/Detectors/AnnularS1/CMakeLists.txt
+++ b/NPLib/Detectors/AnnularS1/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TAnnularS1PhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TAnnularS1Physics.h TAnnularS1PhysicsDict.cxx TAnnularS1Physics.rootmap libNPAnnularS1.dylib DEPENDS TAnnularS1Physics.h)
-add_custom_command(OUTPUT TS1DataDict.cxx COMMAND ../../scripts/build_dict.sh TS1Data.h TS1DataDict.cxx TS1Data.rootmap libNPAnnularS1.dylib DEPENDS TS1Data.h)
+add_custom_command(OUTPUT TAnnularS1PhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TAnnularS1Physics.h TAnnularS1PhysicsDict.cxx TAnnularS1Physics.rootmap libNPAnnularS1.dylib DEPENDS TAnnularS1Physics.h)
+add_custom_command(OUTPUT TS1DataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TS1Data.h TS1DataDict.cxx TS1Data.rootmap libNPAnnularS1.dylib DEPENDS TS1Data.h)
add_library(NPAnnularS1 SHARED TS1Data.cxx TAnnularS1Physics.cxx TS1DataDict.cxx TAnnularS1PhysicsDict.cxx)
target_link_libraries(NPAnnularS1 ${ROOT_LIBRARIES} NPCore)
install(FILES TS1Data.h TAnnularS1Physics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/AnnularS2/CMakeLists.txt b/NPLib/Detectors/AnnularS2/CMakeLists.txt
index 2a7c6ad70a11a698ca91c755bf8c9eea18034886..f502012e31066e168d36110b7772284d6c9c96e4 100644
--- a/NPLib/Detectors/AnnularS2/CMakeLists.txt
+++ b/NPLib/Detectors/AnnularS2/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TS2PhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TS2Physics.h TS2PhysicsDict.cxx TS2Physics.rootmap libNPAnnularS2.dylib DEPENDS TS2Physics.h)
-add_custom_command(OUTPUT TS2DataDict.cxx COMMAND ../../scripts/build_dict.sh TS2Data.h TS2DataDict.cxx TS2Data.rootmap libNPAnnularS2.dylib DEPENDS TS2Data.h)
+add_custom_command(OUTPUT TS2PhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TS2Physics.h TS2PhysicsDict.cxx TS2Physics.rootmap libNPAnnularS2.dylib DEPENDS TS2Physics.h)
+add_custom_command(OUTPUT TS2DataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TS2Data.h TS2DataDict.cxx TS2Data.rootmap libNPAnnularS2.dylib DEPENDS TS2Data.h)
add_library(NPAnnularS2 SHARED TS2Data.cxx TS2Physics.cxx TS2DataDict.cxx TS2PhysicsDict.cxx )
target_link_libraries(NPAnnularS2 ${ROOT_LIBRARIES} NPCore)
install(FILES TS2Data.h TS2Physics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/AnnularS4/CMakeLists.txt b/NPLib/Detectors/AnnularS4/CMakeLists.txt
index 570d77d958b1da5f447b4fadf31bd65d56081516..4c8b98b7419baad9824bcbd1a830a1d9ca2613da 100644
--- a/NPLib/Detectors/AnnularS4/CMakeLists.txt
+++ b/NPLib/Detectors/AnnularS4/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TAnnularS4PhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TAnnularS4Physics.h TAnnularS4PhysicsDict.cxx TAnnularS4Physics.rootmap libNPAnnularS4.dylib DEPENDS TAnnularS4Physics.h)
-add_custom_command(OUTPUT TAnnularS4DataDict.cxx COMMAND ../../scripts/build_dict.sh TAnnularS4Data.h TAnnularS4DataDict.cxx TAnnularS4Data.rootmap libNPAnnularS4.dylib DEPENDS TAnnularS4Data.h)
+add_custom_command(OUTPUT TAnnularS4PhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TAnnularS4Physics.h TAnnularS4PhysicsDict.cxx TAnnularS4Physics.rootmap libNPAnnularS4.dylib DEPENDS TAnnularS4Physics.h)
+add_custom_command(OUTPUT TAnnularS4DataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TAnnularS4Data.h TAnnularS4DataDict.cxx TAnnularS4Data.rootmap libNPAnnularS4.dylib DEPENDS TAnnularS4Data.h)
add_library(NPAnnularS4 SHARED TAnnularS4Spectra.cxx TAnnularS4Data.cxx TAnnularS4Physics.cxx TAnnularS4DataDict.cxx TAnnularS4PhysicsDict.cxx )
target_link_libraries(NPAnnularS4 ${ROOT_LIBRARIES} NPCore)
install(FILES TAnnularS4Data.h TAnnularS4Physics.h TAnnularS4Spectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/AnnularTelescope/CMakeLists.txt b/NPLib/Detectors/AnnularTelescope/CMakeLists.txt
index a84cdcfe3437b3ba1fec3a476cc3fb3585cd498e..81faffe0ca26b9cc01d78c6acaaf6a748fd529b0 100644
--- a/NPLib/Detectors/AnnularTelescope/CMakeLists.txt
+++ b/NPLib/Detectors/AnnularTelescope/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TAnnularTelescopePhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TAnnularTelescopePhysics.h TAnnularTelescopePhysicsDict.cxx TAnnularTelescopePhysics.rootmap libNPAnnularTelescope.dylib DEPENDS TAnnularTelescopePhysics.h)
-add_custom_command(OUTPUT TAnnularTelescopeDataDict.cxx COMMAND ../../scripts/build_dict.sh TAnnularTelescopeData.h TAnnularTelescopeDataDict.cxx TAnnularTelescopeData.rootmap libNPAnnularTelescope.dylib DEPENDS TAnnularTelescopeData.h)
+add_custom_command(OUTPUT TAnnularTelescopePhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TAnnularTelescopePhysics.h TAnnularTelescopePhysicsDict.cxx TAnnularTelescopePhysics.rootmap libNPAnnularTelescope.dylib DEPENDS TAnnularTelescopePhysics.h)
+add_custom_command(OUTPUT TAnnularTelescopeDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TAnnularTelescopeData.h TAnnularTelescopeDataDict.cxx TAnnularTelescopeData.rootmap libNPAnnularTelescope.dylib DEPENDS TAnnularTelescopeData.h)
add_library(NPAnnularTelescope SHARED TAnnularTelescopeSpectra.cxx TAnnularTelescopeData.cxx TAnnularTelescopePhysics.cxx TAnnularTelescopeDataDict.cxx TAnnularTelescopePhysicsDict.cxx AnnularTelescope_Utils.cxx)
target_link_libraries(NPAnnularTelescope ${ROOT_LIBRARIES} NPCore)
install(FILES TAnnularTelescopeData.h TAnnularTelescopePhysics.h TAnnularTelescopeSpectra.h AnnularTelescope_Utils.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/CATS/CMakeLists.txt b/NPLib/Detectors/CATS/CMakeLists.txt
index cfc5685586195a2e025dd198cfe9a08a897ef02a..3eab080524bdaa1f73869fe48ba41b2f1db398fb 100644
--- a/NPLib/Detectors/CATS/CMakeLists.txt
+++ b/NPLib/Detectors/CATS/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TCATSPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TCATSPhysics.h TCATSPhysicsDict.cxx TCATSPhysics.rootmap libNPCATS.dylib DEPENDS TCATSPhysics.h)
-add_custom_command(OUTPUT TCATSDataDict.cxx COMMAND ../../scripts/build_dict.sh TCATSData.h TCATSDataDict.cxx TCATSData.rootmap libNPCATS.dylib DEPENDS TCATSData.h)
+add_custom_command(OUTPUT TCATSPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TCATSPhysics.h TCATSPhysicsDict.cxx TCATSPhysics.rootmap libNPCATS.dylib DEPENDS TCATSPhysics.h)
+add_custom_command(OUTPUT TCATSDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TCATSData.h TCATSDataDict.cxx TCATSData.rootmap libNPCATS.dylib DEPENDS TCATSData.h)
add_library(NPCATS SHARED TCATSData.cxx TCATSPhysics.cxx TCATSDataDict.cxx TCATSPhysicsDict.cxx TCATSSpectra.cxx)
target_link_libraries(NPCATS ${ROOT_LIBRARIES} NPCore)
install(FILES TCATSData.h TCATSPhysics.h TCATSSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Charissa/CMakeLists.txt b/NPLib/Detectors/Charissa/CMakeLists.txt
index 2e30231ddf2cf8139ad689daa385bf899d539ccb..48abe8fe207fc9ad4e602f3d605c715438bf7beb 100644
--- a/NPLib/Detectors/Charissa/CMakeLists.txt
+++ b/NPLib/Detectors/Charissa/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TCharissaPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TCharissaPhysics.h TCharissaPhysicsDict.cxx TCharissaPhysics.rootmap libNPCharissa.dylib DEPENDS TCharissaPhysics.h)
-add_custom_command(OUTPUT TCharissaDataDict.cxx COMMAND ../../scripts/build_dict.sh TCharissaData.h TCharissaDataDict.cxx TCharissaData.rootmap libNPCharissa.dylib DEPENDS TCharissaData.h)
+add_custom_command(OUTPUT TCharissaPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TCharissaPhysics.h TCharissaPhysicsDict.cxx TCharissaPhysics.rootmap libNPCharissa.dylib DEPENDS TCharissaPhysics.h)
+add_custom_command(OUTPUT TCharissaDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TCharissaData.h TCharissaDataDict.cxx TCharissaData.rootmap libNPCharissa.dylib DEPENDS TCharissaData.h)
add_library(NPCharissa SHARED TCharissaData.cxx TCharissaPhysics.cxx TCharissaDataDict.cxx TCharissaPhysicsDict.cxx TCharissaSpectra.cxx)
target_link_libraries(NPCharissa ${ROOT_LIBRARIES} NPCore)
install(FILES TCharissaData.h TCharissaPhysics.h TCharissaSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/ChateauCristal/CMakeLists.txt b/NPLib/Detectors/ChateauCristal/CMakeLists.txt
index 7da76b7e702bf7da304f823e9d515db4d68d670c..5d87ea50d0d99f2acb33590ec0d16131100075fb 100644
--- a/NPLib/Detectors/ChateauCristal/CMakeLists.txt
+++ b/NPLib/Detectors/ChateauCristal/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TChateauCristalPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TChateauCristalPhysics.h TChateauCristalPhysicsDict.cxx TChateauCristalPhysics.rootmap libNPChateauCristal.dylib DEPENDS TChateauCristalPhysics.h)
-add_custom_command(OUTPUT TChateauCristalDataDict.cxx COMMAND ../../scripts/build_dict.sh TChateauCristalData.h TChateauCristalDataDict.cxx TChateauCristalData.rootmap libNPChateauCristal.dylib DEPENDS TChateauCristalData.h)
+add_custom_command(OUTPUT TChateauCristalPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TChateauCristalPhysics.h TChateauCristalPhysicsDict.cxx TChateauCristalPhysics.rootmap libNPChateauCristal.dylib DEPENDS TChateauCristalPhysics.h)
+add_custom_command(OUTPUT TChateauCristalDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TChateauCristalData.h TChateauCristalDataDict.cxx TChateauCristalData.rootmap libNPChateauCristal.dylib DEPENDS TChateauCristalData.h)
add_library(NPChateauCristal SHARED TChateauCristalData.cxx TChateauCristalPhysics.cxx TChateauCristalDataDict.cxx TChateauCristalPhysicsDict.cxx )
target_link_libraries(NPChateauCristal ${ROOT_LIBRARIES} NPCore)
install(FILES TChateauCristalData.h TChateauCristalPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/ChiNu/CMakeLists.txt b/NPLib/Detectors/ChiNu/CMakeLists.txt
index 0f6ba26c30cd0f776af2ff4ff52e58411ee94456..65901944efb3089f69f9fd7ed3d922bd06dfed46 100644
--- a/NPLib/Detectors/ChiNu/CMakeLists.txt
+++ b/NPLib/Detectors/ChiNu/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TChiNuPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TChiNuPhysics.h TChiNuPhysicsDict.cxx TChiNuPhysics.rootmap libNPChiNu.dylib DEPENDS TChiNuPhysics.h)
-add_custom_command(OUTPUT TChiNuDataDict.cxx COMMAND ../../scripts/build_dict.sh TChiNuData.h TChiNuDataDict.cxx TChiNuData.rootmap libNPChiNu.dylib DEPENDS TChiNuData.h)
+add_custom_command(OUTPUT TChiNuPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TChiNuPhysics.h TChiNuPhysicsDict.cxx TChiNuPhysics.rootmap libNPChiNu.dylib DEPENDS TChiNuPhysics.h)
+add_custom_command(OUTPUT TChiNuDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TChiNuData.h TChiNuDataDict.cxx TChiNuData.rootmap libNPChiNu.dylib DEPENDS TChiNuData.h)
add_library(NPChiNu SHARED TChiNuSpectra.cxx TChiNuData.cxx TChiNuPhysics.cxx TChiNuDataDict.cxx TChiNuPhysicsDict.cxx )
target_link_libraries(NPChiNu ${ROOT_LIBRARIES} NPCore)
install(FILES TChiNuData.h TChiNuPhysics.h TChiNuSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Chio/CMakeLists.txt b/NPLib/Detectors/Chio/CMakeLists.txt
index 1532dea305138a51727311ba9a39c6f2f28dcf7e..d00b2c64a6f13a33a97ec3825ffbd699bf1154f8 100644
--- a/NPLib/Detectors/Chio/CMakeLists.txt
+++ b/NPLib/Detectors/Chio/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_custom_command(OUTPUT TChio_digPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TChio_digPhysics.h TChio_digPhysicsDict.cxx TChio_digPhysics.rootmap libNPChio.dylib DEPENDS TChio_digPhysics.h)
-add_custom_command(OUTPUT TChio_anPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TChio_anPhysics.h TChio_anPhysicsDict.cxx TChio_anPhysics.rootmap libNPChio.dylib DEPENDS TChio_anPhysics.h)
-add_custom_command(OUTPUT TChio_digDataDict.cxx COMMAND ../../scripts/build_dict.sh TChio_digData.h TChio_digDataDict.cxx TChio_digData.rootmap libNPChio.dylib DEPENDS TChio_digData.h)
-add_custom_command(OUTPUT TChio_anDataDict.cxx COMMAND ../../scripts/build_dict.sh TChio_anData.h TChio_anDataDict.cxx TChio_anData.rootmap libNPChio.dylib DEPENDS TChio_anData.h)
+add_custom_command(OUTPUT TChio_digPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TChio_digPhysics.h TChio_digPhysicsDict.cxx TChio_digPhysics.rootmap libNPChio.dylib DEPENDS TChio_digPhysics.h)
+add_custom_command(OUTPUT TChio_anPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TChio_anPhysics.h TChio_anPhysicsDict.cxx TChio_anPhysics.rootmap libNPChio.dylib DEPENDS TChio_anPhysics.h)
+add_custom_command(OUTPUT TChio_digDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TChio_digData.h TChio_digDataDict.cxx TChio_digData.rootmap libNPChio.dylib DEPENDS TChio_digData.h)
+add_custom_command(OUTPUT TChio_anDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TChio_anData.h TChio_anDataDict.cxx TChio_anData.rootmap libNPChio.dylib DEPENDS TChio_anData.h)
add_library(NPChio SHARED TChio_anData.cxx TChio_anPhysics.cxx TChio_anDataDict.cxx TChio_anPhysicsDict.cxx TChio_digData.cxx TChio_digPhysics.cxx TChio_digDataDict.cxx TChio_digPhysicsDict.cxx )
target_link_libraries(NPChio ${ROOT_LIBRARIES} NPCore)
diff --git a/NPLib/Detectors/ComptonTelescope/CMakeLists.txt b/NPLib/Detectors/ComptonTelescope/CMakeLists.txt
index 930c7583ec4e04643138f5fae63fd8cff6bb7739..585d18e7079b3f5a82a59077869157ad77f07d0d 100644
--- a/NPLib/Detectors/ComptonTelescope/CMakeLists.txt
+++ b/NPLib/Detectors/ComptonTelescope/CMakeLists.txt
@@ -1,6 +1,6 @@
-add_custom_command(OUTPUT TComptonTelescopePhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TComptonTelescopePhysics.h TComptonTelescopePhysicsDict.cxx TComptonTelescopePhysics.rootmap libNPComptonTelescope.dylib DEPENDS TComptonTelescopePhysics.h)
-add_custom_command(OUTPUT TComptonTelescopeProcessDataDict.cxx COMMAND ../../scripts/build_dict.sh TComptonTelescopeProcessData.h TComptonTelescopeProcessDataDict.cxx TComptonTelescopeProcessData.rootmap libNPComptonTelescope.dylib DEPENDS TComptonTelescopeProcessData.h)
-add_custom_command(OUTPUT TComptonTelescopeDataDict.cxx COMMAND ../../scripts/build_dict.sh TComptonTelescopeData.h TComptonTelescopeDataDict.cxx TComptonTelescopeData.rootmap libNPComptonTelescope.dylib DEPENDS TComptonTelescopeData.h)
+add_custom_command(OUTPUT TComptonTelescopePhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TComptonTelescopePhysics.h TComptonTelescopePhysicsDict.cxx TComptonTelescopePhysics.rootmap libNPComptonTelescope.dylib DEPENDS TComptonTelescopePhysics.h)
+add_custom_command(OUTPUT TComptonTelescopeProcessDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TComptonTelescopeProcessData.h TComptonTelescopeProcessDataDict.cxx TComptonTelescopeProcessData.rootmap libNPComptonTelescope.dylib DEPENDS TComptonTelescopeProcessData.h)
+add_custom_command(OUTPUT TComptonTelescopeDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TComptonTelescopeData.h TComptonTelescopeDataDict.cxx TComptonTelescopeData.rootmap libNPComptonTelescope.dylib DEPENDS TComptonTelescopeData.h)
add_library(NPComptonTelescope SHARED TComptonTelescopeData.cxx TComptonTelescopePhysics.cxx TComptonTelescopeDataDict.cxx TComptonTelescopePhysicsDict.cxx TComptonTelescopeSpectra.cxx TComptonTelescopeProcessData.cxx TComptonTelescopeProcessDataDict.cxx)
target_link_libraries(NPComptonTelescope ${ROOT_LIBRARIES} NPCore)
install(FILES TComptonTelescopeProcessData.h TComptonTelescopeData.h TComptonTelescopePhysics.h TComptonTelescopeSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/CsI/CMakeLists.txt b/NPLib/Detectors/CsI/CMakeLists.txt
index 6c60751b109c9701a91cb35c425842c4a24f5dec..d07c9c57410666e536b15adfc1672a1a25be5b13 100644
--- a/NPLib/Detectors/CsI/CMakeLists.txt
+++ b/NPLib/Detectors/CsI/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TCsIPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TCsIPhysics.h TCsIPhysicsDict.cxx TCsIPhysics.rootmap libNPCsI.dylib DEPENDS TCsIPhysics.h)
-add_custom_command(OUTPUT TCsIDataDict.cxx COMMAND ../../scripts/build_dict.sh TCsIData.h TCsIDataDict.cxx TCsIData.rootmap libNPCsI.dylib DEPENDS TCsIData.h)
+add_custom_command(OUTPUT TCsIPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TCsIPhysics.h TCsIPhysicsDict.cxx TCsIPhysics.rootmap libNPCsI.dylib DEPENDS TCsIPhysics.h)
+add_custom_command(OUTPUT TCsIDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TCsIData.h TCsIDataDict.cxx TCsIData.rootmap libNPCsI.dylib DEPENDS TCsIData.h)
add_library(NPCsI SHARED TCsIData.cxx TCsIPhysics.cxx TCsIDataDict.cxx TCsIPhysicsDict.cxx )
target_link_libraries(NPCsI ${ROOT_LIBRARIES} NPCore)
install(FILES TCsIData.h TCsIPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Dali/CMakeLists.txt b/NPLib/Detectors/Dali/CMakeLists.txt
index 7e3a9c4d3f5be7ad882a84e51a0806c0d6287ee3..b508778c268a676661bbdaee0f4f553a870b6ff3 100644
--- a/NPLib/Detectors/Dali/CMakeLists.txt
+++ b/NPLib/Detectors/Dali/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TDaliPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TDaliPhysics.h TDaliPhysicsDict.cxx TDaliPhysics.rootmap libNPDali.dylib DEPENDS TDaliPhysics.h)
-add_custom_command(OUTPUT TDaliDataDict.cxx COMMAND ../../scripts/build_dict.sh TDaliData.h TDaliDataDict.cxx TDaliData.rootmap libNPDali.dylib DEPENDS TDaliData.h)
+add_custom_command(OUTPUT TDaliPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TDaliPhysics.h TDaliPhysicsDict.cxx TDaliPhysics.rootmap libNPDali.dylib DEPENDS TDaliPhysics.h)
+add_custom_command(OUTPUT TDaliDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TDaliData.h TDaliDataDict.cxx TDaliData.rootmap libNPDali.dylib DEPENDS TDaliData.h)
add_library(NPDali SHARED TDaliSpectra.cxx TDaliData.cxx TDaliPhysics.cxx TDaliDataDict.cxx TDaliPhysicsDict.cxx )
target_link_libraries(NPDali ${ROOT_LIBRARIES} NPCore)
install(FILES TDaliData.h TDaliPhysics.h TDaliSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/EXL/CMakeLists.txt b/NPLib/Detectors/EXL/CMakeLists.txt
index 90d72bbe46f82a9160e8ae261a2f573c54fa31ef..2349f4860722d522822aa1ee1b36e6c46821a8ba 100644
--- a/NPLib/Detectors/EXL/CMakeLists.txt
+++ b/NPLib/Detectors/EXL/CMakeLists.txt
@@ -1,6 +1,6 @@
-add_custom_command(OUTPUT TExlPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TExlPhysics.h TExlPhysicsDict.cxx TExlPhysics.rootmap libNPEXL.dylib DEPENDS TExlPhysics.h)
-add_custom_command(OUTPUT TExlDataDict.cxx COMMAND ../../scripts/build_dict.sh TExlData.h TExlDataDict.cxx TExlData.rootmap libNPEXL.dylib DEPENDS TExlData.h)
-add_custom_command(OUTPUT TExlSpectraDict.cxx COMMAND ../../scripts/build_dict.sh TExlSpectra.h TExlSpectraDict.cxx TExlSpectra.rootmap libNPEXL.dylib DEPENDS TExlSpectra.h)
+add_custom_command(OUTPUT TExlPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TExlPhysics.h TExlPhysicsDict.cxx TExlPhysics.rootmap libNPEXL.dylib DEPENDS TExlPhysics.h)
+add_custom_command(OUTPUT TExlDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TExlData.h TExlDataDict.cxx TExlData.rootmap libNPEXL.dylib DEPENDS TExlData.h)
+add_custom_command(OUTPUT TExlSpectraDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TExlSpectra.h TExlSpectraDict.cxx TExlSpectra.rootmap libNPEXL.dylib DEPENDS TExlSpectra.h)
add_library(NPEXL SHARED TExlData.cxx TExlPhysics.cxx TExlSpectra.cxx TExlDataDict.cxx TExlPhysicsDict.cxx TExlSpectraDict.cxx)
target_link_libraries(NPEXL ${ROOT_LIBRARIES} NPCore)
install(FILES TExlData.h TExlPhysics.h TExlSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Eurogam/CMakeLists.txt b/NPLib/Detectors/Eurogam/CMakeLists.txt
index 555d606fcd371b15dd69828ca2838f1918c294e5..61fbebe6730b6e992ec4c2ff15ded4d8c86a7b53 100644
--- a/NPLib/Detectors/Eurogam/CMakeLists.txt
+++ b/NPLib/Detectors/Eurogam/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_custom_command(OUTPUT TEurogamDataDict.cxx COMMAND ../../scripts/build_dict.sh TEurogamData.h TEurogamDataDict.cxx TEurogamData.rootmap libNPEurogam.dylib DEPENDS TEurogamData.h)
+add_custom_command(OUTPUT TEurogamDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TEurogamData.h TEurogamDataDict.cxx TEurogamData.rootmap libNPEurogam.dylib DEPENDS TEurogamData.h)
add_library(NPEurogam SHARED TEurogamData.cxx TEurogamDataDict.cxx )
target_link_libraries(NPEurogam ${ROOT_LIBRARIES} NPCore)
install(FILES TEurogamData.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Exogam/CMakeLists.txt b/NPLib/Detectors/Exogam/CMakeLists.txt
index e7fbc634b2cd63e197cd5ecf15b127a05e922013..66c3fcef707dfcac3842fbccef42431fc3588e71 100644
--- a/NPLib/Detectors/Exogam/CMakeLists.txt
+++ b/NPLib/Detectors/Exogam/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TExogamPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TExogamPhysics.h TExogamPhysicsDict.cxx TExogamPhysics.rootmap libNPExogam.dylib DEPENDS TExogamPhysics.h)
-add_custom_command(OUTPUT TExogamDataDict.cxx COMMAND ../../scripts/build_dict.sh TExogamData.h TExogamDataDict.cxx TExogamData.rootmap libNPExogam.dylib DEPENDS TExogamData.h)
+add_custom_command(OUTPUT TExogamPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TExogamPhysics.h TExogamPhysicsDict.cxx TExogamPhysics.rootmap libNPExogam.dylib DEPENDS TExogamPhysics.h)
+add_custom_command(OUTPUT TExogamDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TExogamData.h TExogamDataDict.cxx TExogamData.rootmap libNPExogam.dylib DEPENDS TExogamData.h)
add_library(NPExogam SHARED TExogamData.cxx TExogamPhysics.cxx TExogamDataDict.cxx TExogamPhysicsDict.cxx TExogamSpectra.cxx)
target_link_libraries(NPExogam ${ROOT_LIBRARIES} NPCore)
install(FILES TExogamData.h TExogamPhysics.h TExogamSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/FPDTamu/CMakeLists.txt b/NPLib/Detectors/FPDTamu/CMakeLists.txt
index ac13ca0d0d062557bf4ce98216c1fb283a9502fd..b09b9e8c29371f172e08a22ba7ed27042367bbd0 100644
--- a/NPLib/Detectors/FPDTamu/CMakeLists.txt
+++ b/NPLib/Detectors/FPDTamu/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TFPDTamuPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TFPDTamuPhysics.h TFPDTamuPhysicsDict.cxx TFPDTamuPhysics.rootmap libNPFPDTamu.dylib DEPENDS TFPDTamuPhysics.h)
-add_custom_command(OUTPUT TFPDTamuDataDict.cxx COMMAND ../../scripts/build_dict.sh TFPDTamuData.h TFPDTamuDataDict.cxx TFPDTamuData.rootmap libNPFPDTamu.dylib DEPENDS TFPDTamuData.h)
+add_custom_command(OUTPUT TFPDTamuPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TFPDTamuPhysics.h TFPDTamuPhysicsDict.cxx TFPDTamuPhysics.rootmap libNPFPDTamu.dylib DEPENDS TFPDTamuPhysics.h)
+add_custom_command(OUTPUT TFPDTamuDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TFPDTamuData.h TFPDTamuDataDict.cxx TFPDTamuData.rootmap libNPFPDTamu.dylib DEPENDS TFPDTamuData.h)
add_library(NPFPDTamu SHARED TFPDTamuSpectra.cxx TFPDTamuData.cxx TFPDTamuPhysics.cxx TFPDTamuDataDict.cxx TFPDTamuPhysicsDict.cxx )
target_link_libraries(NPFPDTamu ${ROOT_LIBRARIES} NPCore)
install(FILES TFPDTamuData.h TFPDTamuPhysics.h TFPDTamuSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Fatima/CMakeLists.txt b/NPLib/Detectors/Fatima/CMakeLists.txt
index 11ac9e6be8f1c96f680083206391dc32ebd4516e..64dec0a436b780b34354f9bdb3257b2a22c7f5a6 100644
--- a/NPLib/Detectors/Fatima/CMakeLists.txt
+++ b/NPLib/Detectors/Fatima/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TFatimaPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TFatimaPhysics.h TFatimaPhysicsDict.cxx TFatimaPhysics.rootmap libNPFatima.dylib DEPENDS TFatimaPhysics.h)
-add_custom_command(OUTPUT TFatimaDataDict.cxx COMMAND ../../scripts/build_dict.sh TFatimaData.h TFatimaDataDict.cxx TFatimaData.rootmap libNPFatima.dylib DEPENDS TFatimaData.h)
+add_custom_command(OUTPUT TFatimaPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TFatimaPhysics.h TFatimaPhysicsDict.cxx TFatimaPhysics.rootmap libNPFatima.dylib DEPENDS TFatimaPhysics.h)
+add_custom_command(OUTPUT TFatimaDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TFatimaData.h TFatimaDataDict.cxx TFatimaData.rootmap libNPFatima.dylib DEPENDS TFatimaData.h)
add_library(NPFatima SHARED TFatimaData.cxx TFatimaPhysics.cxx TFatimaDataDict.cxx TFatimaPhysicsDict.cxx )
target_link_libraries(NPFatima ${ROOT_LIBRARIES} NPCore)
install(FILES TFatimaData.h TFatimaPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Foil/CMakeLists.txt b/NPLib/Detectors/Foil/CMakeLists.txt
index 045b1b59c893afa542d8a52a2d7ac23f2dce9975..f48c57f4797283c188f34dcffd98ebfcaec8c1dc 100644
--- a/NPLib/Detectors/Foil/CMakeLists.txt
+++ b/NPLib/Detectors/Foil/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TFoilPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TFoilPhysics.h TFoilPhysicsDict.cxx TFoilPhysics.rootmap libNPFoil.dylib DEPENDS TFoilPhysics.h)
-add_custom_command(OUTPUT TFoilDataDict.cxx COMMAND ../../scripts/build_dict.sh TFoilData.h TFoilDataDict.cxx TFoilData.rootmap libNPFoil.dylib DEPENDS TFoilData.h)
+add_custom_command(OUTPUT TFoilPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TFoilPhysics.h TFoilPhysicsDict.cxx TFoilPhysics.rootmap libNPFoil.dylib DEPENDS TFoilPhysics.h)
+add_custom_command(OUTPUT TFoilDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TFoilData.h TFoilDataDict.cxx TFoilData.rootmap libNPFoil.dylib DEPENDS TFoilData.h)
add_library(NPFoil SHARED TFoilData.cxx TFoilPhysics.cxx TFoilDataDict.cxx TFoilPhysicsDict.cxx )
target_link_libraries(NPFoil ${ROOT_LIBRARIES} NPCore)
install(FILES TFoilData.h TFoilPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/ForwardArray/CMakeLists.txt b/NPLib/Detectors/ForwardArray/CMakeLists.txt
index 3e862d3b6485541e33b43ec4e89ca9aabfdf183a..c57fd56b2e930f344bde816e6a2b80c1725db349 100644
--- a/NPLib/Detectors/ForwardArray/CMakeLists.txt
+++ b/NPLib/Detectors/ForwardArray/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TForwardArrayPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TForwardArrayPhysics.h TForwardArrayPhysicsDict.cxx TForwardArrayPhysics.rootmap libNPForwardArray.dylib DEPENDS TForwardArrayPhysics.h)
-add_custom_command(OUTPUT TForwardArrayDataDict.cxx COMMAND ../../scripts/build_dict.sh TForwardArrayData.h TForwardArrayDataDict.cxx TForwardArrayData.rootmap libNPForwardArray.dylib DEPENDS TForwardArrayData.h)
+add_custom_command(OUTPUT TForwardArrayPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TForwardArrayPhysics.h TForwardArrayPhysicsDict.cxx TForwardArrayPhysics.rootmap libNPForwardArray.dylib DEPENDS TForwardArrayPhysics.h)
+add_custom_command(OUTPUT TForwardArrayDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TForwardArrayData.h TForwardArrayDataDict.cxx TForwardArrayData.rootmap libNPForwardArray.dylib DEPENDS TForwardArrayData.h)
add_library(NPForwardArray SHARED TForwardArraySpectra.cxx TForwardArrayData.cxx TForwardArrayPhysics.cxx TForwardArrayDataDict.cxx TForwardArrayPhysicsDict.cxx )
target_link_libraries(NPForwardArray ${ROOT_LIBRARIES} NPCore)
install(FILES TForwardArrayData.h TForwardArrayPhysics.h TForwardArraySpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/GANIL/CMakeLists.txt b/NPLib/Detectors/GANIL/CMakeLists.txt
index 72e7f377e2405e1dad2f91ace7c60028868cfae8..0f442987797c4aeacbdb46885d215c22e942da37 100644
--- a/NPLib/Detectors/GANIL/CMakeLists.txt
+++ b/NPLib/Detectors/GANIL/CMakeLists.txt
@@ -1,6 +1,6 @@
-add_custom_command(OUTPUT TTacPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TTacPhysics.h TTacPhysicsDict.cxx TTacPhysics.rootmap libNPGANIL.dylib DEPENDS TTacPhysics.h)
-add_custom_command(OUTPUT TTriggerDataDict.cxx COMMAND ../../scripts/build_dict.sh TTriggerData.h TTriggerDataDict.cxx TTriggerData.rootmap libNPGANIL.dylib DEPENDS TTriggerData.h)
-add_custom_command(OUTPUT TTacDataDict.cxx COMMAND ../../scripts/build_dict.sh TTacData.h TTacDataDict.cxx TTacData.rootmap libNPGANIL.dylib DEPENDS TTacData.h)
+add_custom_command(OUTPUT TTacPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTacPhysics.h TTacPhysicsDict.cxx TTacPhysics.rootmap libNPGANIL.dylib DEPENDS TTacPhysics.h)
+add_custom_command(OUTPUT TTriggerDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTriggerData.h TTriggerDataDict.cxx TTriggerData.rootmap libNPGANIL.dylib DEPENDS TTriggerData.h)
+add_custom_command(OUTPUT TTacDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTacData.h TTacDataDict.cxx TTacData.rootmap libNPGANIL.dylib DEPENDS TTacData.h)
add_library(NPGANIL SHARED TTacPhysics.cxx TTacData.cxx TTriggerData.cxx TTacDataDict.cxx TTriggerDataDict.cxx TTacPhysicsDict.cxx)
target_link_libraries(NPGANIL ${ROOT_LIBRARIES} NPCore)
install(FILES TTacData.h TTriggerData.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/GASPARD/CMakeLists.txt b/NPLib/Detectors/GASPARD/CMakeLists.txt
index a998025247b3a00720561ef4cbf0e6d2f9df3841..c065c221d836fe365c9d4b12e8bd511cee29d993 100644
--- a/NPLib/Detectors/GASPARD/CMakeLists.txt
+++ b/NPLib/Detectors/GASPARD/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TGaspardTrackerPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TGaspardTrackerPhysics.h TGaspardTrackerPhysicsDict.cxx TGaspardTrackerPhysics.rootmap libNPGASPARD.dylib DEPENDS TGaspardTrackerPhysics.h)
-add_custom_command(OUTPUT TGaspardTrackerDataDict.cxx COMMAND ../../scripts/build_dict.sh TGaspardTrackerData.h TGaspardTrackerDataDict.cxx TGaspardTrackerData.rootmap libNPGASPARD.dylib DEPENDS TGaspardTrackerData.h)
+add_custom_command(OUTPUT TGaspardTrackerPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TGaspardTrackerPhysics.h TGaspardTrackerPhysicsDict.cxx TGaspardTrackerPhysics.rootmap libNPGASPARD.dylib DEPENDS TGaspardTrackerPhysics.h)
+add_custom_command(OUTPUT TGaspardTrackerDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TGaspardTrackerData.h TGaspardTrackerDataDict.cxx TGaspardTrackerData.rootmap libNPGASPARD.dylib DEPENDS TGaspardTrackerData.h)
add_library(NPGASPARD SHARED GaspardTracker.cxx GaspardTrackerAnnular.cxx GaspardTrackerDummyShape.cxx GaspardTrackerModule.cxx GaspardTrackerTrapezoid.cxx GaspardTrackerSquare.cxx GaspardTrackerRectangle.cxx TGaspardTrackerData.cxx TGaspardTrackerPhysics.cxx TGaspardTrackerDataDict.cxx TGaspardTrackerPhysicsDict.cxx )
target_link_libraries(NPGASPARD ${ROOT_LIBRARIES} NPCore)
install(FILES TGaspardTrackerData.h TGaspardTrackerPhysics.h GaspardTracker.h GaspardTrackerAnnular.h GaspardTrackerDummyShape.h GaspardTrackerModule.h GaspardTrackerRectangle.h GaspardTrackerSquare.h GaspardTrackerTrapezoid.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/GeTAMU/CMakeLists.txt b/NPLib/Detectors/GeTAMU/CMakeLists.txt
index f903e7c54184130b4847ddf163ef18529e89dd84..6d840205eb9fe922363ed6566368de26943b3f5d 100644
--- a/NPLib/Detectors/GeTAMU/CMakeLists.txt
+++ b/NPLib/Detectors/GeTAMU/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TGeTAMUPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TGeTAMUPhysics.h TGeTAMUPhysicsDict.cxx TGeTAMUPhysics.rootmap libNPGeTAMU.dylib DEPENDS TGeTAMUPhysics.h)
-add_custom_command(OUTPUT TGeTAMUDataDict.cxx COMMAND ../../scripts/build_dict.sh TGeTAMUData.h TGeTAMUDataDict.cxx TGeTAMUData.rootmap libNPGeTAMU.dylib DEPENDS TGeTAMUData.h)
+add_custom_command(OUTPUT TGeTAMUPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TGeTAMUPhysics.h TGeTAMUPhysicsDict.cxx TGeTAMUPhysics.rootmap libNPGeTAMU.dylib DEPENDS TGeTAMUPhysics.h)
+add_custom_command(OUTPUT TGeTAMUDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TGeTAMUData.h TGeTAMUDataDict.cxx TGeTAMUData.rootmap libNPGeTAMU.dylib DEPENDS TGeTAMUData.h)
add_library(NPGeTAMU SHARED TGeTAMUData.cxx TGeTAMUPhysics.cxx TGeTAMUDataDict.cxx TGeTAMUPhysicsDict.cxx )
target_link_libraries(NPGeTAMU ${ROOT_LIBRARIES} NPCore)
install(FILES TGeTAMUData.h TGeTAMUPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/HYDE2/CMakeLists.txt b/NPLib/Detectors/HYDE2/CMakeLists.txt
index 59091a64af3b5b11c720e8b0b14a12caf9699701..a2c577d9e013af7da52ac418f590ac4ad1480abd 100644
--- a/NPLib/Detectors/HYDE2/CMakeLists.txt
+++ b/NPLib/Detectors/HYDE2/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT THyde2TrackerPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh THyde2TrackerPhysics.h THyde2TrackerPhysicsDict.cxx THyde2TrackerPhysics.rootmap libNPHYDE2.dylib DEPENDS THyde2TrackerPhysics.h)
-add_custom_command(OUTPUT THyde2TrackerDataDict.cxx COMMAND ../../scripts/build_dict.sh THyde2TrackerData.h THyde2TrackerDataDict.cxx THyde2TrackerData.rootmap libNPHYDE2.dylib DEPENDS THyde2TrackerData.h)
+add_custom_command(OUTPUT THyde2TrackerPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh THyde2TrackerPhysics.h THyde2TrackerPhysicsDict.cxx THyde2TrackerPhysics.rootmap libNPHYDE2.dylib DEPENDS THyde2TrackerPhysics.h)
+add_custom_command(OUTPUT THyde2TrackerDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh THyde2TrackerData.h THyde2TrackerDataDict.cxx THyde2TrackerData.rootmap libNPHYDE2.dylib DEPENDS THyde2TrackerData.h)
add_library(NPHYDE2 SHARED Hyde2Tracker.cxx Hyde2TrackerModule.cxx Hyde2TrackerTrapezoid1.cxx Hyde2TrackerTrapezoid2.cxx Hyde2TrackerSquare1.cxx THyde2TrackerData.cxx THyde2TrackerPhysics.cxx THyde2TrackerDataDict.cxx THyde2TrackerPhysicsDict.cxx )
target_link_libraries(NPHYDE2 ${ROOT_LIBRARIES} NPCore)
install(FILES THyde2TrackerData.h THyde2TrackerPhysics.h Hyde2Tracker.h Hyde2TrackerModule.h Hyde2TrackerSquare1.h Hyde2TrackerTrapezoid1.h Hyde2TrackerTrapezoid2.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Helios/CMakeLists.txt b/NPLib/Detectors/Helios/CMakeLists.txt
index b97770f02e0804a9de5cd7accd547adebab75885..f396f282a18bfe5f0560fd11003a237911a27e02 100644
--- a/NPLib/Detectors/Helios/CMakeLists.txt
+++ b/NPLib/Detectors/Helios/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT THeliosPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh THeliosPhysics.h THeliosPhysicsDict.cxx THeliosPhysics.rootmap libNPHelios.dylib DEPENDS THeliosPhysics.h)
-add_custom_command(OUTPUT THeliosDataDict.cxx COMMAND ../../scripts/build_dict.sh THeliosData.h THeliosDataDict.cxx THeliosData.rootmap libNPHelios.dylib DEPENDS THeliosData.h)
+add_custom_command(OUTPUT THeliosPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh THeliosPhysics.h THeliosPhysicsDict.cxx THeliosPhysics.rootmap libNPHelios.dylib DEPENDS THeliosPhysics.h)
+add_custom_command(OUTPUT THeliosDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh THeliosData.h THeliosDataDict.cxx THeliosData.rootmap libNPHelios.dylib DEPENDS THeliosData.h)
add_library(NPHelios SHARED THeliosSpectra.cxx THeliosData.cxx THeliosPhysics.cxx THeliosDataDict.cxx THeliosPhysicsDict.cxx )
target_link_libraries(NPHelios ${ROOT_LIBRARIES} NPCore)
install(FILES THeliosData.h THeliosPhysics.h THeliosSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Hira/CMakeLists.txt b/NPLib/Detectors/Hira/CMakeLists.txt
index a74d38d13c62bf32f50999eb5368f2b49fa474c6..4a403dcd48ce19eed98afa905de28a181398df2c 100644
--- a/NPLib/Detectors/Hira/CMakeLists.txt
+++ b/NPLib/Detectors/Hira/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT THiraPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh THiraPhysics.h THiraPhysicsDict.cxx THiraPhysics.rootmap libNPHira.dylib DEPENDS THiraPhysics.h)
-add_custom_command(OUTPUT THiraDataDict.cxx COMMAND ../../scripts/build_dict.sh THiraData.h THiraDataDict.cxx THiraData.rootmap libNPHira.dylib DEPENDS THiraData.h)
+add_custom_command(OUTPUT THiraPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh THiraPhysics.h THiraPhysicsDict.cxx THiraPhysics.rootmap libNPHira.dylib DEPENDS THiraPhysics.h)
+add_custom_command(OUTPUT THiraDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh THiraData.h THiraDataDict.cxx THiraData.rootmap libNPHira.dylib DEPENDS THiraData.h)
add_library(NPHira SHARED THiraData.cxx THiraPhysics.cxx THiraDataDict.cxx THiraPhysicsDict.cxx )
target_link_libraries(NPHira ${ROOT_LIBRARIES} NPCore)
install(FILES THiraData.h THiraPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/LaBr3/CMakeLists.txt b/NPLib/Detectors/LaBr3/CMakeLists.txt
index d891779846470145666249d2e12080c2515a6b47..cfbe1a62dc7c5392113a912f0b07aeb3f6065fb6 100644
--- a/NPLib/Detectors/LaBr3/CMakeLists.txt
+++ b/NPLib/Detectors/LaBr3/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TLaBr3PhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TLaBr3Physics.h TLaBr3PhysicsDict.cxx TLaBr3Physics.rootmap libNPLaBr3.dylib DEPENDS TLaBr3Physics.h)
-add_custom_command(OUTPUT TLaBr3DataDict.cxx COMMAND ../../scripts/build_dict.sh TLaBr3Data.h TLaBr3DataDict.cxx TLaBr3Data.rootmap libNPLaBr3.dylib DEPENDS TLaBr3Data.h)
+add_custom_command(OUTPUT TLaBr3PhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TLaBr3Physics.h TLaBr3PhysicsDict.cxx TLaBr3Physics.rootmap libNPLaBr3.dylib DEPENDS TLaBr3Physics.h)
+add_custom_command(OUTPUT TLaBr3DataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TLaBr3Data.h TLaBr3DataDict.cxx TLaBr3Data.rootmap libNPLaBr3.dylib DEPENDS TLaBr3Data.h)
add_library(NPLaBr3 SHARED TLaBr3Data.cxx TLaBr3Physics.cxx TLaBr3DataDict.cxx TLaBr3PhysicsDict.cxx TLaBr3Spectra.cxx)
target_link_libraries(NPLaBr3 ${ROOT_LIBRARIES} NPCore)
install(FILES TLaBr3Data.h TLaBr3Physics.h TLaBr3Spectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Lassa/CMakeLists.txt b/NPLib/Detectors/Lassa/CMakeLists.txt
index 905a47b7b724c14c8becc694d13fab7efb730d1d..d931588362d1c38679f135a55bd64571594a1211 100644
--- a/NPLib/Detectors/Lassa/CMakeLists.txt
+++ b/NPLib/Detectors/Lassa/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TLassaPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TLassaPhysics.h TLassaPhysicsDict.cxx TLassaPhysics.rootmap libNPLassa.dylib DEPENDS TLassaPhysics.h)
-add_custom_command(OUTPUT TLassaDataDict.cxx COMMAND ../../scripts/build_dict.sh TLassaData.h TLassaDataDict.cxx TLassaData.rootmap libNPLassa.dylib DEPENDS TLassaData.h)
+add_custom_command(OUTPUT TLassaPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TLassaPhysics.h TLassaPhysicsDict.cxx TLassaPhysics.rootmap libNPLassa.dylib DEPENDS TLassaPhysics.h)
+add_custom_command(OUTPUT TLassaDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TLassaData.h TLassaDataDict.cxx TLassaData.rootmap libNPLassa.dylib DEPENDS TLassaData.h)
add_library(NPLassa SHARED TLassaData.cxx TLassaPhysics.cxx TLassaDataDict.cxx TLassaPhysicsDict.cxx )
target_link_libraries(NPLassa ${ROOT_LIBRARIES} NPCore)
install(FILES TLassaData.h TLassaPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/LightPipe/CMakeLists.txt b/NPLib/Detectors/LightPipe/CMakeLists.txt
index 75f70cf2b36aa3329585bb4648364bd1aa32264f..c82ddaa50a69913a3db42140e1d0ddc21070dda2 100644
--- a/NPLib/Detectors/LightPipe/CMakeLists.txt
+++ b/NPLib/Detectors/LightPipe/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TLightPipePhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TLightPipePhysics.h TLightPipePhysicsDict.cxx TLightPipePhysics.rootmap libNPLightPipe.dylib DEPENDS TLightPipePhysics.h)
-add_custom_command(OUTPUT TLightPipeDataDict.cxx COMMAND ../../scripts/build_dict.sh TLightPipeData.h TLightPipeDataDict.cxx TLightPipeData.rootmap libNPLightPipe.dylib DEPENDS TLightPipeData.h)
+add_custom_command(OUTPUT TLightPipePhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TLightPipePhysics.h TLightPipePhysicsDict.cxx TLightPipePhysics.rootmap libNPLightPipe.dylib DEPENDS TLightPipePhysics.h)
+add_custom_command(OUTPUT TLightPipeDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TLightPipeData.h TLightPipeDataDict.cxx TLightPipeData.rootmap libNPLightPipe.dylib DEPENDS TLightPipeData.h)
add_library(NPLightPipe SHARED TLightPipeSpectra.cxx TLightPipeData.cxx TLightPipePhysics.cxx TLightPipeDataDict.cxx TLightPipePhysicsDict.cxx )
target_link_libraries(NPLightPipe ${ROOT_LIBRARIES} NPCore)
install(FILES TLightPipeData.h TLightPipePhysics.h TLightPipeSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/MDM/CMakeLists.txt b/NPLib/Detectors/MDM/CMakeLists.txt
index 0d433a44bcb999665b7ab0e40efb96b7aed4199d..a19d84ba6821c9327de91ac28bf4c990681b1894 100644
--- a/NPLib/Detectors/MDM/CMakeLists.txt
+++ b/NPLib/Detectors/MDM/CMakeLists.txt
@@ -1,8 +1,8 @@
include(CheckLanguage)
-add_custom_command(OUTPUT TMDMPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TMDMPhysics.h TMDMPhysicsDict.cxx TMDMPhysics.rootmap libNPMDM.dylib DEPENDS TMDMPhysics.h)
-add_custom_command(OUTPUT TMDMPhysicsMinimizerDict.cxx COMMAND ../../scripts/build_dict.sh TMDMPhysicsMinimizer.h TMDMPhysicsMinimizerDict.cxx TMDMPhysicsMinimizer.rootmap libNPMDM.dylib DEPENDS TMDMPhysicsMinimizer.h)
-add_custom_command(OUTPUT TMDMDataDict.cxx COMMAND ../../scripts/build_dict.sh TMDMData.h TMDMDataDict.cxx TMDMData.rootmap libNPMDM.dylib DEPENDS TMDMData.h)
+add_custom_command(OUTPUT TMDMPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMDMPhysics.h TMDMPhysicsDict.cxx TMDMPhysics.rootmap libNPMDM.dylib DEPENDS TMDMPhysics.h)
+add_custom_command(OUTPUT TMDMPhysicsMinimizerDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMDMPhysicsMinimizer.h TMDMPhysicsMinimizerDict.cxx TMDMPhysicsMinimizer.rootmap libNPMDM.dylib DEPENDS TMDMPhysicsMinimizer.h)
+add_custom_command(OUTPUT TMDMDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMDMData.h TMDMDataDict.cxx TMDMData.rootmap libNPMDM.dylib DEPENDS TMDMData.h)
##
## Check if MINUIT2 is installed along with ROOT
diff --git a/NPLib/Detectors/MUST2/CMakeLists.txt b/NPLib/Detectors/MUST2/CMakeLists.txt
index cfad4bca9a86e10258eff0f0a965fd2a0f6eb803..db5eba5e356d841bb42c38325071d13295ee6314 100644
--- a/NPLib/Detectors/MUST2/CMakeLists.txt
+++ b/NPLib/Detectors/MUST2/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TMust2PhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TMust2Physics.h TMust2PhysicsDict.cxx TMust2Physics.rootmap libNPMUST2.dylib DEPENDS TMust2Physics.h)
-add_custom_command(OUTPUT TMust2DataDict.cxx COMMAND ../../scripts/build_dict.sh TMust2Data.h TMust2DataDict.cxx TMust2Data.rootmap libNPMUST2.dylib DEPENDS TMust2Data.h)
+add_custom_command(OUTPUT TMust2PhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMust2Physics.h TMust2PhysicsDict.cxx TMust2Physics.rootmap libNPMUST2.dylib DEPENDS TMust2Physics.h)
+add_custom_command(OUTPUT TMust2DataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMust2Data.h TMust2DataDict.cxx TMust2Data.rootmap libNPMUST2.dylib DEPENDS TMust2Data.h)
add_library(NPMUST2 SHARED TMust2Data.cxx TMust2Physics.cxx TMust2DataDict.cxx TMust2PhysicsDict.cxx TMust2Spectra.cxx)
target_link_libraries(NPMUST2 ${ROOT_LIBRARIES} NPCore)
install(FILES TMust2Data.h TMust2Physics.h TMust2Spectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Maya/CMakeLists.txt b/NPLib/Detectors/Maya/CMakeLists.txt
index 7abe143da52867713f2a0dea13690819d1f06d97..af13de01276c903ded28b6ff0a236962a1b17994 100644
--- a/NPLib/Detectors/Maya/CMakeLists.txt
+++ b/NPLib/Detectors/Maya/CMakeLists.txt
@@ -1,6 +1,6 @@
if(DEFINED ENV{ROOTSYS})
-add_custom_command(OUTPUT TMayaDataDict.cxx COMMAND ../../scripts/build_dict.sh TMayaData.h TMayaDataDict.cxx TMayaData.rootmap libNPMaya.dylib DEPENDS TMayaData.h)
-add_custom_command(OUTPUT TMayaHistoDict.cxx COMMAND ../../scripts/build_dict.sh TMayaHisto.h TMayaHistoDict.cxx TMayaHisto.rootmap libNPMaya.dylib DEPENDS TMayaHisto.h)
+add_custom_command(OUTPUT TMayaDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMayaData.h TMayaDataDict.cxx TMayaData.rootmap libNPMaya.dylib DEPENDS TMayaData.h)
+add_custom_command(OUTPUT TMayaHistoDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMayaHisto.h TMayaHistoDict.cxx TMayaHisto.rootmap libNPMaya.dylib DEPENDS TMayaHisto.h)
add_library(NPMaya SHARED TMayaData.cxx TMayaHisto.cxx TMayaDataDict.cxx TMayaHistoDict.cxx ConfigReader.cxx)
diff --git a/NPLib/Detectors/Microball/CMakeLists.txt b/NPLib/Detectors/Microball/CMakeLists.txt
index 63ea5977a7d9d5885bbcd8c568e2343e8792711d..430ffa152c1e20259c5cfc7c128e2039b2ac8581 100644
--- a/NPLib/Detectors/Microball/CMakeLists.txt
+++ b/NPLib/Detectors/Microball/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TMicroballPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TMicroballPhysics.h TMicroballPhysicsDict.cxx TMicroballPhysics.rootmap libNPMicroball.dylib DEPENDS TMicroballPhysics.h)
-add_custom_command(OUTPUT TMicroballDataDict.cxx COMMAND ../../scripts/build_dict.sh TMicroballData.h TMicroballDataDict.cxx TMicroballData.rootmap libNPMicroball.dylib DEPENDS TMicroballData.h)
+add_custom_command(OUTPUT TMicroballPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMicroballPhysics.h TMicroballPhysicsDict.cxx TMicroballPhysics.rootmap libNPMicroball.dylib DEPENDS TMicroballPhysics.h)
+add_custom_command(OUTPUT TMicroballDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMicroballData.h TMicroballDataDict.cxx TMicroballData.rootmap libNPMicroball.dylib DEPENDS TMicroballData.h)
add_library(NPMicroball SHARED TMicroballSpectra.cxx TMicroballData.cxx TMicroballPhysics.cxx TMicroballDataDict.cxx TMicroballPhysicsDict.cxx )
target_link_libraries(NPMicroball ${ROOT_LIBRARIES} NPCore)
install(FILES TMicroballData.h TMicroballPhysics.h TMicroballSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Miniball/CMakeLists.txt b/NPLib/Detectors/Miniball/CMakeLists.txt
index 56254714f37e01bcb16d16062da6d869a7900ef7..475a12d1eb029027fcadd3b405d5d5f8676a15d7 100644
--- a/NPLib/Detectors/Miniball/CMakeLists.txt
+++ b/NPLib/Detectors/Miniball/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TMiniballPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TMiniballPhysics.h TMiniballPhysicsDict.cxx TMiniballPhysics.rootmap libNPMiniball.dylib DEPENDS TMiniballPhysics.h)
-add_custom_command(OUTPUT TMiniballDataDict.cxx COMMAND ../../scripts/build_dict.sh TMiniballData.h TMiniballDataDict.cxx TMiniballData.rootmap libNPMiniball.dylib DEPENDS TMiniballData.h)
+add_custom_command(OUTPUT TMiniballPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMiniballPhysics.h TMiniballPhysicsDict.cxx TMiniballPhysics.rootmap libNPMiniball.dylib DEPENDS TMiniballPhysics.h)
+add_custom_command(OUTPUT TMiniballDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMiniballData.h TMiniballDataDict.cxx TMiniballData.rootmap libNPMiniball.dylib DEPENDS TMiniballData.h)
add_library(NPMiniball SHARED TMiniballSpectra.cxx TMiniballData.cxx TMiniballPhysics.cxx TMiniballDataDict.cxx TMiniballPhysicsDict.cxx )
target_link_libraries(NPMiniball ${ROOT_LIBRARIES} NPCore)
install(FILES TMiniballData.h TMiniballPhysics.h TMiniballSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/ModularLeaf/CMakeLists.txt b/NPLib/Detectors/ModularLeaf/CMakeLists.txt
index 104b310bb4d476a71a8a09537ded520680292c05..7064dda935943e627b71fc966696f4387ae2ef14 100644
--- a/NPLib/Detectors/ModularLeaf/CMakeLists.txt
+++ b/NPLib/Detectors/ModularLeaf/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_custom_command(OUTPUT TModularLeafPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TModularLeafPhysics.h TModularLeafPhysicsDict.cxx TModularLeafPhysics.rootmap libNPModularLeaf.dylib DEPENDS TModularLeafPhysics.h)
+add_custom_command(OUTPUT TModularLeafPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TModularLeafPhysics.h TModularLeafPhysicsDict.cxx TModularLeafPhysics.rootmap libNPModularLeaf.dylib DEPENDS TModularLeafPhysics.h)
add_library(NPModularLeaf SHARED TModularLeafPhysics.cxx TModularLeafPhysicsDict.cxx TModularLeafSpectra.cxx)
target_link_libraries(NPModularLeaf ${ROOT_LIBRARIES} NPCore)
install(FILES TModularLeafPhysics.h TModularLeafSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Mugast/CMakeLists.txt b/NPLib/Detectors/Mugast/CMakeLists.txt
index e11a41e88cd4b9110560a0ceb913d6f962f95fb9..61c30d22685a1224ac05d5cebe94fc7e5a50c6c3 100644
--- a/NPLib/Detectors/Mugast/CMakeLists.txt
+++ b/NPLib/Detectors/Mugast/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TMugastPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TMugastPhysics.h TMugastPhysicsDict.cxx TMugastPhysics.rootmap libNPMugast.dylib DEPENDS TMugastPhysics.h)
-add_custom_command(OUTPUT TMugastDataDict.cxx COMMAND ../../scripts/build_dict.sh TMugastData.h TMugastDataDict.cxx TMugastData.rootmap libNPMugast.dylib DEPENDS TMugastData.h)
+add_custom_command(OUTPUT TMugastPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMugastPhysics.h TMugastPhysicsDict.cxx TMugastPhysics.rootmap libNPMugast.dylib DEPENDS TMugastPhysics.h)
+add_custom_command(OUTPUT TMugastDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TMugastData.h TMugastDataDict.cxx TMugastData.rootmap libNPMugast.dylib DEPENDS TMugastData.h)
#add_library(NPMUST2 SHARED TMugastData.cxx TMugastPhysics.cxx TMugastDataDict.cxx TMugastPhysicsDict.cxx TMugastSpectra.cxx)
add_library(NPMugast SHARED TMugastData.cxx TMugastDataDict.cxx TMugastPhysics.cxx TMugastPhysicsDict.cxx TMugastSpectra.h TMugastSpectra.cxx)
target_link_libraries(NPMugast ${ROOT_LIBRARIES} NPCore)
diff --git a/NPLib/Detectors/Nana/CMakeLists.txt b/NPLib/Detectors/Nana/CMakeLists.txt
index c0f7a9453522fb6eb164e8147a345ac13976ad45..19e2dcae61ec9eeeb0ae2f960fb59c6a2d6df175 100644
--- a/NPLib/Detectors/Nana/CMakeLists.txt
+++ b/NPLib/Detectors/Nana/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TNanaPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TNanaPhysics.h TNanaPhysicsDict.cxx TNanaPhysics.rootmap libNPNana.dylib DEPENDS TNanaPhysics.h)
-add_custom_command(OUTPUT TNanaDataDict.cxx COMMAND ../../scripts/build_dict.sh TNanaData.h TNanaDataDict.cxx TNanaData.rootmap libNPNana.dylib DEPENDS TNanaData.h)
+add_custom_command(OUTPUT TNanaPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TNanaPhysics.h TNanaPhysicsDict.cxx TNanaPhysics.rootmap libNPNana.dylib DEPENDS TNanaPhysics.h)
+add_custom_command(OUTPUT TNanaDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TNanaData.h TNanaDataDict.cxx TNanaData.rootmap libNPNana.dylib DEPENDS TNanaData.h)
add_library(NPNana SHARED TNanaData.cxx TNanaPhysics.cxx TNanaDataDict.cxx TNanaPhysicsDict.cxx )
target_link_libraries(NPNana ${ROOT_LIBRARIES} NPCore)
install(FILES TNanaData.h TNanaPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Nebula/CMakeLists.txt b/NPLib/Detectors/Nebula/CMakeLists.txt
index 1b0a243842d9117ae7afe6046e4f33304a92a472..51226c56ca4432329dabb4b21eccd809a60d33a2 100644
--- a/NPLib/Detectors/Nebula/CMakeLists.txt
+++ b/NPLib/Detectors/Nebula/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TNebulaPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TNebulaPhysics.h TNebulaPhysicsDict.cxx TNebulaPhysics.rootmap libNPNebula.dylib DEPENDS TNebulaPhysics.h)
-add_custom_command(OUTPUT TNebulaDataDict.cxx COMMAND ../../scripts/build_dict.sh TNebulaData.h TNebulaDataDict.cxx TNebulaData.rootmap libNPNebula.dylib DEPENDS TNebulaData.h)
+add_custom_command(OUTPUT TNebulaPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TNebulaPhysics.h TNebulaPhysicsDict.cxx TNebulaPhysics.rootmap libNPNebula.dylib DEPENDS TNebulaPhysics.h)
+add_custom_command(OUTPUT TNebulaDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TNebulaData.h TNebulaDataDict.cxx TNebulaData.rootmap libNPNebula.dylib DEPENDS TNebulaData.h)
add_library(NPNebula SHARED TNebulaSpectra.cxx TNebulaData.cxx TNebulaPhysics.cxx TNebulaDataDict.cxx TNebulaPhysicsDict.cxx )
target_link_libraries(NPNebula ${ROOT_LIBRARIES} NPCore)
install(FILES TNebulaData.h TNebulaPhysics.h TNebulaSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/NeutronWall/CMakeLists.txt b/NPLib/Detectors/NeutronWall/CMakeLists.txt
index aa9017a8d3279957bac96b5fad3a74c31fed1b6c..8ba7f9f70e1629c7d34d19198e45bfd458b000a1 100644
--- a/NPLib/Detectors/NeutronWall/CMakeLists.txt
+++ b/NPLib/Detectors/NeutronWall/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TNeutronWallPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TNeutronWallPhysics.h TNeutronWallPhysicsDict.cxx TNeutronWallPhysics.rootmap libNPNeutronWall.dylib DEPENDS TNeutronWallPhysics.h)
-add_custom_command(OUTPUT TNeutronWallDataDict.cxx COMMAND ../../scripts/build_dict.sh TNeutronWallData.h TNeutronWallDataDict.cxx TNeutronWallData.rootmap libNPNeutronWall.dylib DEPENDS TNeutronWallData.h)
+add_custom_command(OUTPUT TNeutronWallPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TNeutronWallPhysics.h TNeutronWallPhysicsDict.cxx TNeutronWallPhysics.rootmap libNPNeutronWall.dylib DEPENDS TNeutronWallPhysics.h)
+add_custom_command(OUTPUT TNeutronWallDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TNeutronWallData.h TNeutronWallDataDict.cxx TNeutronWallData.rootmap libNPNeutronWall.dylib DEPENDS TNeutronWallData.h)
add_library(NPNeutronWall SHARED TNeutronWallSpectra.cxx TNeutronWallData.cxx TNeutronWallPhysics.cxx TNeutronWallDataDict.cxx TNeutronWallPhysicsDict.cxx )
target_link_libraries(NPNeutronWall ${ROOT_LIBRARIES} NPCore)
install(FILES TNeutronWallData.h TNeutronWallPhysics.h TNeutronWallSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Paris/CMakeLists.txt b/NPLib/Detectors/Paris/CMakeLists.txt
index 8f7a01bccde5b3ab4623bf4d0f6667d29099f9af..edba1d0326e8e0778edb1bafdf05bf5104e0e321 100644
--- a/NPLib/Detectors/Paris/CMakeLists.txt
+++ b/NPLib/Detectors/Paris/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TParisPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TParisPhysics.h TParisPhysicsDict.cxx TParisPhysics.rootmap libNPParis.dylib DEPENDS TParisPhysics.h)
-add_custom_command(OUTPUT TParisDataDict.cxx COMMAND ../../scripts/build_dict.sh TParisData.h TParisDataDict.cxx TParisData.rootmap libNPParis.dylib DEPENDS TParisData.h)
+add_custom_command(OUTPUT TParisPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TParisPhysics.h TParisPhysicsDict.cxx TParisPhysics.rootmap libNPParis.dylib DEPENDS TParisPhysics.h)
+add_custom_command(OUTPUT TParisDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TParisData.h TParisDataDict.cxx TParisData.rootmap libNPParis.dylib DEPENDS TParisData.h)
add_library(NPParis SHARED TParisData.cxx TParisPhysics.cxx TParisDataDict.cxx TParisPhysicsDict.cxx )
target_link_libraries(NPParis ${ROOT_LIBRARIES} NPCore)
install(FILES TParisData.h TParisPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Plastic/CMakeLists.txt b/NPLib/Detectors/Plastic/CMakeLists.txt
index c56c6e794e6c9dec6f7b3208ddc041f6cf9ddce8..3ac6906763cf279ffd37def35c0f9ed07539af6e 100644
--- a/NPLib/Detectors/Plastic/CMakeLists.txt
+++ b/NPLib/Detectors/Plastic/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TPlasticPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TPlasticPhysics.h TPlasticPhysicsDict.cxx TPlasticPhysics.rootmap libNPPlastic.dylib DEPENDS TPlasticPhysics.h)
-add_custom_command(OUTPUT TPlasticDataDict.cxx COMMAND ../../scripts/build_dict.sh TPlasticData.h TPlasticDataDict.cxx TPlasticData.rootmap libNPPlastic.dylib DEPENDS TPlasticData.h)
+add_custom_command(OUTPUT TPlasticPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TPlasticPhysics.h TPlasticPhysicsDict.cxx TPlasticPhysics.rootmap libNPPlastic.dylib DEPENDS TPlasticPhysics.h)
+add_custom_command(OUTPUT TPlasticDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TPlasticData.h TPlasticDataDict.cxx TPlasticData.rootmap libNPPlastic.dylib DEPENDS TPlasticData.h)
add_library(NPPlastic SHARED TPlasticData.cxx TPlasticPhysics.cxx TPlasticDataDict.cxx TPlasticPhysicsDict.cxx )
target_link_libraries(NPPlastic ${ROOT_LIBRARIES} NPCore)
install(FILES TPlasticData.h TPlasticPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Pyramid/CMakeLists.txt b/NPLib/Detectors/Pyramid/CMakeLists.txt
index f41ebaf9bb2050406d9d1b853300de1390a70309..6d6bd0ccd87ed0412f94d81cd3784a9c9b329201 100644
--- a/NPLib/Detectors/Pyramid/CMakeLists.txt
+++ b/NPLib/Detectors/Pyramid/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TPyramidPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TPyramidPhysics.h TPyramidPhysicsDict.cxx TPyramidPhysics.rootmap libNPPyramid.dylib DEPENDS TPyramidPhysics.h)
-add_custom_command(OUTPUT TPyramidDataDict.cxx COMMAND ../../scripts/build_dict.sh TPyramidData.h TPyramidDataDict.cxx TPyramidData.rootmap libNPPyramid.dylib DEPENDS TPyramidData.h)
+add_custom_command(OUTPUT TPyramidPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TPyramidPhysics.h TPyramidPhysicsDict.cxx TPyramidPhysics.rootmap libNPPyramid.dylib DEPENDS TPyramidPhysics.h)
+add_custom_command(OUTPUT TPyramidDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TPyramidData.h TPyramidDataDict.cxx TPyramidData.rootmap libNPPyramid.dylib DEPENDS TPyramidData.h)
add_library(NPPyramid SHARED TPyramidSpectra.cxx TPyramidData.cxx TPyramidPhysics.cxx TPyramidDataDict.cxx TPyramidPhysicsDict.cxx )
target_link_libraries(NPPyramid ${ROOT_LIBRARIES} NPCore)
install(FILES TPyramidData.h TPyramidPhysics.h TPyramidSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/QQQ/CMakeLists.txt b/NPLib/Detectors/QQQ/CMakeLists.txt
index eee539be9f1ba351367dcf978868b196af005573..668ef33aa2c147901f3a9a3180ede80ad47a952d 100644
--- a/NPLib/Detectors/QQQ/CMakeLists.txt
+++ b/NPLib/Detectors/QQQ/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TQQQPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TQQQPhysics.h TQQQPhysicsDict.cxx TQQQPhysics.rootmap libNPQQQ.dylib DEPENDS TQQQPhysics.h)
-add_custom_command(OUTPUT TQQQDataDict.cxx COMMAND ../../scripts/build_dict.sh TQQQData.h TQQQDataDict.cxx TQQQData.rootmap libNPQQQ.dylib DEPENDS TQQQData.h)
+add_custom_command(OUTPUT TQQQPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TQQQPhysics.h TQQQPhysicsDict.cxx TQQQPhysics.rootmap libNPQQQ.dylib DEPENDS TQQQPhysics.h)
+add_custom_command(OUTPUT TQQQDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TQQQData.h TQQQDataDict.cxx TQQQData.rootmap libNPQQQ.dylib DEPENDS TQQQData.h)
add_library(NPQQQ SHARED TQQQData.cxx TQQQPhysics.cxx TQQQDataDict.cxx TQQQPhysicsDict.cxx )
target_link_libraries(NPQQQ ${ROOT_LIBRARIES} NPCore)
install(FILES TQQQData.h TQQQPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Riken/CMakeLists.txt b/NPLib/Detectors/Riken/CMakeLists.txt
index 7fec7b86eb0a5384f006e50201820b14aa56ef08..62411f26fa16b41bbacb3b4cde343f93d387cfdf 100644
--- a/NPLib/Detectors/Riken/CMakeLists.txt
+++ b/NPLib/Detectors/Riken/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_custom_command(OUTPUT TRIPSDataDict.cxx COMMAND ../../scripts/build_dict.sh TRIPSData.h TRIPSDataDict.cxx TRIPSData.rootmap libNPRiken.dylib DEPENDS TRIPSData.h)
+add_custom_command(OUTPUT TRIPSDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TRIPSData.h TRIPSDataDict.cxx TRIPSData.rootmap libNPRiken.dylib DEPENDS TRIPSData.h)
add_library(NPRiken SHARED TRIPSData.cxx TRIPSDataDict.cxx )
target_link_libraries(NPRiken ${ROOT_LIBRARIES} NPCore)
install(FILES TRIPSData.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/SPEG/CMakeLists.txt b/NPLib/Detectors/SPEG/CMakeLists.txt
index c33358ba6ee2f339714c426806f617e20d14a150..232221535927aa7f4d985bf9ca61e1a777e8e4bf 100644
--- a/NPLib/Detectors/SPEG/CMakeLists.txt
+++ b/NPLib/Detectors/SPEG/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_custom_command(OUTPUT TSpegPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TSpegPhysics.h TSpegPhysicsDict.cxx TSpegPhysics.rootmap libNPSPEG.dylib DEPENDS TSpegPhysics.h)
-add_custom_command(OUTPUT TSpegPlasticDataDict.cxx COMMAND ../../scripts/build_dict.sh TSpegPlasticData.h TSpegPlasticDataDict.cxx TSpegPlasticData.rootmap libNPSPEG.dylib DEPENDS TSpegPlasticData.h)
-add_custom_command(OUTPUT TSpegDCDataDict.cxx COMMAND ../../scripts/build_dict.sh TSpegDCData.h TSpegDCDataDict.cxx TSpegDCData.rootmap libNPSPEG.dylib DEPENDS TSpegDCData.h)
-add_custom_command(OUTPUT TSpegCHIODataDict.cxx COMMAND ../../scripts/build_dict.sh TSpegCHIOData.h TSpegCHIODataDict.cxx TSpegCHIOData.rootmap libNPSPEG.dylib DEPENDS TSpegCHIOData.h)
+add_custom_command(OUTPUT TSpegPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSpegPhysics.h TSpegPhysicsDict.cxx TSpegPhysics.rootmap libNPSPEG.dylib DEPENDS TSpegPhysics.h)
+add_custom_command(OUTPUT TSpegPlasticDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSpegPlasticData.h TSpegPlasticDataDict.cxx TSpegPlasticData.rootmap libNPSPEG.dylib DEPENDS TSpegPlasticData.h)
+add_custom_command(OUTPUT TSpegDCDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSpegDCData.h TSpegDCDataDict.cxx TSpegDCData.rootmap libNPSPEG.dylib DEPENDS TSpegDCData.h)
+add_custom_command(OUTPUT TSpegCHIODataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSpegCHIOData.h TSpegCHIODataDict.cxx TSpegCHIOData.rootmap libNPSPEG.dylib DEPENDS TSpegCHIOData.h)
add_library(NPSPEG SHARED TSpegCHIOData.cxx TSpegDCData.cxx TSpegPlasticData.cxx TSpegPhysics.cxx TSpegCHIODataDict.cxx TSpegDCDataDict.cxx TSpegPlasticDataDict.cxx TSpegPhysicsDict.cxx )
target_link_libraries(NPSPEG ${ROOT_LIBRARIES} NPCore)
install(FILES TSpegCHIOData.h TSpegDCData.h TSpegPlasticData.h TSpegPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/SSSD/CMakeLists.txt b/NPLib/Detectors/SSSD/CMakeLists.txt
index 01dc9fa2a624166938170904345e856020049315..999b2d20a240b525aebd7b5dbd258f3b92f00ed3 100644
--- a/NPLib/Detectors/SSSD/CMakeLists.txt
+++ b/NPLib/Detectors/SSSD/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TSSSDPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TSSSDPhysics.h TSSSDPhysicsDict.cxx TSSSDPhysics.rootmap libNPSSSD.dylib DEPENDS TSSSDPhysics.h)
-add_custom_command(OUTPUT TSSSDDataDict.cxx COMMAND ../../scripts/build_dict.sh TSSSDData.h TSSSDDataDict.cxx TSSSDData.rootmap libNPSSSD.dylib DEPENDS TSSSDData.h)
+add_custom_command(OUTPUT TSSSDPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSSSDPhysics.h TSSSDPhysicsDict.cxx TSSSDPhysics.rootmap libNPSSSD.dylib DEPENDS TSSSDPhysics.h)
+add_custom_command(OUTPUT TSSSDDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSSSDData.h TSSSDDataDict.cxx TSSSDData.rootmap libNPSSSD.dylib DEPENDS TSSSDData.h)
add_library(NPSSSD SHARED TSSSDData.cxx TSSSDPhysics.cxx TSSSDDataDict.cxx TSSSDPhysicsDict.cxx )
target_link_libraries(NPSSSD ${ROOT_LIBRARIES} NPCore)
install(FILES TSSSDData.h TSSSDPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Scone/CMakeLists.txt b/NPLib/Detectors/Scone/CMakeLists.txt
index 1e9a7565fd592d293d76036c470543a37b11da2c..2d5e14a2e3a1e23b9b9945bb48477fca465cb4c0 100644
--- a/NPLib/Detectors/Scone/CMakeLists.txt
+++ b/NPLib/Detectors/Scone/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TSconePhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TSconePhysics.h TSconePhysicsDict.cxx TSconePhysics.rootmap libNPScone.dylib DEPENDS TSconePhysics.h)
-add_custom_command(OUTPUT TSconeDataDict.cxx COMMAND ../../scripts/build_dict.sh TSconeData.h TSconeDataDict.cxx TSconeData.rootmap libNPScone.dylib DEPENDS TSconeData.h)
+add_custom_command(OUTPUT TSconePhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSconePhysics.h TSconePhysicsDict.cxx TSconePhysics.rootmap libNPScone.dylib DEPENDS TSconePhysics.h)
+add_custom_command(OUTPUT TSconeDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSconeData.h TSconeDataDict.cxx TSconeData.rootmap libNPScone.dylib DEPENDS TSconeData.h)
add_library(NPScone SHARED TSconeSpectra.cxx TSconeData.cxx TSconePhysics.cxx TSconeDataDict.cxx TSconePhysicsDict.cxx )
target_link_libraries(NPScone ${ROOT_LIBRARIES} NPCore)
install(FILES TSconeData.h TSconePhysics.h TSconeSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Sharc/CMakeLists.txt b/NPLib/Detectors/Sharc/CMakeLists.txt
index 8804ce2de415db5ee47aa4530b1ad839de029ca1..dca1589ddc4f297cffd855b72f8ce03564683e93 100644
--- a/NPLib/Detectors/Sharc/CMakeLists.txt
+++ b/NPLib/Detectors/Sharc/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TSharcPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TSharcPhysics.h TSharcPhysicsDict.cxx TSharcPhysics.rootmap libNPSharc.dylib DEPENDS TSharcPhysics.h)
-add_custom_command(OUTPUT TSharcDataDict.cxx COMMAND ../../scripts/build_dict.sh TSharcData.h TSharcDataDict.cxx TSharcData.rootmap libNPSharc.dylib DEPENDS TSharcData.h)
+add_custom_command(OUTPUT TSharcPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSharcPhysics.h TSharcPhysicsDict.cxx TSharcPhysics.rootmap libNPSharc.dylib DEPENDS TSharcPhysics.h)
+add_custom_command(OUTPUT TSharcDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSharcData.h TSharcDataDict.cxx TSharcData.rootmap libNPSharc.dylib DEPENDS TSharcData.h)
add_library(NPSharc SHARED TSharcSpectra.cxx TSharcData.cxx TSharcPhysics.cxx TSharcDataDict.cxx TSharcPhysicsDict.cxx )
target_link_libraries(NPSharc ${ROOT_LIBRARIES} NPCore)
install(FILES TSharcData.h TSharcPhysics.h TSharcSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/SiLi/CMakeLists.txt b/NPLib/Detectors/SiLi/CMakeLists.txt
index 8912eb28253a80c6e6e0215fbadb6e0e06d3d65b..3fe9b911e18231696e1918f7534ce0316d3ce6d7 100644
--- a/NPLib/Detectors/SiLi/CMakeLists.txt
+++ b/NPLib/Detectors/SiLi/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TSiLiPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TSiLiPhysics.h TSiLiPhysicsDict.cxx TSiLiPhysics.rootmap libNPSiLi.dylib DEPENDS TSiLiPhysics.h)
-add_custom_command(OUTPUT TSiLiDataDict.cxx COMMAND ../../scripts/build_dict.sh TSiLiData.h TSiLiDataDict.cxx TSiLiData.rootmap libNPSiLi.dylib DEPENDS TSiLiData.h)
+add_custom_command(OUTPUT TSiLiPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSiLiPhysics.h TSiLiPhysicsDict.cxx TSiLiPhysics.rootmap libNPSiLi.dylib DEPENDS TSiLiPhysics.h)
+add_custom_command(OUTPUT TSiLiDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSiLiData.h TSiLiDataDict.cxx TSiLiData.rootmap libNPSiLi.dylib DEPENDS TSiLiData.h)
add_library(NPSiLi SHARED TSiLiData.cxx TSiLiPhysics.cxx TSiLiDataDict.cxx TSiLiPhysicsDict.cxx TSiLiSpectra.cxx)
target_link_libraries(NPSiLi ${ROOT_LIBRARIES} NPCore)
install(FILES TSiLiData.h TSiLiPhysics.h TSiLiSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/SiRes/CMakeLists.txt b/NPLib/Detectors/SiRes/CMakeLists.txt
index dcd1104d3c4affd47fa422f753f97d0a87dc040e..8318c4571fe4ee0ea0ee8a8638bfc76eb72d5e2e 100644
--- a/NPLib/Detectors/SiRes/CMakeLists.txt
+++ b/NPLib/Detectors/SiRes/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TSiResPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TSiResPhysics.h TSiResPhysicsDict.cxx TSiResPhysics.rootmap libNPSiRes.dylib DEPENDS TSiResPhysics.h)
-add_custom_command(OUTPUT TSiResDataDict.cxx COMMAND ../../scripts/build_dict.sh TSiResData.h TSiResDataDict.cxx TSiResData.rootmap libNPSiRes.dylib DEPENDS TSiResData.h)
+add_custom_command(OUTPUT TSiResPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSiResPhysics.h TSiResPhysicsDict.cxx TSiResPhysics.rootmap libNPSiRes.dylib DEPENDS TSiResPhysics.h)
+add_custom_command(OUTPUT TSiResDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSiResData.h TSiResDataDict.cxx TSiResData.rootmap libNPSiRes.dylib DEPENDS TSiResData.h)
add_library(NPSiRes SHARED TSiResData.cxx TSiResPhysics.cxx TSiResDataDict.cxx TSiResPhysicsDict.cxx TSiResSpectra.cxx)
target_link_libraries(NPSiRes ${ROOT_LIBRARIES} NPCore)
install(FILES TSiResData.h TSiResPhysics.h TSiResSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/SplitPole/CMakeLists.txt b/NPLib/Detectors/SplitPole/CMakeLists.txt
index 387cae3b4930251d915f250e0e50902c6ea07756..2c25ca36681adbf33559cbe3c535d68f8bfd7b60 100644
--- a/NPLib/Detectors/SplitPole/CMakeLists.txt
+++ b/NPLib/Detectors/SplitPole/CMakeLists.txt
@@ -1,6 +1,6 @@
-add_custom_command(OUTPUT TSplitPolePhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TSplitPolePhysics.h TSplitPolePhysicsDict.cxx TSplitPolePhysics.rootmap libNPSplitPole.dylib DEPENDS TSplitPolePhysics.h)
-add_custom_command(OUTPUT TSplitPoleDataDict.cxx COMMAND ../../scripts/build_dict.sh TSplitPoleData.h TSplitPoleDataDict.cxx TSplitPoleData.rootmap libNPSplitPole.dylib DEPENDS TSplitPoleData.h)
-add_custom_command(OUTPUT TSplitPoleNMRDict.cxx COMMAND ../../scripts/build_dict.sh TSplitPoleNMR.h TSplitPoleNMRDict.cxx TSplitPoleNMR.rootmap libNPSplitPole.dylib DEPENDS TSplitPoleNMR.h)
+add_custom_command(OUTPUT TSplitPolePhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSplitPolePhysics.h TSplitPolePhysicsDict.cxx TSplitPolePhysics.rootmap libNPSplitPole.dylib DEPENDS TSplitPolePhysics.h)
+add_custom_command(OUTPUT TSplitPoleDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSplitPoleData.h TSplitPoleDataDict.cxx TSplitPoleData.rootmap libNPSplitPole.dylib DEPENDS TSplitPoleData.h)
+add_custom_command(OUTPUT TSplitPoleNMRDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TSplitPoleNMR.h TSplitPoleNMRDict.cxx TSplitPoleNMR.rootmap libNPSplitPole.dylib DEPENDS TSplitPoleNMR.h)
add_library(NPSplitPole SHARED TSplitPoleSpectra.cxx TSplitPoleData.cxx TSplitPolePhysics.cxx TSplitPoleNMR.cxx TSplitPoleDataDict.cxx TSplitPolePhysicsDict.cxx TSplitPoleNMRDict.cxx)
target_link_libraries(NPSplitPole ${ROOT_LIBRARIES} NPCore)
install(FILES TSplitPoleData.h TSplitPolePhysics.h TSplitPoleSpectra.h TSplitPoleNMR.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/TNT/CMakeLists.txt b/NPLib/Detectors/TNT/CMakeLists.txt
index ec8c67a2ba998838d7334e4f26650ee0bfd033cc..b0a0537a112cfe8bd4e6e7d5b41a559acb2d7471 100644
--- a/NPLib/Detectors/TNT/CMakeLists.txt
+++ b/NPLib/Detectors/TNT/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TTNTPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TTNTPhysics.h TTNTPhysicsDict.cxx TTNTPhysics.rootmap libNPTNT.dylib DEPENDS TTNTPhysics.h)
-add_custom_command(OUTPUT TTNTDataDict.cxx COMMAND ../../scripts/build_dict.sh TTNTData.h TTNTDataDict.cxx TTNTData.rootmap libNPTNT.dylib DEPENDS TTNTData.h)
+add_custom_command(OUTPUT TTNTPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTNTPhysics.h TTNTPhysicsDict.cxx TTNTPhysics.rootmap libNPTNT.dylib DEPENDS TTNTPhysics.h)
+add_custom_command(OUTPUT TTNTDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTNTData.h TTNTDataDict.cxx TTNTData.rootmap libNPTNT.dylib DEPENDS TTNTData.h)
add_library(NPTNT SHARED TTNTSpectra.cxx TTNTData.cxx TTNTPhysics.cxx TTNTDataDict.cxx TTNTPhysicsDict.cxx )
target_link_libraries(NPTNT ${ROOT_LIBRARIES} NPCore)
install(FILES TTNTData.h TTNTPhysics.h TTNTSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/TRex/CMakeLists.txt b/NPLib/Detectors/TRex/CMakeLists.txt
index 7c32b75b193892ddfc1b1198e8c703f8324368cd..16d33b12f443d90ad2930961cfb82f75db008bfa 100644
--- a/NPLib/Detectors/TRex/CMakeLists.txt
+++ b/NPLib/Detectors/TRex/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TTRexPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TTRexPhysics.h TTRexPhysicsDict.cxx TTRexPhysics.rootmap libNPTRex.dylib DEPENDS TTRexPhysics.h)
-add_custom_command(OUTPUT TTRexDataDict.cxx COMMAND ../../scripts/build_dict.sh TTRexData.h TTRexDataDict.cxx TTRexData.rootmap libNPTRex.dylib DEPENDS TTRexData.h)
+add_custom_command(OUTPUT TTRexPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTRexPhysics.h TTRexPhysicsDict.cxx TTRexPhysics.rootmap libNPTRex.dylib DEPENDS TTRexPhysics.h)
+add_custom_command(OUTPUT TTRexDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTRexData.h TTRexDataDict.cxx TTRexData.rootmap libNPTRex.dylib DEPENDS TTRexData.h)
add_library(NPTRex SHARED TTRexSpectra.cxx TTRexData.cxx TTRexPhysics.cxx TTRexDataDict.cxx TTRexPhysicsDict.cxx )
target_link_libraries(NPTRex ${ROOT_LIBRARIES} NPCore)
install(FILES TTRexData.h TTRexPhysics.h TTRexSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Tiara/CMakeLists.txt b/NPLib/Detectors/Tiara/CMakeLists.txt
index 22462ea3bdadaec020c0a939add36131e9177757..5c5f41c1d0667829d8cf96b191c922c15b82221c 100644
--- a/NPLib/Detectors/Tiara/CMakeLists.txt
+++ b/NPLib/Detectors/Tiara/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_custom_command(OUTPUT TTiaraHyballPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TTiaraHyballPhysics.h TTiaraHyballPhysicsDict.cxx TTiaraHyballPhysics.rootmap libNPTiara.dylib DEPENDS TTiaraHyballPhysics.h)
-add_custom_command(OUTPUT TTiaraBarrelPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TTiaraBarrelPhysics.h TTiaraBarrelPhysicsDict.cxx TTiaraBarrelPhysics.rootmap libNPTiara.dylib DEPENDS TTiaraBarrelPhysics.h)
-add_custom_command(OUTPUT TTiaraHyballDataDict.cxx COMMAND ../../scripts/build_dict.sh TTiaraHyballData.h TTiaraHyballDataDict.cxx TTiaraHyballData.rootmap libNPTiara.dylib DEPENDS TTiaraHyballData.h)
-add_custom_command(OUTPUT TTiaraBarrelDataDict.cxx COMMAND ../../scripts/build_dict.sh TTiaraBarrelData.h TTiaraBarrelDataDict.cxx TTiaraBarrelData.rootmap libNPTiara.dylib DEPENDS TTiaraBarrelData.h)
+add_custom_command(OUTPUT TTiaraHyballPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTiaraHyballPhysics.h TTiaraHyballPhysicsDict.cxx TTiaraHyballPhysics.rootmap libNPTiara.dylib DEPENDS TTiaraHyballPhysics.h)
+add_custom_command(OUTPUT TTiaraBarrelPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTiaraBarrelPhysics.h TTiaraBarrelPhysicsDict.cxx TTiaraBarrelPhysics.rootmap libNPTiara.dylib DEPENDS TTiaraBarrelPhysics.h)
+add_custom_command(OUTPUT TTiaraHyballDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTiaraHyballData.h TTiaraHyballDataDict.cxx TTiaraHyballData.rootmap libNPTiara.dylib DEPENDS TTiaraHyballData.h)
+add_custom_command(OUTPUT TTiaraBarrelDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTiaraBarrelData.h TTiaraBarrelDataDict.cxx TTiaraBarrelData.rootmap libNPTiara.dylib DEPENDS TTiaraBarrelData.h)
add_library(NPTiara SHARED TTiaraBarrelData.cxx TTiaraBarrelPhysics.cxx TTiaraBarrelDataDict.cxx TTiaraBarrelPhysicsDict.cxx TTiaraBarrelSpectra.cxx TTiaraHyballData.cxx TTiaraHyballPhysics.cxx TTiaraHyballDataDict.cxx TTiaraHyballPhysicsDict.cxx TTiaraHyballSpectra.cxx)
diff --git a/NPLib/Detectors/Tigress/CMakeLists.txt b/NPLib/Detectors/Tigress/CMakeLists.txt
index 2e7675b9f0d829d681806c68126877dff7b7e833..74519defc3db6df091ec64017dba8e74a0573bd8 100644
--- a/NPLib/Detectors/Tigress/CMakeLists.txt
+++ b/NPLib/Detectors/Tigress/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TTigressPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TTigressPhysics.h TTigressPhysicsDict.cxx TTigressPhysics.rootmap libNPTigress.dylib DEPENDS TTigressPhysics.h)
-add_custom_command(OUTPUT TTigressDataDict.cxx COMMAND ../../scripts/build_dict.sh TTigressData.h TTigressDataDict.cxx TTigressData.rootmap libNPTigress.dylib DEPENDS TTigressData.h)
+add_custom_command(OUTPUT TTigressPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTigressPhysics.h TTigressPhysicsDict.cxx TTigressPhysics.rootmap libNPTigress.dylib DEPENDS TTigressPhysics.h)
+add_custom_command(OUTPUT TTigressDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTigressData.h TTigressDataDict.cxx TTigressData.rootmap libNPTigress.dylib DEPENDS TTigressData.h)
add_library(NPTigress SHARED TTigressData.cxx TTigressPhysics.cxx TTigressDataDict.cxx TTigressPhysicsDict.cxx )
target_link_libraries(NPTigress ${ROOT_LIBRARIES} NPCore)
install(FILES TTigressData.h TTigressPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Trifoil/CMakeLists.txt b/NPLib/Detectors/Trifoil/CMakeLists.txt
index 5fe685250e61ac87fc3befa483b9c872f6bdbe0a..5bd07763c1d8c7b6277d521951cb597657a31fc2 100644
--- a/NPLib/Detectors/Trifoil/CMakeLists.txt
+++ b/NPLib/Detectors/Trifoil/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TTrifoilPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TTrifoilPhysics.h TTrifoilPhysicsDict.cxx TTrifoilPhysics.rootmap libNPTrifoil.dylib DEPENDS TTrifoilPhysics.h)
-add_custom_command(OUTPUT TTrifoilDataDict.cxx COMMAND ../../scripts/build_dict.sh TTrifoilData.h TTrifoilDataDict.cxx TTrifoilData.rootmap libNPTrifoil.dylib DEPENDS TTrifoilData.h)
+add_custom_command(OUTPUT TTrifoilPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTrifoilPhysics.h TTrifoilPhysicsDict.cxx TTrifoilPhysics.rootmap libNPTrifoil.dylib DEPENDS TTrifoilPhysics.h)
+add_custom_command(OUTPUT TTrifoilDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TTrifoilData.h TTrifoilDataDict.cxx TTrifoilData.rootmap libNPTrifoil.dylib DEPENDS TTrifoilData.h)
add_library(NPTrifoil SHARED TTrifoilData.cxx TTrifoilPhysics.cxx TTrifoilDataDict.cxx TTrifoilPhysicsDict.cxx )
target_link_libraries(NPTrifoil ${ROOT_LIBRARIES} -lSpectrum NPCore)
install(FILES TTrifoilData.h TTrifoilPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/Vamos/CMakeLists.txt b/NPLib/Detectors/Vamos/CMakeLists.txt
index 04ae96ae27bc9b59cd0710bfa2bab2aea72338c6..31ca9d343a99e90608992b105f135107a3274695 100644
--- a/NPLib/Detectors/Vamos/CMakeLists.txt
+++ b/NPLib/Detectors/Vamos/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TVamosPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TVamosPhysics.h TVamosPhysicsDict.cxx TVamosPhysics.rootmap libNPVamos.dylib DEPENDS TVamosPhysics.h)
-add_custom_command(OUTPUT TVamosDataDict.cxx COMMAND ../../scripts/build_dict.sh TVamosData.h TVamosDataDict.cxx TVamosData.rootmap libNPVamos.dylib DEPENDS TVamosData.h)
+add_custom_command(OUTPUT TVamosPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TVamosPhysics.h TVamosPhysicsDict.cxx TVamosPhysics.rootmap libNPVamos.dylib DEPENDS TVamosPhysics.h)
+add_custom_command(OUTPUT TVamosDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TVamosData.h TVamosDataDict.cxx TVamosData.rootmap libNPVamos.dylib DEPENDS TVamosData.h)
add_library(NPVamos SHARED TVamosData.cxx TVamosPhysics.cxx TVamosDataDict.cxx TVamosPhysicsDict.cxx )
target_link_libraries(NPVamos ${ROOT_LIBRARIES} NPCore)
install(FILES TVamosData.h TVamosPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/W1/CMakeLists.txt b/NPLib/Detectors/W1/CMakeLists.txt
index ea8f5511c675c51cd646cf00530fbd8684e1df2a..55ed11be4341a30305f827f2a8ea5f92bb9d69a5 100644
--- a/NPLib/Detectors/W1/CMakeLists.txt
+++ b/NPLib/Detectors/W1/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT TW1PhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TW1Physics.h TW1PhysicsDict.cxx TW1Physics.rootmap libNPW1.dylib DEPENDS TW1Physics.h)
-add_custom_command(OUTPUT TW1DataDict.cxx COMMAND ../../scripts/build_dict.sh TW1Data.h TW1DataDict.cxx TW1Data.rootmap libNPW1.dylib DEPENDS TW1Data.h)
+add_custom_command(OUTPUT TW1PhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TW1Physics.h TW1PhysicsDict.cxx TW1Physics.rootmap libNPW1.dylib DEPENDS TW1Physics.h)
+add_custom_command(OUTPUT TW1DataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh TW1Data.h TW1DataDict.cxx TW1Data.rootmap libNPW1.dylib DEPENDS TW1Data.h)
add_library(NPW1 SHARED TW1Spectra.cxx TW1Data.cxx TW1Physics.cxx TW1DataDict.cxx TW1PhysicsDict.cxx )
target_link_libraries(NPW1 ${ROOT_LIBRARIES} NPCore)
install(FILES TW1Data.h TW1Physics.h TW1Spectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/beam_dump/CMakeLists.txt b/NPLib/Detectors/beam_dump/CMakeLists.txt
index fa831276c4b49125d0f384d3d0f9372987e70d93..09ed63c24718d7bcc11433d2c916d16a28629da1 100755
--- a/NPLib/Detectors/beam_dump/CMakeLists.txt
+++ b/NPLib/Detectors/beam_dump/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_custom_command(OUTPUT Tbeam_dumpPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh Tbeam_dumpPhysics.h Tbeam_dumpPhysicsDict.cxx Tbeam_dumpPhysics.rootmap libNPbeam_dump.dylib DEPENDS Tbeam_dumpPhysics.h)
-add_custom_command(OUTPUT Tbeam_dumpDataDict.cxx COMMAND ../../scripts/build_dict.sh Tbeam_dumpData.h Tbeam_dumpDataDict.cxx Tbeam_dumpData.rootmap libNPbeam_dump.dylib DEPENDS Tbeam_dumpData.h)
+add_custom_command(OUTPUT Tbeam_dumpPhysicsDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh Tbeam_dumpPhysics.h Tbeam_dumpPhysicsDict.cxx Tbeam_dumpPhysics.rootmap libNPbeam_dump.dylib DEPENDS Tbeam_dumpPhysics.h)
+add_custom_command(OUTPUT Tbeam_dumpDataDict.cxx COMMAND ${CMAKE_BINARY_DIR}/scripts/build_dict.sh Tbeam_dumpData.h Tbeam_dumpDataDict.cxx Tbeam_dumpData.rootmap libNPbeam_dump.dylib DEPENDS Tbeam_dumpData.h)
add_library(NPbeam_dump SHARED Tbeam_dumpSpectra.cxx Tbeam_dumpData.cxx Tbeam_dumpPhysics.cxx Tbeam_dumpDataDict.cxx Tbeam_dumpPhysicsDict.cxx )
target_link_libraries(NPbeam_dump ${ROOT_LIBRARIES} NPCore)
install(FILES Tbeam_dumpData.h Tbeam_dumpPhysics.h Tbeam_dumpSpectra.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPSimulation/Detectors/Tiara/Tiara.cc b/NPSimulation/Detectors/Tiara/Tiara.cc
index 0811b04426f20491980454b81f1f54a0184de005..70a986d7c8eb1bd6748990193c5797067c165a9a 100644
--- a/NPSimulation/Detectors/Tiara/Tiara.cc
+++ b/NPSimulation/Detectors/Tiara/Tiara.cc
@@ -117,8 +117,8 @@ void Tiara::ReadConfiguration(NPL::InputParser parser){
blocks.clear();
//by Shuya 180426
- blocks = parser.GetAllBlocksWithToken("TiaraHyballWedge");
- //blocks = parser.GetAllBlocksWithToken("HyballWedge");
+ // blocks = parser.GetAllBlocksWithToken("TiaraHyballWedge");
+ blocks = parser.GetAllBlocksWithTokenAndValue("Tiara","Hyball");
if(NPOptionManager::getInstance()->GetVerboseLevel())
cout << "//// " << blocks.size() << " detectors found " << endl;
diff --git a/NPSimulation/Process/BeamReaction.cc b/NPSimulation/Process/BeamReaction.cc
index cff0759dbcf8ee22e87ddd38954be86dfeede3aa..b077304f580fb63ae31a1eb208a265058b5e6bf3 100644
--- a/NPSimulation/Process/BeamReaction.cc
+++ b/NPSimulation/Process/BeamReaction.cc
@@ -127,6 +127,11 @@ G4bool NPS::BeamReaction::ModelTrigger(const G4FastTrack& fastTrack) {
double out = solid->DistanceToOut(P, -V);
double ratio = in / (out + in);
+ m_Parent_ID = PrimaryTrack->GetParentID();
+ // process reserved to the beam
+ if(m_Parent_ID!=0)
+ return false;
+
//cout<< "in:"<<in<<std::scientific<<endl;
//cout<< "ou:"<<out<<std::scientific<<endl;
//cout<< "ratio:"<<ratio<<std::scientific<<endl;
@@ -141,7 +146,7 @@ G4bool NPS::BeamReaction::ModelTrigger(const G4FastTrack& fastTrack) {
m_ReactionConditions->Clear();
shoot = true;
}
- else if ((in-m_StepSize) <= 1E-9) { // last step
+ else if (((in-m_StepSize) <= 1E-9) && shoot) { // last step
//cout<< "LAST"<<endl;
return true;
}
@@ -161,7 +166,9 @@ G4bool NPS::BeamReaction::ModelTrigger(const G4FastTrack& fastTrack) {
} else {
return false;
}
- }else if(m_ReactionType=="TwoBodyReaction"){
+ }
+
+ else if(m_ReactionType=="TwoBodyReaction"){
if ( shoot && m_Reaction.IsAllowed(PrimaryTrack->GetKineticEnergy()) ) {
shoot = false;
return true;
diff --git a/NPSimulation/Process/BeamReaction.hh b/NPSimulation/Process/BeamReaction.hh
index b77c424d8885112d5152c7b1f2bf32b37999e16d..f5c9a41d28ea2248c90d17cb8aee2cadff4c0fb7 100644
--- a/NPSimulation/Process/BeamReaction.hh
+++ b/NPSimulation/Process/BeamReaction.hh
@@ -52,6 +52,7 @@ namespace NPS{
double m_PreviousLength;
bool m_active;// is the process active
double m_StepSize;
+ int m_Parent_ID;
private:
TReactionConditions* m_ReactionConditions;
diff --git a/NPSimulation/Process/CMakeLists.txt b/NPSimulation/Process/CMakeLists.txt
index ae16d2e0394019df8a3b7e0faf8e4f2987af8d53..2f9dfe901fb7b2f43bba7fa149cd3c290fc15f4d 100644
--- a/NPSimulation/Process/CMakeLists.txt
+++ b/NPSimulation/Process/CMakeLists.txt
@@ -1,2 +1,16 @@
+
+if(Geant4_VERSION_MAJOR GREATER_EQUAL 10)
+ if(Geant4_VERSION_MINOR GREATER_EQUAL 5)
+
+ message("Compiling with NeutronHPphysics")
add_library(NPSProcess SHARED Decay.cc BeamReaction.cc FastDriftElectron.cc NPIonIonInelasticPhysic.cc PhysicsList.cc G4DriftElectron.cc G4IonizationWithDE.cc G4DriftElectronPhysics.cc G4DEAbsorption.cc G4DEAmplification.cc G4DETransport.cc menate_R.cc NeutronHPphysics.cc NeutronHPMessenger.cc)
+ add_definitions(-DUSE_NEUTRONHP)
+ else ()
+
+ message("Compiling WITHOUT NeutronHPphysics, install geant4 10.5 or greater for this physics list")
+add_library(NPSProcess SHARED Decay.cc BeamReaction.cc FastDriftElectron.cc NPIonIonInelasticPhysic.cc PhysicsList.cc G4DriftElectron.cc G4IonizationWithDE.cc G4DriftElectronPhysics.cc G4DEAbsorption.cc G4DEAmplification.cc G4DETransport.cc menate_R.cc)
+ endif()
+ endif()
+
+
target_link_libraries(NPSProcess ${ROOT_LIBRARIES} ${Geant4_LIBRARIES} ${NPLib_LIBRARIES} -lNPInitialConditions -lNPInteractionCoordinates -lNPReactionConditions)
diff --git a/NPSimulation/Process/PhysicsList.cc b/NPSimulation/Process/PhysicsList.cc
index f5d8dd0d7da9eb77d8953eae4abeea85db1e5fd7..84219207d2ac090f6adc2cc775fce6d80973d1c1 100644
--- a/NPSimulation/Process/PhysicsList.cc
+++ b/NPSimulation/Process/PhysicsList.cc
@@ -54,8 +54,9 @@
#include "G4PAIPhotModel.hh"
#include "G4RadioactiveDecay.hh"
#include "menate_R.hh"
+#ifdef USE_NEUTRONHP
#include "NeutronHPphysics.hh"
-
+#endif
/////////////////////////////////////////////////////////////////////////////
PhysicsList::PhysicsList() : G4VUserPhysicsList(){
@@ -142,11 +143,12 @@ PhysicsList::PhysicsList() : G4VUserPhysicsList(){
cout << "//// Using NPIonIonInelasticPhysic Physics List ////" << endl;
}
+#ifdef USE_NEUTRONHP
if(m_NeutronHP){
m_PhysList["NeutronHPphysics"] = new NeutronHPphysics("neutronHP");
cout << "//// Using NeutronHPPhysics ////" << endl;
}
-
+#endif
if(m_StoppingPhysics){
m_PhysList["StoppingPhysics"]=new G4StoppingPhysics();
cout << "//// Using G4StoppingPhysics Physics List ////" << endl;
@@ -238,6 +240,7 @@ void PhysicsList::ReadConfiguration(std::string filename){
m_pai= 0;
m_pai_photon= 0;
m_Menate_R = 0;
+
m_NeutronHP = 0;
std::ifstream file(filename.c_str());
diff --git a/Projects/Scone/Analysis.cxx b/Projects/Scone/Analysis.cxx
index 13ad7cc3d9200f83f97f1da4c912264762e0e551..6001665bb896524febfd3ae16bf16e189b094f84 100644
--- a/Projects/Scone/Analysis.cxx
+++ b/Projects/Scone/Analysis.cxx
@@ -86,7 +86,7 @@ void Analysis::TreatEvent(){
}
//if(Time_max>50) m_DetectedNeutron++;
- if(Time_max>50 && E_sum>1) m_DetectedNeutron++;
+ if(Time_max>40 && E_sum>0.2) m_DetectedNeutron++;
}
////////////////////////////////////////////////////////////////////////////////
@@ -125,8 +125,8 @@ void Analysis::End(){
cout << "DetectedNeutron: " << endl;
ofstream ofile;
- //ofile.open("macro/eff_scone_natGd25um.txt");
- ofile.open("macro/eff_scone_menate.txt");
+ ofile.open("macro/eff_scone_natGd25um.txt");
+ //ofile.open("macro/eff_scone_menate.txt");
for(int i=0; i< vDetectedNeutron.size(); i++){
cout << "* " << vE_init[i] << " / " << vDetectedNeutron[i]/1e5*100 << endl;
//ofile << vE_init[i] << " " << vDetectedNeutron[i]/vDetectedNeutron[0]*99.3 << endl;