diff --git a/NPLib/AnnularS1/Makefile b/NPLib/AnnularS1/Makefile
index 1f41ae3bf19d520d9e15d75e48246ba4f8a0d308..ee497c4b03c203712347018613a4b34199d2e0ed 100644
--- a/NPLib/AnnularS1/Makefile
+++ b/NPLib/AnnularS1/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/AnnularS1/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS1/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/AnnularS1/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS1/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS1/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS1/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS1/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS1/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS1/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS1/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 AnnularS1/CMakeFiles/NPAnnularS1.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS1/CMakeFiles/NPAnnularS1.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS1/CMakeFiles/NPAnnularS1.dir/rule
 .PHONY : AnnularS1/CMakeFiles/NPAnnularS1.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPAnnularS1: AnnularS1/CMakeFiles/NPAnnularS1.dir/rule
 
 # fast build rule for target.
 NPAnnularS1/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/build
 .PHONY : NPAnnularS1/fast
 
 TAnnularS1Physics.o: TAnnularS1Physics.cxx.o
@@ -152,7 +158,7 @@ TAnnularS1Physics.o: TAnnularS1Physics.cxx.o
 
 # target to build an object file
 TAnnularS1Physics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1Physics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1Physics.cxx.o
 .PHONY : TAnnularS1Physics.cxx.o
 
 TAnnularS1Physics.i: TAnnularS1Physics.cxx.i
@@ -160,7 +166,7 @@ TAnnularS1Physics.i: TAnnularS1Physics.cxx.i
 
 # target to preprocess a source file
 TAnnularS1Physics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1Physics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1Physics.cxx.i
 .PHONY : TAnnularS1Physics.cxx.i
 
 TAnnularS1Physics.s: TAnnularS1Physics.cxx.s
@@ -168,7 +174,7 @@ TAnnularS1Physics.s: TAnnularS1Physics.cxx.s
 
 # target to generate assembly for a file
 TAnnularS1Physics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1Physics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1Physics.cxx.s
 .PHONY : TAnnularS1Physics.cxx.s
 
 TAnnularS1PhysicsDict.o: TAnnularS1PhysicsDict.cxx.o
@@ -176,7 +182,7 @@ TAnnularS1PhysicsDict.o: TAnnularS1PhysicsDict.cxx.o
 
 # target to build an object file
 TAnnularS1PhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1PhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1PhysicsDict.cxx.o
 .PHONY : TAnnularS1PhysicsDict.cxx.o
 
 TAnnularS1PhysicsDict.i: TAnnularS1PhysicsDict.cxx.i
@@ -184,7 +190,7 @@ TAnnularS1PhysicsDict.i: TAnnularS1PhysicsDict.cxx.i
 
 # target to preprocess a source file
 TAnnularS1PhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1PhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1PhysicsDict.cxx.i
 .PHONY : TAnnularS1PhysicsDict.cxx.i
 
 TAnnularS1PhysicsDict.s: TAnnularS1PhysicsDict.cxx.s
@@ -192,7 +198,7 @@ TAnnularS1PhysicsDict.s: TAnnularS1PhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TAnnularS1PhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1PhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TAnnularS1PhysicsDict.cxx.s
 .PHONY : TAnnularS1PhysicsDict.cxx.s
 
 TS1Data.o: TS1Data.cxx.o
@@ -200,7 +206,7 @@ TS1Data.o: TS1Data.cxx.o
 
 # target to build an object file
 TS1Data.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1Data.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1Data.cxx.o
 .PHONY : TS1Data.cxx.o
 
 TS1Data.i: TS1Data.cxx.i
@@ -208,7 +214,7 @@ TS1Data.i: TS1Data.cxx.i
 
 # target to preprocess a source file
 TS1Data.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1Data.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1Data.cxx.i
 .PHONY : TS1Data.cxx.i
 
 TS1Data.s: TS1Data.cxx.s
@@ -216,7 +222,7 @@ TS1Data.s: TS1Data.cxx.s
 
 # target to generate assembly for a file
 TS1Data.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1Data.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1Data.cxx.s
 .PHONY : TS1Data.cxx.s
 
 TS1DataDict.o: TS1DataDict.cxx.o
@@ -224,7 +230,7 @@ TS1DataDict.o: TS1DataDict.cxx.o
 
 # target to build an object file
 TS1DataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1DataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1DataDict.cxx.o
 .PHONY : TS1DataDict.cxx.o
 
 TS1DataDict.i: TS1DataDict.cxx.i
@@ -232,7 +238,7 @@ TS1DataDict.i: TS1DataDict.cxx.i
 
 # target to preprocess a source file
 TS1DataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1DataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1DataDict.cxx.i
 .PHONY : TS1DataDict.cxx.i
 
 TS1DataDict.s: TS1DataDict.cxx.s
@@ -240,7 +246,7 @@ TS1DataDict.s: TS1DataDict.cxx.s
 
 # target to generate assembly for a file
 TS1DataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1DataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS1/CMakeFiles/NPAnnularS1.dir/build.make AnnularS1/CMakeFiles/NPAnnularS1.dir/TS1DataDict.cxx.s
 .PHONY : TS1DataDict.cxx.s
 
 # Help Target
@@ -249,12 +255,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPAnnularS1"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPAnnularS1"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TAnnularS1Physics.o"
 	@echo "... TAnnularS1Physics.i"
 	@echo "... TAnnularS1Physics.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/AnnularS2/Makefile b/NPLib/AnnularS2/Makefile
index fed03576ca947815b11d291c16d9173c8a7b8e0a..e192c58b42a7ed373993936e965bb24d2148d68f 100644
--- a/NPLib/AnnularS2/Makefile
+++ b/NPLib/AnnularS2/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/AnnularS2/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS2/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/AnnularS2/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS2/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS2/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS2/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS2/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS2/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS2/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS2/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 AnnularS2/CMakeFiles/NPS2.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS2/CMakeFiles/NPS2.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 AnnularS2/CMakeFiles/NPS2.dir/rule
 .PHONY : AnnularS2/CMakeFiles/NPS2.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPS2: AnnularS2/CMakeFiles/NPS2.dir/rule
 
 # fast build rule for target.
 NPS2/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/build
 .PHONY : NPS2/fast
 
 TS2Data.o: TS2Data.cxx.o
@@ -152,7 +158,7 @@ TS2Data.o: TS2Data.cxx.o
 
 # target to build an object file
 TS2Data.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Data.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Data.cxx.o
 .PHONY : TS2Data.cxx.o
 
 TS2Data.i: TS2Data.cxx.i
@@ -160,7 +166,7 @@ TS2Data.i: TS2Data.cxx.i
 
 # target to preprocess a source file
 TS2Data.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Data.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Data.cxx.i
 .PHONY : TS2Data.cxx.i
 
 TS2Data.s: TS2Data.cxx.s
@@ -168,7 +174,7 @@ TS2Data.s: TS2Data.cxx.s
 
 # target to generate assembly for a file
 TS2Data.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Data.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Data.cxx.s
 .PHONY : TS2Data.cxx.s
 
 TS2DataDict.o: TS2DataDict.cxx.o
@@ -176,7 +182,7 @@ TS2DataDict.o: TS2DataDict.cxx.o
 
 # target to build an object file
 TS2DataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2DataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2DataDict.cxx.o
 .PHONY : TS2DataDict.cxx.o
 
 TS2DataDict.i: TS2DataDict.cxx.i
@@ -184,7 +190,7 @@ TS2DataDict.i: TS2DataDict.cxx.i
 
 # target to preprocess a source file
 TS2DataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2DataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2DataDict.cxx.i
 .PHONY : TS2DataDict.cxx.i
 
 TS2DataDict.s: TS2DataDict.cxx.s
@@ -192,7 +198,7 @@ TS2DataDict.s: TS2DataDict.cxx.s
 
 # target to generate assembly for a file
 TS2DataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2DataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2DataDict.cxx.s
 .PHONY : TS2DataDict.cxx.s
 
 TS2Physics.o: TS2Physics.cxx.o
@@ -200,7 +206,7 @@ TS2Physics.o: TS2Physics.cxx.o
 
 # target to build an object file
 TS2Physics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Physics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Physics.cxx.o
 .PHONY : TS2Physics.cxx.o
 
 TS2Physics.i: TS2Physics.cxx.i
@@ -208,7 +214,7 @@ TS2Physics.i: TS2Physics.cxx.i
 
 # target to preprocess a source file
 TS2Physics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Physics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Physics.cxx.i
 .PHONY : TS2Physics.cxx.i
 
 TS2Physics.s: TS2Physics.cxx.s
@@ -216,7 +222,7 @@ TS2Physics.s: TS2Physics.cxx.s
 
 # target to generate assembly for a file
 TS2Physics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Physics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2Physics.cxx.s
 .PHONY : TS2Physics.cxx.s
 
 TS2PhysicsDict.o: TS2PhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TS2PhysicsDict.o: TS2PhysicsDict.cxx.o
 
 # target to build an object file
 TS2PhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2PhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2PhysicsDict.cxx.o
 .PHONY : TS2PhysicsDict.cxx.o
 
 TS2PhysicsDict.i: TS2PhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TS2PhysicsDict.i: TS2PhysicsDict.cxx.i
 
 # target to preprocess a source file
 TS2PhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2PhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2PhysicsDict.cxx.i
 .PHONY : TS2PhysicsDict.cxx.i
 
 TS2PhysicsDict.s: TS2PhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TS2PhysicsDict.s: TS2PhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TS2PhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2PhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/TS2PhysicsDict.cxx.s
 .PHONY : TS2PhysicsDict.cxx.s
 
 # Help Target
@@ -249,12 +255,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPS2"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPS2"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TS2Data.o"
 	@echo "... TS2Data.i"
 	@echo "... TS2Data.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/CATS/Makefile b/NPLib/CATS/Makefile
index c94651e8742561f3332ed9c6d5f494e451efa5f5..fd810395d0b711dde7d8950383cbbf62632f71e4 100644
--- a/NPLib/CATS/Makefile
+++ b/NPLib/CATS/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/CATS/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 CATS/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/CATS/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 CATS/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 CATS/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 CATS/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 CATS/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 CATS/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 CATS/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 CATS/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 CATS/CMakeFiles/NPCATS.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 CATS/CMakeFiles/NPCATS.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 CATS/CMakeFiles/NPCATS.dir/rule
 .PHONY : CATS/CMakeFiles/NPCATS.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPCATS: CATS/CMakeFiles/NPCATS.dir/rule
 
 # fast build rule for target.
 NPCATS/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/build
 .PHONY : NPCATS/fast
 
 TCATSData.o: TCATSData.cxx.o
@@ -152,7 +158,7 @@ TCATSData.o: TCATSData.cxx.o
 
 # target to build an object file
 TCATSData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSData.cxx.o
 .PHONY : TCATSData.cxx.o
 
 TCATSData.i: TCATSData.cxx.i
@@ -160,7 +166,7 @@ TCATSData.i: TCATSData.cxx.i
 
 # target to preprocess a source file
 TCATSData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSData.cxx.i
 .PHONY : TCATSData.cxx.i
 
 TCATSData.s: TCATSData.cxx.s
@@ -168,7 +174,7 @@ TCATSData.s: TCATSData.cxx.s
 
 # target to generate assembly for a file
 TCATSData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSData.cxx.s
 .PHONY : TCATSData.cxx.s
 
 TCATSDataDict.o: TCATSDataDict.cxx.o
@@ -176,7 +182,7 @@ TCATSDataDict.o: TCATSDataDict.cxx.o
 
 # target to build an object file
 TCATSDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSDataDict.cxx.o
 .PHONY : TCATSDataDict.cxx.o
 
 TCATSDataDict.i: TCATSDataDict.cxx.i
@@ -184,7 +190,7 @@ TCATSDataDict.i: TCATSDataDict.cxx.i
 
 # target to preprocess a source file
 TCATSDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSDataDict.cxx.i
 .PHONY : TCATSDataDict.cxx.i
 
 TCATSDataDict.s: TCATSDataDict.cxx.s
@@ -192,7 +198,7 @@ TCATSDataDict.s: TCATSDataDict.cxx.s
 
 # target to generate assembly for a file
 TCATSDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSDataDict.cxx.s
 .PHONY : TCATSDataDict.cxx.s
 
 TCATSPhysics.o: TCATSPhysics.cxx.o
@@ -200,7 +206,7 @@ TCATSPhysics.o: TCATSPhysics.cxx.o
 
 # target to build an object file
 TCATSPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysics.cxx.o
 .PHONY : TCATSPhysics.cxx.o
 
 TCATSPhysics.i: TCATSPhysics.cxx.i
@@ -208,7 +214,7 @@ TCATSPhysics.i: TCATSPhysics.cxx.i
 
 # target to preprocess a source file
 TCATSPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysics.cxx.i
 .PHONY : TCATSPhysics.cxx.i
 
 TCATSPhysics.s: TCATSPhysics.cxx.s
@@ -216,7 +222,7 @@ TCATSPhysics.s: TCATSPhysics.cxx.s
 
 # target to generate assembly for a file
 TCATSPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysics.cxx.s
 .PHONY : TCATSPhysics.cxx.s
 
 TCATSPhysicsDict.o: TCATSPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TCATSPhysicsDict.o: TCATSPhysicsDict.cxx.o
 
 # target to build an object file
 TCATSPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysicsDict.cxx.o
 .PHONY : TCATSPhysicsDict.cxx.o
 
 TCATSPhysicsDict.i: TCATSPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TCATSPhysicsDict.i: TCATSPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TCATSPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysicsDict.cxx.i
 .PHONY : TCATSPhysicsDict.cxx.i
 
 TCATSPhysicsDict.s: TCATSPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TCATSPhysicsDict.s: TCATSPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TCATSPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSPhysicsDict.cxx.s
 .PHONY : TCATSPhysicsDict.cxx.s
 
 TCATSSpectra.o: TCATSSpectra.cxx.o
@@ -248,7 +254,7 @@ TCATSSpectra.o: TCATSSpectra.cxx.o
 
 # target to build an object file
 TCATSSpectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSSpectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSSpectra.cxx.o
 .PHONY : TCATSSpectra.cxx.o
 
 TCATSSpectra.i: TCATSSpectra.cxx.i
@@ -256,7 +262,7 @@ TCATSSpectra.i: TCATSSpectra.cxx.i
 
 # target to preprocess a source file
 TCATSSpectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSSpectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSSpectra.cxx.i
 .PHONY : TCATSSpectra.cxx.i
 
 TCATSSpectra.s: TCATSSpectra.cxx.s
@@ -264,7 +270,7 @@ TCATSSpectra.s: TCATSSpectra.cxx.s
 
 # target to generate assembly for a file
 TCATSSpectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSSpectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/TCATSSpectra.cxx.s
 .PHONY : TCATSSpectra.cxx.s
 
 # Help Target
@@ -273,12 +279,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPCATS"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPCATS"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TCATSData.o"
 	@echo "... TCATSData.i"
 	@echo "... TCATSData.s"
@@ -305,6 +312,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Charissa/Makefile b/NPLib/Charissa/Makefile
index a9c5d8c14a0053353bbca5e04c31d029b039be22..318cdd7cd2b96146e00cab490f60a6953f613a6e 100644
--- a/NPLib/Charissa/Makefile
+++ b/NPLib/Charissa/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Charissa/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Charissa/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Charissa/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Charissa/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Charissa/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Charissa/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Charissa/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Charissa/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Charissa/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Charissa/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Charissa/CMakeFiles/NPCharissa.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Charissa/CMakeFiles/NPCharissa.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Charissa/CMakeFiles/NPCharissa.dir/rule
 .PHONY : Charissa/CMakeFiles/NPCharissa.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPCharissa: Charissa/CMakeFiles/NPCharissa.dir/rule
 
 # fast build rule for target.
 NPCharissa/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/build
 .PHONY : NPCharissa/fast
 
 TCharissaData.o: TCharissaData.cxx.o
@@ -152,7 +158,7 @@ TCharissaData.o: TCharissaData.cxx.o
 
 # target to build an object file
 TCharissaData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaData.cxx.o
 .PHONY : TCharissaData.cxx.o
 
 TCharissaData.i: TCharissaData.cxx.i
@@ -160,7 +166,7 @@ TCharissaData.i: TCharissaData.cxx.i
 
 # target to preprocess a source file
 TCharissaData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaData.cxx.i
 .PHONY : TCharissaData.cxx.i
 
 TCharissaData.s: TCharissaData.cxx.s
@@ -168,7 +174,7 @@ TCharissaData.s: TCharissaData.cxx.s
 
 # target to generate assembly for a file
 TCharissaData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaData.cxx.s
 .PHONY : TCharissaData.cxx.s
 
 TCharissaDataDict.o: TCharissaDataDict.cxx.o
@@ -176,7 +182,7 @@ TCharissaDataDict.o: TCharissaDataDict.cxx.o
 
 # target to build an object file
 TCharissaDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaDataDict.cxx.o
 .PHONY : TCharissaDataDict.cxx.o
 
 TCharissaDataDict.i: TCharissaDataDict.cxx.i
@@ -184,7 +190,7 @@ TCharissaDataDict.i: TCharissaDataDict.cxx.i
 
 # target to preprocess a source file
 TCharissaDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaDataDict.cxx.i
 .PHONY : TCharissaDataDict.cxx.i
 
 TCharissaDataDict.s: TCharissaDataDict.cxx.s
@@ -192,7 +198,7 @@ TCharissaDataDict.s: TCharissaDataDict.cxx.s
 
 # target to generate assembly for a file
 TCharissaDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaDataDict.cxx.s
 .PHONY : TCharissaDataDict.cxx.s
 
 TCharissaPhysics.o: TCharissaPhysics.cxx.o
@@ -200,7 +206,7 @@ TCharissaPhysics.o: TCharissaPhysics.cxx.o
 
 # target to build an object file
 TCharissaPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysics.cxx.o
 .PHONY : TCharissaPhysics.cxx.o
 
 TCharissaPhysics.i: TCharissaPhysics.cxx.i
@@ -208,7 +214,7 @@ TCharissaPhysics.i: TCharissaPhysics.cxx.i
 
 # target to preprocess a source file
 TCharissaPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysics.cxx.i
 .PHONY : TCharissaPhysics.cxx.i
 
 TCharissaPhysics.s: TCharissaPhysics.cxx.s
@@ -216,7 +222,7 @@ TCharissaPhysics.s: TCharissaPhysics.cxx.s
 
 # target to generate assembly for a file
 TCharissaPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysics.cxx.s
 .PHONY : TCharissaPhysics.cxx.s
 
 TCharissaPhysicsDict.o: TCharissaPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TCharissaPhysicsDict.o: TCharissaPhysicsDict.cxx.o
 
 # target to build an object file
 TCharissaPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysicsDict.cxx.o
 .PHONY : TCharissaPhysicsDict.cxx.o
 
 TCharissaPhysicsDict.i: TCharissaPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TCharissaPhysicsDict.i: TCharissaPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TCharissaPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysicsDict.cxx.i
 .PHONY : TCharissaPhysicsDict.cxx.i
 
 TCharissaPhysicsDict.s: TCharissaPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TCharissaPhysicsDict.s: TCharissaPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TCharissaPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaPhysicsDict.cxx.s
 .PHONY : TCharissaPhysicsDict.cxx.s
 
 TCharissaSpectra.o: TCharissaSpectra.cxx.o
@@ -248,7 +254,7 @@ TCharissaSpectra.o: TCharissaSpectra.cxx.o
 
 # target to build an object file
 TCharissaSpectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaSpectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaSpectra.cxx.o
 .PHONY : TCharissaSpectra.cxx.o
 
 TCharissaSpectra.i: TCharissaSpectra.cxx.i
@@ -256,7 +262,7 @@ TCharissaSpectra.i: TCharissaSpectra.cxx.i
 
 # target to preprocess a source file
 TCharissaSpectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaSpectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaSpectra.cxx.i
 .PHONY : TCharissaSpectra.cxx.i
 
 TCharissaSpectra.s: TCharissaSpectra.cxx.s
@@ -264,7 +270,7 @@ TCharissaSpectra.s: TCharissaSpectra.cxx.s
 
 # target to generate assembly for a file
 TCharissaSpectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaSpectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/TCharissaSpectra.cxx.s
 .PHONY : TCharissaSpectra.cxx.s
 
 # Help Target
@@ -273,12 +279,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPCharissa"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPCharissa"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TCharissaData.o"
 	@echo "... TCharissaData.i"
 	@echo "... TCharissaData.s"
@@ -305,6 +312,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/ChateauCristal/Makefile b/NPLib/ChateauCristal/Makefile
index f2c054414348fb604b63b23c3c63bdb5e3c46d9b..64abdd3efd3c961ebd2cbbf622e158cb0f49c21d 100644
--- a/NPLib/ChateauCristal/Makefile
+++ b/NPLib/ChateauCristal/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/ChateauCristal/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ChateauCristal/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/ChateauCristal/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ChateauCristal/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ChateauCristal/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ChateauCristal/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ChateauCristal/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ChateauCristal/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ChateauCristal/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ChateauCristal/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 ChateauCristal/CMakeFiles/NPChateauCristal.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ChateauCristal/CMakeFiles/NPChateauCristal.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ChateauCristal/CMakeFiles/NPChateauCristal.dir/rule
 .PHONY : ChateauCristal/CMakeFiles/NPChateauCristal.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPChateauCristal: ChateauCristal/CMakeFiles/NPChateauCristal.dir/rule
 
 # fast build rule for target.
 NPChateauCristal/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/build
 .PHONY : NPChateauCristal/fast
 
 TChateauCristalData.o: TChateauCristalData.cxx.o
@@ -152,7 +158,7 @@ TChateauCristalData.o: TChateauCristalData.cxx.o
 
 # target to build an object file
 TChateauCristalData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalData.cxx.o
 .PHONY : TChateauCristalData.cxx.o
 
 TChateauCristalData.i: TChateauCristalData.cxx.i
@@ -160,7 +166,7 @@ TChateauCristalData.i: TChateauCristalData.cxx.i
 
 # target to preprocess a source file
 TChateauCristalData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalData.cxx.i
 .PHONY : TChateauCristalData.cxx.i
 
 TChateauCristalData.s: TChateauCristalData.cxx.s
@@ -168,7 +174,7 @@ TChateauCristalData.s: TChateauCristalData.cxx.s
 
 # target to generate assembly for a file
 TChateauCristalData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalData.cxx.s
 .PHONY : TChateauCristalData.cxx.s
 
 TChateauCristalDataDict.o: TChateauCristalDataDict.cxx.o
@@ -176,7 +182,7 @@ TChateauCristalDataDict.o: TChateauCristalDataDict.cxx.o
 
 # target to build an object file
 TChateauCristalDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalDataDict.cxx.o
 .PHONY : TChateauCristalDataDict.cxx.o
 
 TChateauCristalDataDict.i: TChateauCristalDataDict.cxx.i
@@ -184,7 +190,7 @@ TChateauCristalDataDict.i: TChateauCristalDataDict.cxx.i
 
 # target to preprocess a source file
 TChateauCristalDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalDataDict.cxx.i
 .PHONY : TChateauCristalDataDict.cxx.i
 
 TChateauCristalDataDict.s: TChateauCristalDataDict.cxx.s
@@ -192,7 +198,7 @@ TChateauCristalDataDict.s: TChateauCristalDataDict.cxx.s
 
 # target to generate assembly for a file
 TChateauCristalDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalDataDict.cxx.s
 .PHONY : TChateauCristalDataDict.cxx.s
 
 TChateauCristalPhysics.o: TChateauCristalPhysics.cxx.o
@@ -200,7 +206,7 @@ TChateauCristalPhysics.o: TChateauCristalPhysics.cxx.o
 
 # target to build an object file
 TChateauCristalPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysics.cxx.o
 .PHONY : TChateauCristalPhysics.cxx.o
 
 TChateauCristalPhysics.i: TChateauCristalPhysics.cxx.i
@@ -208,7 +214,7 @@ TChateauCristalPhysics.i: TChateauCristalPhysics.cxx.i
 
 # target to preprocess a source file
 TChateauCristalPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysics.cxx.i
 .PHONY : TChateauCristalPhysics.cxx.i
 
 TChateauCristalPhysics.s: TChateauCristalPhysics.cxx.s
@@ -216,7 +222,7 @@ TChateauCristalPhysics.s: TChateauCristalPhysics.cxx.s
 
 # target to generate assembly for a file
 TChateauCristalPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysics.cxx.s
 .PHONY : TChateauCristalPhysics.cxx.s
 
 TChateauCristalPhysicsDict.o: TChateauCristalPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TChateauCristalPhysicsDict.o: TChateauCristalPhysicsDict.cxx.o
 
 # target to build an object file
 TChateauCristalPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysicsDict.cxx.o
 .PHONY : TChateauCristalPhysicsDict.cxx.o
 
 TChateauCristalPhysicsDict.i: TChateauCristalPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TChateauCristalPhysicsDict.i: TChateauCristalPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TChateauCristalPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysicsDict.cxx.i
 .PHONY : TChateauCristalPhysicsDict.cxx.i
 
 TChateauCristalPhysicsDict.s: TChateauCristalPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TChateauCristalPhysicsDict.s: TChateauCristalPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TChateauCristalPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/TChateauCristalPhysicsDict.cxx.s
 .PHONY : TChateauCristalPhysicsDict.cxx.s
 
 # Help Target
@@ -249,12 +255,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPChateauCristal"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPChateauCristal"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TChateauCristalData.o"
 	@echo "... TChateauCristalData.i"
 	@echo "... TChateauCristalData.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Chio/Makefile b/NPLib/Chio/Makefile
index 529be7d9e947a12f3122afc39d7690119f717b90..494147757a6f8c9a0e667077728cf0ce87f11ed6 100644
--- a/NPLib/Chio/Makefile
+++ b/NPLib/Chio/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Chio/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Chio/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Chio/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Chio/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Chio/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Chio/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Chio/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Chio/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Chio/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Chio/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Chio/CMakeFiles/NPChio.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Chio/CMakeFiles/NPChio.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Chio/CMakeFiles/NPChio.dir/rule
 .PHONY : Chio/CMakeFiles/NPChio.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPChio: Chio/CMakeFiles/NPChio.dir/rule
 
 # fast build rule for target.
 NPChio/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/build
 .PHONY : NPChio/fast
 
 TChio_anData.o: TChio_anData.cxx.o
@@ -152,7 +158,7 @@ TChio_anData.o: TChio_anData.cxx.o
 
 # target to build an object file
 TChio_anData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anData.cxx.o
 .PHONY : TChio_anData.cxx.o
 
 TChio_anData.i: TChio_anData.cxx.i
@@ -160,7 +166,7 @@ TChio_anData.i: TChio_anData.cxx.i
 
 # target to preprocess a source file
 TChio_anData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anData.cxx.i
 .PHONY : TChio_anData.cxx.i
 
 TChio_anData.s: TChio_anData.cxx.s
@@ -168,7 +174,7 @@ TChio_anData.s: TChio_anData.cxx.s
 
 # target to generate assembly for a file
 TChio_anData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anData.cxx.s
 .PHONY : TChio_anData.cxx.s
 
 TChio_anDataDict.o: TChio_anDataDict.cxx.o
@@ -176,7 +182,7 @@ TChio_anDataDict.o: TChio_anDataDict.cxx.o
 
 # target to build an object file
 TChio_anDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anDataDict.cxx.o
 .PHONY : TChio_anDataDict.cxx.o
 
 TChio_anDataDict.i: TChio_anDataDict.cxx.i
@@ -184,7 +190,7 @@ TChio_anDataDict.i: TChio_anDataDict.cxx.i
 
 # target to preprocess a source file
 TChio_anDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anDataDict.cxx.i
 .PHONY : TChio_anDataDict.cxx.i
 
 TChio_anDataDict.s: TChio_anDataDict.cxx.s
@@ -192,7 +198,7 @@ TChio_anDataDict.s: TChio_anDataDict.cxx.s
 
 # target to generate assembly for a file
 TChio_anDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anDataDict.cxx.s
 .PHONY : TChio_anDataDict.cxx.s
 
 TChio_anPhysics.o: TChio_anPhysics.cxx.o
@@ -200,7 +206,7 @@ TChio_anPhysics.o: TChio_anPhysics.cxx.o
 
 # target to build an object file
 TChio_anPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysics.cxx.o
 .PHONY : TChio_anPhysics.cxx.o
 
 TChio_anPhysics.i: TChio_anPhysics.cxx.i
@@ -208,7 +214,7 @@ TChio_anPhysics.i: TChio_anPhysics.cxx.i
 
 # target to preprocess a source file
 TChio_anPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysics.cxx.i
 .PHONY : TChio_anPhysics.cxx.i
 
 TChio_anPhysics.s: TChio_anPhysics.cxx.s
@@ -216,7 +222,7 @@ TChio_anPhysics.s: TChio_anPhysics.cxx.s
 
 # target to generate assembly for a file
 TChio_anPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysics.cxx.s
 .PHONY : TChio_anPhysics.cxx.s
 
 TChio_anPhysicsDict.o: TChio_anPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TChio_anPhysicsDict.o: TChio_anPhysicsDict.cxx.o
 
 # target to build an object file
 TChio_anPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysicsDict.cxx.o
 .PHONY : TChio_anPhysicsDict.cxx.o
 
 TChio_anPhysicsDict.i: TChio_anPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TChio_anPhysicsDict.i: TChio_anPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TChio_anPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysicsDict.cxx.i
 .PHONY : TChio_anPhysicsDict.cxx.i
 
 TChio_anPhysicsDict.s: TChio_anPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TChio_anPhysicsDict.s: TChio_anPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TChio_anPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_anPhysicsDict.cxx.s
 .PHONY : TChio_anPhysicsDict.cxx.s
 
 TChio_digData.o: TChio_digData.cxx.o
@@ -248,7 +254,7 @@ TChio_digData.o: TChio_digData.cxx.o
 
 # target to build an object file
 TChio_digData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digData.cxx.o
 .PHONY : TChio_digData.cxx.o
 
 TChio_digData.i: TChio_digData.cxx.i
@@ -256,7 +262,7 @@ TChio_digData.i: TChio_digData.cxx.i
 
 # target to preprocess a source file
 TChio_digData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digData.cxx.i
 .PHONY : TChio_digData.cxx.i
 
 TChio_digData.s: TChio_digData.cxx.s
@@ -264,7 +270,7 @@ TChio_digData.s: TChio_digData.cxx.s
 
 # target to generate assembly for a file
 TChio_digData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digData.cxx.s
 .PHONY : TChio_digData.cxx.s
 
 TChio_digDataDict.o: TChio_digDataDict.cxx.o
@@ -272,7 +278,7 @@ TChio_digDataDict.o: TChio_digDataDict.cxx.o
 
 # target to build an object file
 TChio_digDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digDataDict.cxx.o
 .PHONY : TChio_digDataDict.cxx.o
 
 TChio_digDataDict.i: TChio_digDataDict.cxx.i
@@ -280,7 +286,7 @@ TChio_digDataDict.i: TChio_digDataDict.cxx.i
 
 # target to preprocess a source file
 TChio_digDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digDataDict.cxx.i
 .PHONY : TChio_digDataDict.cxx.i
 
 TChio_digDataDict.s: TChio_digDataDict.cxx.s
@@ -288,7 +294,7 @@ TChio_digDataDict.s: TChio_digDataDict.cxx.s
 
 # target to generate assembly for a file
 TChio_digDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digDataDict.cxx.s
 .PHONY : TChio_digDataDict.cxx.s
 
 TChio_digPhysics.o: TChio_digPhysics.cxx.o
@@ -296,7 +302,7 @@ TChio_digPhysics.o: TChio_digPhysics.cxx.o
 
 # target to build an object file
 TChio_digPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysics.cxx.o
 .PHONY : TChio_digPhysics.cxx.o
 
 TChio_digPhysics.i: TChio_digPhysics.cxx.i
@@ -304,7 +310,7 @@ TChio_digPhysics.i: TChio_digPhysics.cxx.i
 
 # target to preprocess a source file
 TChio_digPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysics.cxx.i
 .PHONY : TChio_digPhysics.cxx.i
 
 TChio_digPhysics.s: TChio_digPhysics.cxx.s
@@ -312,7 +318,7 @@ TChio_digPhysics.s: TChio_digPhysics.cxx.s
 
 # target to generate assembly for a file
 TChio_digPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysics.cxx.s
 .PHONY : TChio_digPhysics.cxx.s
 
 TChio_digPhysicsDict.o: TChio_digPhysicsDict.cxx.o
@@ -320,7 +326,7 @@ TChio_digPhysicsDict.o: TChio_digPhysicsDict.cxx.o
 
 # target to build an object file
 TChio_digPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysicsDict.cxx.o
 .PHONY : TChio_digPhysicsDict.cxx.o
 
 TChio_digPhysicsDict.i: TChio_digPhysicsDict.cxx.i
@@ -328,7 +334,7 @@ TChio_digPhysicsDict.i: TChio_digPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TChio_digPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysicsDict.cxx.i
 .PHONY : TChio_digPhysicsDict.cxx.i
 
 TChio_digPhysicsDict.s: TChio_digPhysicsDict.cxx.s
@@ -336,7 +342,7 @@ TChio_digPhysicsDict.s: TChio_digPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TChio_digPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/TChio_digPhysicsDict.cxx.s
 .PHONY : TChio_digPhysicsDict.cxx.s
 
 # Help Target
@@ -345,12 +351,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
-	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... NPChio"
+	@echo "... edit_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TChio_anData.o"
 	@echo "... TChio_anData.i"
 	@echo "... TChio_anData.s"
@@ -386,6 +393,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/ComptonTelescope/Makefile b/NPLib/ComptonTelescope/Makefile
index 1f0daa266025ef1333febbf00030755f296b77e7..eed92ee48163db0999d71fb543d856e1bb49dd24 100644
--- a/NPLib/ComptonTelescope/Makefile
+++ b/NPLib/ComptonTelescope/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/ComptonTelescope/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ComptonTelescope/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/ComptonTelescope/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ComptonTelescope/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ComptonTelescope/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ComptonTelescope/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ComptonTelescope/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ComptonTelescope/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ComptonTelescope/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ComptonTelescope/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/rule
 .PHONY : ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPComptonTelescope: ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/rule
 
 # fast build rule for target.
 NPComptonTelescope/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build
 .PHONY : NPComptonTelescope/fast
 
 TComptonTelescopeData.o: TComptonTelescopeData.cxx.o
@@ -152,7 +158,7 @@ TComptonTelescopeData.o: TComptonTelescopeData.cxx.o
 
 # target to build an object file
 TComptonTelescopeData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeData.cxx.o
 .PHONY : TComptonTelescopeData.cxx.o
 
 TComptonTelescopeData.i: TComptonTelescopeData.cxx.i
@@ -160,7 +166,7 @@ TComptonTelescopeData.i: TComptonTelescopeData.cxx.i
 
 # target to preprocess a source file
 TComptonTelescopeData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeData.cxx.i
 .PHONY : TComptonTelescopeData.cxx.i
 
 TComptonTelescopeData.s: TComptonTelescopeData.cxx.s
@@ -168,7 +174,7 @@ TComptonTelescopeData.s: TComptonTelescopeData.cxx.s
 
 # target to generate assembly for a file
 TComptonTelescopeData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeData.cxx.s
 .PHONY : TComptonTelescopeData.cxx.s
 
 TComptonTelescopeDataDict.o: TComptonTelescopeDataDict.cxx.o
@@ -176,7 +182,7 @@ TComptonTelescopeDataDict.o: TComptonTelescopeDataDict.cxx.o
 
 # target to build an object file
 TComptonTelescopeDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeDataDict.cxx.o
 .PHONY : TComptonTelescopeDataDict.cxx.o
 
 TComptonTelescopeDataDict.i: TComptonTelescopeDataDict.cxx.i
@@ -184,7 +190,7 @@ TComptonTelescopeDataDict.i: TComptonTelescopeDataDict.cxx.i
 
 # target to preprocess a source file
 TComptonTelescopeDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeDataDict.cxx.i
 .PHONY : TComptonTelescopeDataDict.cxx.i
 
 TComptonTelescopeDataDict.s: TComptonTelescopeDataDict.cxx.s
@@ -192,7 +198,7 @@ TComptonTelescopeDataDict.s: TComptonTelescopeDataDict.cxx.s
 
 # target to generate assembly for a file
 TComptonTelescopeDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeDataDict.cxx.s
 .PHONY : TComptonTelescopeDataDict.cxx.s
 
 TComptonTelescopePhysics.o: TComptonTelescopePhysics.cxx.o
@@ -200,7 +206,7 @@ TComptonTelescopePhysics.o: TComptonTelescopePhysics.cxx.o
 
 # target to build an object file
 TComptonTelescopePhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysics.cxx.o
 .PHONY : TComptonTelescopePhysics.cxx.o
 
 TComptonTelescopePhysics.i: TComptonTelescopePhysics.cxx.i
@@ -208,7 +214,7 @@ TComptonTelescopePhysics.i: TComptonTelescopePhysics.cxx.i
 
 # target to preprocess a source file
 TComptonTelescopePhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysics.cxx.i
 .PHONY : TComptonTelescopePhysics.cxx.i
 
 TComptonTelescopePhysics.s: TComptonTelescopePhysics.cxx.s
@@ -216,7 +222,7 @@ TComptonTelescopePhysics.s: TComptonTelescopePhysics.cxx.s
 
 # target to generate assembly for a file
 TComptonTelescopePhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysics.cxx.s
 .PHONY : TComptonTelescopePhysics.cxx.s
 
 TComptonTelescopePhysicsDict.o: TComptonTelescopePhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TComptonTelescopePhysicsDict.o: TComptonTelescopePhysicsDict.cxx.o
 
 # target to build an object file
 TComptonTelescopePhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysicsDict.cxx.o
 .PHONY : TComptonTelescopePhysicsDict.cxx.o
 
 TComptonTelescopePhysicsDict.i: TComptonTelescopePhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TComptonTelescopePhysicsDict.i: TComptonTelescopePhysicsDict.cxx.i
 
 # target to preprocess a source file
 TComptonTelescopePhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysicsDict.cxx.i
 .PHONY : TComptonTelescopePhysicsDict.cxx.i
 
 TComptonTelescopePhysicsDict.s: TComptonTelescopePhysicsDict.cxx.s
@@ -240,15 +246,63 @@ TComptonTelescopePhysicsDict.s: TComptonTelescopePhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TComptonTelescopePhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopePhysicsDict.cxx.s
 .PHONY : TComptonTelescopePhysicsDict.cxx.s
 
+TComptonTelescopeProcessData.o: TComptonTelescopeProcessData.cxx.o
+.PHONY : TComptonTelescopeProcessData.o
+
+# target to build an object file
+TComptonTelescopeProcessData.cxx.o:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeProcessData.cxx.o
+.PHONY : TComptonTelescopeProcessData.cxx.o
+
+TComptonTelescopeProcessData.i: TComptonTelescopeProcessData.cxx.i
+.PHONY : TComptonTelescopeProcessData.i
+
+# target to preprocess a source file
+TComptonTelescopeProcessData.cxx.i:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeProcessData.cxx.i
+.PHONY : TComptonTelescopeProcessData.cxx.i
+
+TComptonTelescopeProcessData.s: TComptonTelescopeProcessData.cxx.s
+.PHONY : TComptonTelescopeProcessData.s
+
+# target to generate assembly for a file
+TComptonTelescopeProcessData.cxx.s:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeProcessData.cxx.s
+.PHONY : TComptonTelescopeProcessData.cxx.s
+
+TComptonTelescopeProcessDataDict.o: TComptonTelescopeProcessDataDict.cxx.o
+.PHONY : TComptonTelescopeProcessDataDict.o
+
+# target to build an object file
+TComptonTelescopeProcessDataDict.cxx.o:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeProcessDataDict.cxx.o
+.PHONY : TComptonTelescopeProcessDataDict.cxx.o
+
+TComptonTelescopeProcessDataDict.i: TComptonTelescopeProcessDataDict.cxx.i
+.PHONY : TComptonTelescopeProcessDataDict.i
+
+# target to preprocess a source file
+TComptonTelescopeProcessDataDict.cxx.i:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeProcessDataDict.cxx.i
+.PHONY : TComptonTelescopeProcessDataDict.cxx.i
+
+TComptonTelescopeProcessDataDict.s: TComptonTelescopeProcessDataDict.cxx.s
+.PHONY : TComptonTelescopeProcessDataDict.s
+
+# target to generate assembly for a file
+TComptonTelescopeProcessDataDict.cxx.s:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeProcessDataDict.cxx.s
+.PHONY : TComptonTelescopeProcessDataDict.cxx.s
+
 TComptonTelescopeSpectra.o: TComptonTelescopeSpectra.cxx.o
 .PHONY : TComptonTelescopeSpectra.o
 
 # target to build an object file
 TComptonTelescopeSpectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeSpectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeSpectra.cxx.o
 .PHONY : TComptonTelescopeSpectra.cxx.o
 
 TComptonTelescopeSpectra.i: TComptonTelescopeSpectra.cxx.i
@@ -256,7 +310,7 @@ TComptonTelescopeSpectra.i: TComptonTelescopeSpectra.cxx.i
 
 # target to preprocess a source file
 TComptonTelescopeSpectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeSpectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeSpectra.cxx.i
 .PHONY : TComptonTelescopeSpectra.cxx.i
 
 TComptonTelescopeSpectra.s: TComptonTelescopeSpectra.cxx.s
@@ -264,7 +318,7 @@ TComptonTelescopeSpectra.s: TComptonTelescopeSpectra.cxx.s
 
 # target to generate assembly for a file
 TComptonTelescopeSpectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeSpectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/TComptonTelescopeSpectra.cxx.s
 .PHONY : TComptonTelescopeSpectra.cxx.s
 
 # Help Target
@@ -273,12 +327,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPComptonTelescope"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPComptonTelescope"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TComptonTelescopeData.o"
 	@echo "... TComptonTelescopeData.i"
 	@echo "... TComptonTelescopeData.s"
@@ -291,6 +346,12 @@ help:
 	@echo "... TComptonTelescopePhysicsDict.o"
 	@echo "... TComptonTelescopePhysicsDict.i"
 	@echo "... TComptonTelescopePhysicsDict.s"
+	@echo "... TComptonTelescopeProcessData.o"
+	@echo "... TComptonTelescopeProcessData.i"
+	@echo "... TComptonTelescopeProcessData.s"
+	@echo "... TComptonTelescopeProcessDataDict.o"
+	@echo "... TComptonTelescopeProcessDataDict.i"
+	@echo "... TComptonTelescopeProcessDataDict.s"
 	@echo "... TComptonTelescopeSpectra.o"
 	@echo "... TComptonTelescopeSpectra.i"
 	@echo "... TComptonTelescopeSpectra.s"
@@ -305,6 +366,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Core/Makefile b/NPLib/Core/Makefile
index 43272781f68dce913af2d739089d94660af5fec9..6f5a5ae1da9f8d246dbe7811e516dc086c4fbd14 100644
--- a/NPLib/Core/Makefile
+++ b/NPLib/Core/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Core/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Core/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Core/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Core/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Core/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Core/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Core/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Core/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Core/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Core/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Core/CMakeFiles/NPCore.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Core/CMakeFiles/NPCore.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Core/CMakeFiles/NPCore.dir/rule
 .PHONY : Core/CMakeFiles/NPCore.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPCore: Core/CMakeFiles/NPCore.dir/rule
 
 # fast build rule for target.
 NPCore/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/build
 .PHONY : NPCore/fast
 
 NPAnalysisFactory.o: NPAnalysisFactory.cxx.o
@@ -152,7 +158,7 @@ NPAnalysisFactory.o: NPAnalysisFactory.cxx.o
 
 # target to build an object file
 NPAnalysisFactory.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPAnalysisFactory.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPAnalysisFactory.cxx.o
 .PHONY : NPAnalysisFactory.cxx.o
 
 NPAnalysisFactory.i: NPAnalysisFactory.cxx.i
@@ -160,7 +166,7 @@ NPAnalysisFactory.i: NPAnalysisFactory.cxx.i
 
 # target to preprocess a source file
 NPAnalysisFactory.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPAnalysisFactory.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPAnalysisFactory.cxx.i
 .PHONY : NPAnalysisFactory.cxx.i
 
 NPAnalysisFactory.s: NPAnalysisFactory.cxx.s
@@ -168,7 +174,7 @@ NPAnalysisFactory.s: NPAnalysisFactory.cxx.s
 
 # target to generate assembly for a file
 NPAnalysisFactory.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPAnalysisFactory.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPAnalysisFactory.cxx.s
 .PHONY : NPAnalysisFactory.cxx.s
 
 NPCalibrationManager.o: NPCalibrationManager.cxx.o
@@ -176,7 +182,7 @@ NPCalibrationManager.o: NPCalibrationManager.cxx.o
 
 # target to build an object file
 NPCalibrationManager.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPCalibrationManager.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPCalibrationManager.cxx.o
 .PHONY : NPCalibrationManager.cxx.o
 
 NPCalibrationManager.i: NPCalibrationManager.cxx.i
@@ -184,7 +190,7 @@ NPCalibrationManager.i: NPCalibrationManager.cxx.i
 
 # target to preprocess a source file
 NPCalibrationManager.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPCalibrationManager.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPCalibrationManager.cxx.i
 .PHONY : NPCalibrationManager.cxx.i
 
 NPCalibrationManager.s: NPCalibrationManager.cxx.s
@@ -192,7 +198,7 @@ NPCalibrationManager.s: NPCalibrationManager.cxx.s
 
 # target to generate assembly for a file
 NPCalibrationManager.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPCalibrationManager.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPCalibrationManager.cxx.s
 .PHONY : NPCalibrationManager.cxx.s
 
 NPDetectorFactory.o: NPDetectorFactory.cxx.o
@@ -200,7 +206,7 @@ NPDetectorFactory.o: NPDetectorFactory.cxx.o
 
 # target to build an object file
 NPDetectorFactory.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorFactory.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorFactory.cxx.o
 .PHONY : NPDetectorFactory.cxx.o
 
 NPDetectorFactory.i: NPDetectorFactory.cxx.i
@@ -208,7 +214,7 @@ NPDetectorFactory.i: NPDetectorFactory.cxx.i
 
 # target to preprocess a source file
 NPDetectorFactory.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorFactory.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorFactory.cxx.i
 .PHONY : NPDetectorFactory.cxx.i
 
 NPDetectorFactory.s: NPDetectorFactory.cxx.s
@@ -216,7 +222,7 @@ NPDetectorFactory.s: NPDetectorFactory.cxx.s
 
 # target to generate assembly for a file
 NPDetectorFactory.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorFactory.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorFactory.cxx.s
 .PHONY : NPDetectorFactory.cxx.s
 
 NPDetectorManager.o: NPDetectorManager.cxx.o
@@ -224,7 +230,7 @@ NPDetectorManager.o: NPDetectorManager.cxx.o
 
 # target to build an object file
 NPDetectorManager.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorManager.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorManager.cxx.o
 .PHONY : NPDetectorManager.cxx.o
 
 NPDetectorManager.i: NPDetectorManager.cxx.i
@@ -232,7 +238,7 @@ NPDetectorManager.i: NPDetectorManager.cxx.i
 
 # target to preprocess a source file
 NPDetectorManager.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorManager.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorManager.cxx.i
 .PHONY : NPDetectorManager.cxx.i
 
 NPDetectorManager.s: NPDetectorManager.cxx.s
@@ -240,7 +246,7 @@ NPDetectorManager.s: NPDetectorManager.cxx.s
 
 # target to generate assembly for a file
 NPDetectorManager.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorManager.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPDetectorManager.cxx.s
 .PHONY : NPDetectorManager.cxx.s
 
 NPOptionManager.o: NPOptionManager.cxx.o
@@ -248,7 +254,7 @@ NPOptionManager.o: NPOptionManager.cxx.o
 
 # target to build an object file
 NPOptionManager.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPOptionManager.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPOptionManager.cxx.o
 .PHONY : NPOptionManager.cxx.o
 
 NPOptionManager.i: NPOptionManager.cxx.i
@@ -256,7 +262,7 @@ NPOptionManager.i: NPOptionManager.cxx.i
 
 # target to preprocess a source file
 NPOptionManager.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPOptionManager.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPOptionManager.cxx.i
 .PHONY : NPOptionManager.cxx.i
 
 NPOptionManager.s: NPOptionManager.cxx.s
@@ -264,7 +270,7 @@ NPOptionManager.s: NPOptionManager.cxx.s
 
 # target to generate assembly for a file
 NPOptionManager.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPOptionManager.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPOptionManager.cxx.s
 .PHONY : NPOptionManager.cxx.s
 
 NPVAnalysis.o: NPVAnalysis.cxx.o
@@ -272,7 +278,7 @@ NPVAnalysis.o: NPVAnalysis.cxx.o
 
 # target to build an object file
 NPVAnalysis.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVAnalysis.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVAnalysis.cxx.o
 .PHONY : NPVAnalysis.cxx.o
 
 NPVAnalysis.i: NPVAnalysis.cxx.i
@@ -280,7 +286,7 @@ NPVAnalysis.i: NPVAnalysis.cxx.i
 
 # target to preprocess a source file
 NPVAnalysis.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVAnalysis.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVAnalysis.cxx.i
 .PHONY : NPVAnalysis.cxx.i
 
 NPVAnalysis.s: NPVAnalysis.cxx.s
@@ -288,7 +294,7 @@ NPVAnalysis.s: NPVAnalysis.cxx.s
 
 # target to generate assembly for a file
 NPVAnalysis.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVAnalysis.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVAnalysis.cxx.s
 .PHONY : NPVAnalysis.cxx.s
 
 NPVDetector.o: NPVDetector.cxx.o
@@ -296,7 +302,7 @@ NPVDetector.o: NPVDetector.cxx.o
 
 # target to build an object file
 NPVDetector.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetector.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetector.cxx.o
 .PHONY : NPVDetector.cxx.o
 
 NPVDetector.i: NPVDetector.cxx.i
@@ -304,7 +310,7 @@ NPVDetector.i: NPVDetector.cxx.i
 
 # target to preprocess a source file
 NPVDetector.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetector.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetector.cxx.i
 .PHONY : NPVDetector.cxx.i
 
 NPVDetector.s: NPVDetector.cxx.s
@@ -312,7 +318,7 @@ NPVDetector.s: NPVDetector.cxx.s
 
 # target to generate assembly for a file
 NPVDetector.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetector.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetector.cxx.s
 .PHONY : NPVDetector.cxx.s
 
 NPVDetectorDict.o: NPVDetectorDict.cxx.o
@@ -320,7 +326,7 @@ NPVDetectorDict.o: NPVDetectorDict.cxx.o
 
 # target to build an object file
 NPVDetectorDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetectorDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetectorDict.cxx.o
 .PHONY : NPVDetectorDict.cxx.o
 
 NPVDetectorDict.i: NPVDetectorDict.cxx.i
@@ -328,7 +334,7 @@ NPVDetectorDict.i: NPVDetectorDict.cxx.i
 
 # target to preprocess a source file
 NPVDetectorDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetectorDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetectorDict.cxx.i
 .PHONY : NPVDetectorDict.cxx.i
 
 NPVDetectorDict.s: NPVDetectorDict.cxx.s
@@ -336,7 +342,7 @@ NPVDetectorDict.s: NPVDetectorDict.cxx.s
 
 # target to generate assembly for a file
 NPVDetectorDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetectorDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVDetectorDict.cxx.s
 .PHONY : NPVDetectorDict.cxx.s
 
 NPVSpectra.o: NPVSpectra.cxx.o
@@ -344,7 +350,7 @@ NPVSpectra.o: NPVSpectra.cxx.o
 
 # target to build an object file
 NPVSpectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVSpectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVSpectra.cxx.o
 .PHONY : NPVSpectra.cxx.o
 
 NPVSpectra.i: NPVSpectra.cxx.i
@@ -352,7 +358,7 @@ NPVSpectra.i: NPVSpectra.cxx.i
 
 # target to preprocess a source file
 NPVSpectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVSpectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVSpectra.cxx.i
 .PHONY : NPVSpectra.cxx.i
 
 NPVSpectra.s: NPVSpectra.cxx.s
@@ -360,7 +366,7 @@ NPVSpectra.s: NPVSpectra.cxx.s
 
 # target to generate assembly for a file
 NPVSpectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVSpectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/NPVSpectra.cxx.s
 .PHONY : NPVSpectra.cxx.s
 
 RootInput.o: RootInput.cxx.o
@@ -368,7 +374,7 @@ RootInput.o: RootInput.cxx.o
 
 # target to build an object file
 RootInput.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootInput.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootInput.cxx.o
 .PHONY : RootInput.cxx.o
 
 RootInput.i: RootInput.cxx.i
@@ -376,7 +382,7 @@ RootInput.i: RootInput.cxx.i
 
 # target to preprocess a source file
 RootInput.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootInput.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootInput.cxx.i
 .PHONY : RootInput.cxx.i
 
 RootInput.s: RootInput.cxx.s
@@ -384,7 +390,7 @@ RootInput.s: RootInput.cxx.s
 
 # target to generate assembly for a file
 RootInput.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootInput.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootInput.cxx.s
 .PHONY : RootInput.cxx.s
 
 RootOutput.o: RootOutput.cxx.o
@@ -392,7 +398,7 @@ RootOutput.o: RootOutput.cxx.o
 
 # target to build an object file
 RootOutput.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootOutput.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootOutput.cxx.o
 .PHONY : RootOutput.cxx.o
 
 RootOutput.i: RootOutput.cxx.i
@@ -400,7 +406,7 @@ RootOutput.i: RootOutput.cxx.i
 
 # target to preprocess a source file
 RootOutput.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootOutput.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootOutput.cxx.i
 .PHONY : RootOutput.cxx.i
 
 RootOutput.s: RootOutput.cxx.s
@@ -408,7 +414,7 @@ RootOutput.s: RootOutput.cxx.s
 
 # target to generate assembly for a file
 RootOutput.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootOutput.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/RootOutput.cxx.s
 .PHONY : RootOutput.cxx.s
 
 TAsciiFile.o: TAsciiFile.cxx.o
@@ -416,7 +422,7 @@ TAsciiFile.o: TAsciiFile.cxx.o
 
 # target to build an object file
 TAsciiFile.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFile.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFile.cxx.o
 .PHONY : TAsciiFile.cxx.o
 
 TAsciiFile.i: TAsciiFile.cxx.i
@@ -424,7 +430,7 @@ TAsciiFile.i: TAsciiFile.cxx.i
 
 # target to preprocess a source file
 TAsciiFile.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFile.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFile.cxx.i
 .PHONY : TAsciiFile.cxx.i
 
 TAsciiFile.s: TAsciiFile.cxx.s
@@ -432,7 +438,7 @@ TAsciiFile.s: TAsciiFile.cxx.s
 
 # target to generate assembly for a file
 TAsciiFile.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFile.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFile.cxx.s
 .PHONY : TAsciiFile.cxx.s
 
 TAsciiFileDict.o: TAsciiFileDict.cxx.o
@@ -440,7 +446,7 @@ TAsciiFileDict.o: TAsciiFileDict.cxx.o
 
 # target to build an object file
 TAsciiFileDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFileDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFileDict.cxx.o
 .PHONY : TAsciiFileDict.cxx.o
 
 TAsciiFileDict.i: TAsciiFileDict.cxx.i
@@ -448,7 +454,7 @@ TAsciiFileDict.i: TAsciiFileDict.cxx.i
 
 # target to preprocess a source file
 TAsciiFileDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFileDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFileDict.cxx.i
 .PHONY : TAsciiFileDict.cxx.i
 
 TAsciiFileDict.s: TAsciiFileDict.cxx.s
@@ -456,7 +462,7 @@ TAsciiFileDict.s: TAsciiFileDict.cxx.s
 
 # target to generate assembly for a file
 TAsciiFileDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFileDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/TAsciiFileDict.cxx.s
 .PHONY : TAsciiFileDict.cxx.s
 
 # Help Target
@@ -465,12 +471,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPCore"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPCore"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... NPAnalysisFactory.o"
 	@echo "... NPAnalysisFactory.i"
 	@echo "... NPAnalysisFactory.s"
@@ -521,6 +528,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/DummyDetector/Makefile b/NPLib/DummyDetector/Makefile
index 34eb0373d0ecae70de7db24218626cc57aa07ca7..19f316c5ad69291310cb8334c1e2cabc8081e3cd 100644
--- a/NPLib/DummyDetector/Makefile
+++ b/NPLib/DummyDetector/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/DummyDetector/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 DummyDetector/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/DummyDetector/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 DummyDetector/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 DummyDetector/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 DummyDetector/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 DummyDetector/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 DummyDetector/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 DummyDetector/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 DummyDetector/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 DummyDetector/CMakeFiles/NPDUMMYDetector.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 DummyDetector/CMakeFiles/NPDUMMYDetector.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 DummyDetector/CMakeFiles/NPDUMMYDetector.dir/rule
 .PHONY : DummyDetector/CMakeFiles/NPDUMMYDetector.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPDUMMYDetector: DummyDetector/CMakeFiles/NPDUMMYDetector.dir/rule
 
 # fast build rule for target.
 NPDUMMYDetector/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build
 .PHONY : NPDUMMYDetector/fast
 
 TDUMMYDetectorData.o: TDUMMYDetectorData.cxx.o
@@ -152,7 +158,7 @@ TDUMMYDetectorData.o: TDUMMYDetectorData.cxx.o
 
 # target to build an object file
 TDUMMYDetectorData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorData.cxx.o
 .PHONY : TDUMMYDetectorData.cxx.o
 
 TDUMMYDetectorData.i: TDUMMYDetectorData.cxx.i
@@ -160,7 +166,7 @@ TDUMMYDetectorData.i: TDUMMYDetectorData.cxx.i
 
 # target to preprocess a source file
 TDUMMYDetectorData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorData.cxx.i
 .PHONY : TDUMMYDetectorData.cxx.i
 
 TDUMMYDetectorData.s: TDUMMYDetectorData.cxx.s
@@ -168,7 +174,7 @@ TDUMMYDetectorData.s: TDUMMYDetectorData.cxx.s
 
 # target to generate assembly for a file
 TDUMMYDetectorData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorData.cxx.s
 .PHONY : TDUMMYDetectorData.cxx.s
 
 TDUMMYDetectorDataDict.o: TDUMMYDetectorDataDict.cxx.o
@@ -176,7 +182,7 @@ TDUMMYDetectorDataDict.o: TDUMMYDetectorDataDict.cxx.o
 
 # target to build an object file
 TDUMMYDetectorDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorDataDict.cxx.o
 .PHONY : TDUMMYDetectorDataDict.cxx.o
 
 TDUMMYDetectorDataDict.i: TDUMMYDetectorDataDict.cxx.i
@@ -184,7 +190,7 @@ TDUMMYDetectorDataDict.i: TDUMMYDetectorDataDict.cxx.i
 
 # target to preprocess a source file
 TDUMMYDetectorDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorDataDict.cxx.i
 .PHONY : TDUMMYDetectorDataDict.cxx.i
 
 TDUMMYDetectorDataDict.s: TDUMMYDetectorDataDict.cxx.s
@@ -192,7 +198,7 @@ TDUMMYDetectorDataDict.s: TDUMMYDetectorDataDict.cxx.s
 
 # target to generate assembly for a file
 TDUMMYDetectorDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/TDUMMYDetectorDataDict.cxx.s
 .PHONY : TDUMMYDetectorDataDict.cxx.s
 
 # Help Target
@@ -203,10 +209,11 @@ help:
 	@echo "... depend"
 	@echo "... NPDUMMYDetector"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TDUMMYDetectorData.o"
 	@echo "... TDUMMYDetectorData.i"
 	@echo "... TDUMMYDetectorData.s"
@@ -224,6 +231,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/EXL/Makefile b/NPLib/EXL/Makefile
index b619004ef824d727210e9ab3838597b859b5556c..76579dc894129d05616bf0d480b025b20f7867f8 100644
--- a/NPLib/EXL/Makefile
+++ b/NPLib/EXL/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/EXL/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 EXL/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/EXL/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 EXL/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 EXL/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 EXL/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,39 +126,39 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 EXL/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 EXL/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 EXL/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 EXL/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
-EXL/CMakeFiles/NPExl.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 EXL/CMakeFiles/NPExl.dir/rule
-.PHONY : EXL/CMakeFiles/NPExl.dir/rule
+EXL/CMakeFiles/NPEXL.dir/rule:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 EXL/CMakeFiles/NPEXL.dir/rule
+.PHONY : EXL/CMakeFiles/NPEXL.dir/rule
 
 # Convenience name for target.
-NPExl: EXL/CMakeFiles/NPExl.dir/rule
-.PHONY : NPExl
+NPEXL: EXL/CMakeFiles/NPEXL.dir/rule
+.PHONY : NPEXL
 
 # fast build rule for target.
-NPExl/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/build
-.PHONY : NPExl/fast
+NPEXL/fast:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/build
+.PHONY : NPEXL/fast
 
 TExlData.o: TExlData.cxx.o
 .PHONY : TExlData.o
 
 # target to build an object file
 TExlData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlData.cxx.o
 .PHONY : TExlData.cxx.o
 
 TExlData.i: TExlData.cxx.i
@@ -160,7 +166,7 @@ TExlData.i: TExlData.cxx.i
 
 # target to preprocess a source file
 TExlData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlData.cxx.i
 .PHONY : TExlData.cxx.i
 
 TExlData.s: TExlData.cxx.s
@@ -168,7 +174,7 @@ TExlData.s: TExlData.cxx.s
 
 # target to generate assembly for a file
 TExlData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlData.cxx.s
 .PHONY : TExlData.cxx.s
 
 TExlDataDict.o: TExlDataDict.cxx.o
@@ -176,7 +182,7 @@ TExlDataDict.o: TExlDataDict.cxx.o
 
 # target to build an object file
 TExlDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlDataDict.cxx.o
 .PHONY : TExlDataDict.cxx.o
 
 TExlDataDict.i: TExlDataDict.cxx.i
@@ -184,7 +190,7 @@ TExlDataDict.i: TExlDataDict.cxx.i
 
 # target to preprocess a source file
 TExlDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlDataDict.cxx.i
 .PHONY : TExlDataDict.cxx.i
 
 TExlDataDict.s: TExlDataDict.cxx.s
@@ -192,7 +198,7 @@ TExlDataDict.s: TExlDataDict.cxx.s
 
 # target to generate assembly for a file
 TExlDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlDataDict.cxx.s
 .PHONY : TExlDataDict.cxx.s
 
 TExlPhysics.o: TExlPhysics.cxx.o
@@ -200,7 +206,7 @@ TExlPhysics.o: TExlPhysics.cxx.o
 
 # target to build an object file
 TExlPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlPhysics.cxx.o
 .PHONY : TExlPhysics.cxx.o
 
 TExlPhysics.i: TExlPhysics.cxx.i
@@ -208,7 +214,7 @@ TExlPhysics.i: TExlPhysics.cxx.i
 
 # target to preprocess a source file
 TExlPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlPhysics.cxx.i
 .PHONY : TExlPhysics.cxx.i
 
 TExlPhysics.s: TExlPhysics.cxx.s
@@ -216,7 +222,7 @@ TExlPhysics.s: TExlPhysics.cxx.s
 
 # target to generate assembly for a file
 TExlPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlPhysics.cxx.s
 .PHONY : TExlPhysics.cxx.s
 
 TExlPhysicsDict.o: TExlPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TExlPhysicsDict.o: TExlPhysicsDict.cxx.o
 
 # target to build an object file
 TExlPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlPhysicsDict.cxx.o
 .PHONY : TExlPhysicsDict.cxx.o
 
 TExlPhysicsDict.i: TExlPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TExlPhysicsDict.i: TExlPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TExlPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlPhysicsDict.cxx.i
 .PHONY : TExlPhysicsDict.cxx.i
 
 TExlPhysicsDict.s: TExlPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TExlPhysicsDict.s: TExlPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TExlPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPExl.dir/build.make EXL/CMakeFiles/NPExl.dir/TExlPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/TExlPhysicsDict.cxx.s
 .PHONY : TExlPhysicsDict.cxx.s
 
 # Help Target
@@ -249,12 +255,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
-	@echo "... NPExl"
+	@echo "... NPEXL"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TExlData.o"
 	@echo "... TExlData.i"
 	@echo "... TExlData.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Eurogam/Makefile b/NPLib/Eurogam/Makefile
index f6ba8a18bee6b7d9566fc416da149f1baecaeea7..5d3678ec12e82f80dc887c6806a8d1aed73a1e51 100644
--- a/NPLib/Eurogam/Makefile
+++ b/NPLib/Eurogam/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Eurogam/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Eurogam/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Eurogam/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Eurogam/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Eurogam/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Eurogam/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Eurogam/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Eurogam/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Eurogam/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Eurogam/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Eurogam/CMakeFiles/NPEurogam.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Eurogam/CMakeFiles/NPEurogam.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Eurogam/CMakeFiles/NPEurogam.dir/rule
 .PHONY : Eurogam/CMakeFiles/NPEurogam.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPEurogam: Eurogam/CMakeFiles/NPEurogam.dir/rule
 
 # fast build rule for target.
 NPEurogam/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/build
 .PHONY : NPEurogam/fast
 
 TEurogamData.o: TEurogamData.cxx.o
@@ -152,7 +158,7 @@ TEurogamData.o: TEurogamData.cxx.o
 
 # target to build an object file
 TEurogamData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamData.cxx.o
 .PHONY : TEurogamData.cxx.o
 
 TEurogamData.i: TEurogamData.cxx.i
@@ -160,7 +166,7 @@ TEurogamData.i: TEurogamData.cxx.i
 
 # target to preprocess a source file
 TEurogamData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamData.cxx.i
 .PHONY : TEurogamData.cxx.i
 
 TEurogamData.s: TEurogamData.cxx.s
@@ -168,7 +174,7 @@ TEurogamData.s: TEurogamData.cxx.s
 
 # target to generate assembly for a file
 TEurogamData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamData.cxx.s
 .PHONY : TEurogamData.cxx.s
 
 TEurogamDataDict.o: TEurogamDataDict.cxx.o
@@ -176,7 +182,7 @@ TEurogamDataDict.o: TEurogamDataDict.cxx.o
 
 # target to build an object file
 TEurogamDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamDataDict.cxx.o
 .PHONY : TEurogamDataDict.cxx.o
 
 TEurogamDataDict.i: TEurogamDataDict.cxx.i
@@ -184,7 +190,7 @@ TEurogamDataDict.i: TEurogamDataDict.cxx.i
 
 # target to preprocess a source file
 TEurogamDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamDataDict.cxx.i
 .PHONY : TEurogamDataDict.cxx.i
 
 TEurogamDataDict.s: TEurogamDataDict.cxx.s
@@ -192,7 +198,7 @@ TEurogamDataDict.s: TEurogamDataDict.cxx.s
 
 # target to generate assembly for a file
 TEurogamDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/TEurogamDataDict.cxx.s
 .PHONY : TEurogamDataDict.cxx.s
 
 # Help Target
@@ -201,12 +207,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPEurogam"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPEurogam"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TEurogamData.o"
 	@echo "... TEurogamData.i"
 	@echo "... TEurogamData.s"
@@ -224,6 +231,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Exogam/Makefile b/NPLib/Exogam/Makefile
index b1b0748e6b0e79a21eb3581e440d5ccb9c8474f8..290f13fdcc67f18ee63ba3e5c8d961b0bd8c464f 100644
--- a/NPLib/Exogam/Makefile
+++ b/NPLib/Exogam/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Exogam/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Exogam/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Exogam/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Exogam/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Exogam/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Exogam/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Exogam/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Exogam/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Exogam/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Exogam/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Exogam/CMakeFiles/NPExogam.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Exogam/CMakeFiles/NPExogam.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Exogam/CMakeFiles/NPExogam.dir/rule
 .PHONY : Exogam/CMakeFiles/NPExogam.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPExogam: Exogam/CMakeFiles/NPExogam.dir/rule
 
 # fast build rule for target.
 NPExogam/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/build
 .PHONY : NPExogam/fast
 
 TExogamData.o: TExogamData.cxx.o
@@ -152,7 +158,7 @@ TExogamData.o: TExogamData.cxx.o
 
 # target to build an object file
 TExogamData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamData.cxx.o
 .PHONY : TExogamData.cxx.o
 
 TExogamData.i: TExogamData.cxx.i
@@ -160,7 +166,7 @@ TExogamData.i: TExogamData.cxx.i
 
 # target to preprocess a source file
 TExogamData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamData.cxx.i
 .PHONY : TExogamData.cxx.i
 
 TExogamData.s: TExogamData.cxx.s
@@ -168,7 +174,7 @@ TExogamData.s: TExogamData.cxx.s
 
 # target to generate assembly for a file
 TExogamData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamData.cxx.s
 .PHONY : TExogamData.cxx.s
 
 TExogamDataDict.o: TExogamDataDict.cxx.o
@@ -176,7 +182,7 @@ TExogamDataDict.o: TExogamDataDict.cxx.o
 
 # target to build an object file
 TExogamDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamDataDict.cxx.o
 .PHONY : TExogamDataDict.cxx.o
 
 TExogamDataDict.i: TExogamDataDict.cxx.i
@@ -184,7 +190,7 @@ TExogamDataDict.i: TExogamDataDict.cxx.i
 
 # target to preprocess a source file
 TExogamDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamDataDict.cxx.i
 .PHONY : TExogamDataDict.cxx.i
 
 TExogamDataDict.s: TExogamDataDict.cxx.s
@@ -192,7 +198,7 @@ TExogamDataDict.s: TExogamDataDict.cxx.s
 
 # target to generate assembly for a file
 TExogamDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamDataDict.cxx.s
 .PHONY : TExogamDataDict.cxx.s
 
 TExogamPhysics.o: TExogamPhysics.cxx.o
@@ -200,7 +206,7 @@ TExogamPhysics.o: TExogamPhysics.cxx.o
 
 # target to build an object file
 TExogamPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysics.cxx.o
 .PHONY : TExogamPhysics.cxx.o
 
 TExogamPhysics.i: TExogamPhysics.cxx.i
@@ -208,7 +214,7 @@ TExogamPhysics.i: TExogamPhysics.cxx.i
 
 # target to preprocess a source file
 TExogamPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysics.cxx.i
 .PHONY : TExogamPhysics.cxx.i
 
 TExogamPhysics.s: TExogamPhysics.cxx.s
@@ -216,7 +222,7 @@ TExogamPhysics.s: TExogamPhysics.cxx.s
 
 # target to generate assembly for a file
 TExogamPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysics.cxx.s
 .PHONY : TExogamPhysics.cxx.s
 
 TExogamPhysicsDict.o: TExogamPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TExogamPhysicsDict.o: TExogamPhysicsDict.cxx.o
 
 # target to build an object file
 TExogamPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysicsDict.cxx.o
 .PHONY : TExogamPhysicsDict.cxx.o
 
 TExogamPhysicsDict.i: TExogamPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TExogamPhysicsDict.i: TExogamPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TExogamPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysicsDict.cxx.i
 .PHONY : TExogamPhysicsDict.cxx.i
 
 TExogamPhysicsDict.s: TExogamPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TExogamPhysicsDict.s: TExogamPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TExogamPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamPhysicsDict.cxx.s
 .PHONY : TExogamPhysicsDict.cxx.s
 
 TExogamSpectra.o: TExogamSpectra.cxx.o
@@ -248,7 +254,7 @@ TExogamSpectra.o: TExogamSpectra.cxx.o
 
 # target to build an object file
 TExogamSpectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamSpectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamSpectra.cxx.o
 .PHONY : TExogamSpectra.cxx.o
 
 TExogamSpectra.i: TExogamSpectra.cxx.i
@@ -256,7 +262,7 @@ TExogamSpectra.i: TExogamSpectra.cxx.i
 
 # target to preprocess a source file
 TExogamSpectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamSpectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamSpectra.cxx.i
 .PHONY : TExogamSpectra.cxx.i
 
 TExogamSpectra.s: TExogamSpectra.cxx.s
@@ -264,7 +270,7 @@ TExogamSpectra.s: TExogamSpectra.cxx.s
 
 # target to generate assembly for a file
 TExogamSpectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamSpectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/TExogamSpectra.cxx.s
 .PHONY : TExogamSpectra.cxx.s
 
 # Help Target
@@ -273,12 +279,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPExogam"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPExogam"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TExogamData.o"
 	@echo "... TExogamData.i"
 	@echo "... TExogamData.s"
@@ -305,6 +312,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Fatima/Makefile b/NPLib/Fatima/Makefile
index b3b9357a1449df42a59f8cfe3e2a60baa0a2d520..603a5625945b30eea7c3e3f42f26c930b166718e 100644
--- a/NPLib/Fatima/Makefile
+++ b/NPLib/Fatima/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Fatima/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Fatima/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Fatima/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Fatima/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Fatima/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Fatima/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Fatima/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Fatima/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Fatima/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Fatima/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Fatima/CMakeFiles/NPFatima.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Fatima/CMakeFiles/NPFatima.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Fatima/CMakeFiles/NPFatima.dir/rule
 .PHONY : Fatima/CMakeFiles/NPFatima.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPFatima: Fatima/CMakeFiles/NPFatima.dir/rule
 
 # fast build rule for target.
 NPFatima/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/build
 .PHONY : NPFatima/fast
 
 TFatimaData.o: TFatimaData.cxx.o
@@ -152,7 +158,7 @@ TFatimaData.o: TFatimaData.cxx.o
 
 # target to build an object file
 TFatimaData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaData.cxx.o
 .PHONY : TFatimaData.cxx.o
 
 TFatimaData.i: TFatimaData.cxx.i
@@ -160,7 +166,7 @@ TFatimaData.i: TFatimaData.cxx.i
 
 # target to preprocess a source file
 TFatimaData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaData.cxx.i
 .PHONY : TFatimaData.cxx.i
 
 TFatimaData.s: TFatimaData.cxx.s
@@ -168,7 +174,7 @@ TFatimaData.s: TFatimaData.cxx.s
 
 # target to generate assembly for a file
 TFatimaData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaData.cxx.s
 .PHONY : TFatimaData.cxx.s
 
 TFatimaDataDict.o: TFatimaDataDict.cxx.o
@@ -176,7 +182,7 @@ TFatimaDataDict.o: TFatimaDataDict.cxx.o
 
 # target to build an object file
 TFatimaDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaDataDict.cxx.o
 .PHONY : TFatimaDataDict.cxx.o
 
 TFatimaDataDict.i: TFatimaDataDict.cxx.i
@@ -184,7 +190,7 @@ TFatimaDataDict.i: TFatimaDataDict.cxx.i
 
 # target to preprocess a source file
 TFatimaDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaDataDict.cxx.i
 .PHONY : TFatimaDataDict.cxx.i
 
 TFatimaDataDict.s: TFatimaDataDict.cxx.s
@@ -192,7 +198,7 @@ TFatimaDataDict.s: TFatimaDataDict.cxx.s
 
 # target to generate assembly for a file
 TFatimaDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaDataDict.cxx.s
 .PHONY : TFatimaDataDict.cxx.s
 
 TFatimaPhysics.o: TFatimaPhysics.cxx.o
@@ -200,7 +206,7 @@ TFatimaPhysics.o: TFatimaPhysics.cxx.o
 
 # target to build an object file
 TFatimaPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysics.cxx.o
 .PHONY : TFatimaPhysics.cxx.o
 
 TFatimaPhysics.i: TFatimaPhysics.cxx.i
@@ -208,7 +214,7 @@ TFatimaPhysics.i: TFatimaPhysics.cxx.i
 
 # target to preprocess a source file
 TFatimaPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysics.cxx.i
 .PHONY : TFatimaPhysics.cxx.i
 
 TFatimaPhysics.s: TFatimaPhysics.cxx.s
@@ -216,7 +222,7 @@ TFatimaPhysics.s: TFatimaPhysics.cxx.s
 
 # target to generate assembly for a file
 TFatimaPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysics.cxx.s
 .PHONY : TFatimaPhysics.cxx.s
 
 TFatimaPhysicsDict.o: TFatimaPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TFatimaPhysicsDict.o: TFatimaPhysicsDict.cxx.o
 
 # target to build an object file
 TFatimaPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysicsDict.cxx.o
 .PHONY : TFatimaPhysicsDict.cxx.o
 
 TFatimaPhysicsDict.i: TFatimaPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TFatimaPhysicsDict.i: TFatimaPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TFatimaPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysicsDict.cxx.i
 .PHONY : TFatimaPhysicsDict.cxx.i
 
 TFatimaPhysicsDict.s: TFatimaPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TFatimaPhysicsDict.s: TFatimaPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TFatimaPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/TFatimaPhysicsDict.cxx.s
 .PHONY : TFatimaPhysicsDict.cxx.s
 
 # Help Target
@@ -251,10 +257,11 @@ help:
 	@echo "... depend"
 	@echo "... NPFatima"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TFatimaData.o"
 	@echo "... TFatimaData.i"
 	@echo "... TFatimaData.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/GASPARD/Makefile b/NPLib/GASPARD/Makefile
index 23aec3804f08687f327f48d8d1e1963f749ea5eb..6c0a51a603ede0fd06ed52bcc57aefbbf3cbd905 100644
--- a/NPLib/GASPARD/Makefile
+++ b/NPLib/GASPARD/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/GASPARD/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 GASPARD/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/GASPARD/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 GASPARD/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 GASPARD/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 GASPARD/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,39 +126,39 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 GASPARD/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 GASPARD/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 GASPARD/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 GASPARD/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
-GASPARD/CMakeFiles/NPGaspardTracker.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 GASPARD/CMakeFiles/NPGaspardTracker.dir/rule
-.PHONY : GASPARD/CMakeFiles/NPGaspardTracker.dir/rule
+GASPARD/CMakeFiles/NPGASPARD.dir/rule:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 GASPARD/CMakeFiles/NPGASPARD.dir/rule
+.PHONY : GASPARD/CMakeFiles/NPGASPARD.dir/rule
 
 # Convenience name for target.
-NPGaspardTracker: GASPARD/CMakeFiles/NPGaspardTracker.dir/rule
-.PHONY : NPGaspardTracker
+NPGASPARD: GASPARD/CMakeFiles/NPGASPARD.dir/rule
+.PHONY : NPGASPARD
 
 # fast build rule for target.
-NPGaspardTracker/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/build
-.PHONY : NPGaspardTracker/fast
+NPGASPARD/fast:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/build
+.PHONY : NPGASPARD/fast
 
 GaspardTracker.o: GaspardTracker.cxx.o
 .PHONY : GaspardTracker.o
 
 # target to build an object file
 GaspardTracker.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTracker.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTracker.cxx.o
 .PHONY : GaspardTracker.cxx.o
 
 GaspardTracker.i: GaspardTracker.cxx.i
@@ -160,7 +166,7 @@ GaspardTracker.i: GaspardTracker.cxx.i
 
 # target to preprocess a source file
 GaspardTracker.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTracker.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTracker.cxx.i
 .PHONY : GaspardTracker.cxx.i
 
 GaspardTracker.s: GaspardTracker.cxx.s
@@ -168,7 +174,7 @@ GaspardTracker.s: GaspardTracker.cxx.s
 
 # target to generate assembly for a file
 GaspardTracker.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTracker.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTracker.cxx.s
 .PHONY : GaspardTracker.cxx.s
 
 GaspardTrackerAnnular.o: GaspardTrackerAnnular.cxx.o
@@ -176,7 +182,7 @@ GaspardTrackerAnnular.o: GaspardTrackerAnnular.cxx.o
 
 # target to build an object file
 GaspardTrackerAnnular.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerAnnular.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerAnnular.cxx.o
 .PHONY : GaspardTrackerAnnular.cxx.o
 
 GaspardTrackerAnnular.i: GaspardTrackerAnnular.cxx.i
@@ -184,7 +190,7 @@ GaspardTrackerAnnular.i: GaspardTrackerAnnular.cxx.i
 
 # target to preprocess a source file
 GaspardTrackerAnnular.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerAnnular.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerAnnular.cxx.i
 .PHONY : GaspardTrackerAnnular.cxx.i
 
 GaspardTrackerAnnular.s: GaspardTrackerAnnular.cxx.s
@@ -192,7 +198,7 @@ GaspardTrackerAnnular.s: GaspardTrackerAnnular.cxx.s
 
 # target to generate assembly for a file
 GaspardTrackerAnnular.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerAnnular.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerAnnular.cxx.s
 .PHONY : GaspardTrackerAnnular.cxx.s
 
 GaspardTrackerDummyShape.o: GaspardTrackerDummyShape.cxx.o
@@ -200,7 +206,7 @@ GaspardTrackerDummyShape.o: GaspardTrackerDummyShape.cxx.o
 
 # target to build an object file
 GaspardTrackerDummyShape.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerDummyShape.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerDummyShape.cxx.o
 .PHONY : GaspardTrackerDummyShape.cxx.o
 
 GaspardTrackerDummyShape.i: GaspardTrackerDummyShape.cxx.i
@@ -208,7 +214,7 @@ GaspardTrackerDummyShape.i: GaspardTrackerDummyShape.cxx.i
 
 # target to preprocess a source file
 GaspardTrackerDummyShape.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerDummyShape.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerDummyShape.cxx.i
 .PHONY : GaspardTrackerDummyShape.cxx.i
 
 GaspardTrackerDummyShape.s: GaspardTrackerDummyShape.cxx.s
@@ -216,7 +222,7 @@ GaspardTrackerDummyShape.s: GaspardTrackerDummyShape.cxx.s
 
 # target to generate assembly for a file
 GaspardTrackerDummyShape.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerDummyShape.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerDummyShape.cxx.s
 .PHONY : GaspardTrackerDummyShape.cxx.s
 
 GaspardTrackerModule.o: GaspardTrackerModule.cxx.o
@@ -224,7 +230,7 @@ GaspardTrackerModule.o: GaspardTrackerModule.cxx.o
 
 # target to build an object file
 GaspardTrackerModule.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerModule.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerModule.cxx.o
 .PHONY : GaspardTrackerModule.cxx.o
 
 GaspardTrackerModule.i: GaspardTrackerModule.cxx.i
@@ -232,7 +238,7 @@ GaspardTrackerModule.i: GaspardTrackerModule.cxx.i
 
 # target to preprocess a source file
 GaspardTrackerModule.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerModule.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerModule.cxx.i
 .PHONY : GaspardTrackerModule.cxx.i
 
 GaspardTrackerModule.s: GaspardTrackerModule.cxx.s
@@ -240,7 +246,7 @@ GaspardTrackerModule.s: GaspardTrackerModule.cxx.s
 
 # target to generate assembly for a file
 GaspardTrackerModule.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerModule.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerModule.cxx.s
 .PHONY : GaspardTrackerModule.cxx.s
 
 GaspardTrackerRectangle.o: GaspardTrackerRectangle.cxx.o
@@ -248,7 +254,7 @@ GaspardTrackerRectangle.o: GaspardTrackerRectangle.cxx.o
 
 # target to build an object file
 GaspardTrackerRectangle.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerRectangle.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerRectangle.cxx.o
 .PHONY : GaspardTrackerRectangle.cxx.o
 
 GaspardTrackerRectangle.i: GaspardTrackerRectangle.cxx.i
@@ -256,7 +262,7 @@ GaspardTrackerRectangle.i: GaspardTrackerRectangle.cxx.i
 
 # target to preprocess a source file
 GaspardTrackerRectangle.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerRectangle.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerRectangle.cxx.i
 .PHONY : GaspardTrackerRectangle.cxx.i
 
 GaspardTrackerRectangle.s: GaspardTrackerRectangle.cxx.s
@@ -264,7 +270,7 @@ GaspardTrackerRectangle.s: GaspardTrackerRectangle.cxx.s
 
 # target to generate assembly for a file
 GaspardTrackerRectangle.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerRectangle.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerRectangle.cxx.s
 .PHONY : GaspardTrackerRectangle.cxx.s
 
 GaspardTrackerSquare.o: GaspardTrackerSquare.cxx.o
@@ -272,7 +278,7 @@ GaspardTrackerSquare.o: GaspardTrackerSquare.cxx.o
 
 # target to build an object file
 GaspardTrackerSquare.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerSquare.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerSquare.cxx.o
 .PHONY : GaspardTrackerSquare.cxx.o
 
 GaspardTrackerSquare.i: GaspardTrackerSquare.cxx.i
@@ -280,7 +286,7 @@ GaspardTrackerSquare.i: GaspardTrackerSquare.cxx.i
 
 # target to preprocess a source file
 GaspardTrackerSquare.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerSquare.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerSquare.cxx.i
 .PHONY : GaspardTrackerSquare.cxx.i
 
 GaspardTrackerSquare.s: GaspardTrackerSquare.cxx.s
@@ -288,7 +294,7 @@ GaspardTrackerSquare.s: GaspardTrackerSquare.cxx.s
 
 # target to generate assembly for a file
 GaspardTrackerSquare.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerSquare.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerSquare.cxx.s
 .PHONY : GaspardTrackerSquare.cxx.s
 
 GaspardTrackerTrapezoid.o: GaspardTrackerTrapezoid.cxx.o
@@ -296,7 +302,7 @@ GaspardTrackerTrapezoid.o: GaspardTrackerTrapezoid.cxx.o
 
 # target to build an object file
 GaspardTrackerTrapezoid.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerTrapezoid.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerTrapezoid.cxx.o
 .PHONY : GaspardTrackerTrapezoid.cxx.o
 
 GaspardTrackerTrapezoid.i: GaspardTrackerTrapezoid.cxx.i
@@ -304,7 +310,7 @@ GaspardTrackerTrapezoid.i: GaspardTrackerTrapezoid.cxx.i
 
 # target to preprocess a source file
 GaspardTrackerTrapezoid.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerTrapezoid.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerTrapezoid.cxx.i
 .PHONY : GaspardTrackerTrapezoid.cxx.i
 
 GaspardTrackerTrapezoid.s: GaspardTrackerTrapezoid.cxx.s
@@ -312,7 +318,7 @@ GaspardTrackerTrapezoid.s: GaspardTrackerTrapezoid.cxx.s
 
 # target to generate assembly for a file
 GaspardTrackerTrapezoid.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/GaspardTrackerTrapezoid.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/GaspardTrackerTrapezoid.cxx.s
 .PHONY : GaspardTrackerTrapezoid.cxx.s
 
 TGaspardTrackerData.o: TGaspardTrackerData.cxx.o
@@ -320,7 +326,7 @@ TGaspardTrackerData.o: TGaspardTrackerData.cxx.o
 
 # target to build an object file
 TGaspardTrackerData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerData.cxx.o
 .PHONY : TGaspardTrackerData.cxx.o
 
 TGaspardTrackerData.i: TGaspardTrackerData.cxx.i
@@ -328,7 +334,7 @@ TGaspardTrackerData.i: TGaspardTrackerData.cxx.i
 
 # target to preprocess a source file
 TGaspardTrackerData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerData.cxx.i
 .PHONY : TGaspardTrackerData.cxx.i
 
 TGaspardTrackerData.s: TGaspardTrackerData.cxx.s
@@ -336,7 +342,7 @@ TGaspardTrackerData.s: TGaspardTrackerData.cxx.s
 
 # target to generate assembly for a file
 TGaspardTrackerData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerData.cxx.s
 .PHONY : TGaspardTrackerData.cxx.s
 
 TGaspardTrackerDataDict.o: TGaspardTrackerDataDict.cxx.o
@@ -344,7 +350,7 @@ TGaspardTrackerDataDict.o: TGaspardTrackerDataDict.cxx.o
 
 # target to build an object file
 TGaspardTrackerDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerDataDict.cxx.o
 .PHONY : TGaspardTrackerDataDict.cxx.o
 
 TGaspardTrackerDataDict.i: TGaspardTrackerDataDict.cxx.i
@@ -352,7 +358,7 @@ TGaspardTrackerDataDict.i: TGaspardTrackerDataDict.cxx.i
 
 # target to preprocess a source file
 TGaspardTrackerDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerDataDict.cxx.i
 .PHONY : TGaspardTrackerDataDict.cxx.i
 
 TGaspardTrackerDataDict.s: TGaspardTrackerDataDict.cxx.s
@@ -360,7 +366,7 @@ TGaspardTrackerDataDict.s: TGaspardTrackerDataDict.cxx.s
 
 # target to generate assembly for a file
 TGaspardTrackerDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerDataDict.cxx.s
 .PHONY : TGaspardTrackerDataDict.cxx.s
 
 TGaspardTrackerPhysics.o: TGaspardTrackerPhysics.cxx.o
@@ -368,7 +374,7 @@ TGaspardTrackerPhysics.o: TGaspardTrackerPhysics.cxx.o
 
 # target to build an object file
 TGaspardTrackerPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerPhysics.cxx.o
 .PHONY : TGaspardTrackerPhysics.cxx.o
 
 TGaspardTrackerPhysics.i: TGaspardTrackerPhysics.cxx.i
@@ -376,7 +382,7 @@ TGaspardTrackerPhysics.i: TGaspardTrackerPhysics.cxx.i
 
 # target to preprocess a source file
 TGaspardTrackerPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerPhysics.cxx.i
 .PHONY : TGaspardTrackerPhysics.cxx.i
 
 TGaspardTrackerPhysics.s: TGaspardTrackerPhysics.cxx.s
@@ -384,7 +390,7 @@ TGaspardTrackerPhysics.s: TGaspardTrackerPhysics.cxx.s
 
 # target to generate assembly for a file
 TGaspardTrackerPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerPhysics.cxx.s
 .PHONY : TGaspardTrackerPhysics.cxx.s
 
 TGaspardTrackerPhysicsDict.o: TGaspardTrackerPhysicsDict.cxx.o
@@ -392,7 +398,7 @@ TGaspardTrackerPhysicsDict.o: TGaspardTrackerPhysicsDict.cxx.o
 
 # target to build an object file
 TGaspardTrackerPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerPhysicsDict.cxx.o
 .PHONY : TGaspardTrackerPhysicsDict.cxx.o
 
 TGaspardTrackerPhysicsDict.i: TGaspardTrackerPhysicsDict.cxx.i
@@ -400,7 +406,7 @@ TGaspardTrackerPhysicsDict.i: TGaspardTrackerPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TGaspardTrackerPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerPhysicsDict.cxx.i
 .PHONY : TGaspardTrackerPhysicsDict.cxx.i
 
 TGaspardTrackerPhysicsDict.s: TGaspardTrackerPhysicsDict.cxx.s
@@ -408,7 +414,7 @@ TGaspardTrackerPhysicsDict.s: TGaspardTrackerPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TGaspardTrackerPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGaspardTracker.dir/build.make GASPARD/CMakeFiles/NPGaspardTracker.dir/TGaspardTrackerPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/TGaspardTrackerPhysicsDict.cxx.s
 .PHONY : TGaspardTrackerPhysicsDict.cxx.s
 
 # Help Target
@@ -417,12 +423,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPGASPARD"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPGaspardTracker"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... GaspardTracker.o"
 	@echo "... GaspardTracker.i"
 	@echo "... GaspardTracker.s"
@@ -467,6 +474,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/HYDE2/Makefile b/NPLib/HYDE2/Makefile
index 4e399fab6985da2b1edf63914620df2615de334b..a3207513ec4353121652ac2fe2f2629e519614ca 100644
--- a/NPLib/HYDE2/Makefile
+++ b/NPLib/HYDE2/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/HYDE2/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HYDE2/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/HYDE2/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HYDE2/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HYDE2/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HYDE2/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HYDE2/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HYDE2/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HYDE2/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HYDE2/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 HYDE2/CMakeFiles/NPHyde2Tracker.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HYDE2/CMakeFiles/NPHyde2Tracker.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HYDE2/CMakeFiles/NPHyde2Tracker.dir/rule
 .PHONY : HYDE2/CMakeFiles/NPHyde2Tracker.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPHyde2Tracker: HYDE2/CMakeFiles/NPHyde2Tracker.dir/rule
 
 # fast build rule for target.
 NPHyde2Tracker/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/build
 .PHONY : NPHyde2Tracker/fast
 
 Hyde2Tracker.o: Hyde2Tracker.cxx.o
@@ -152,7 +158,7 @@ Hyde2Tracker.o: Hyde2Tracker.cxx.o
 
 # target to build an object file
 Hyde2Tracker.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2Tracker.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2Tracker.cxx.o
 .PHONY : Hyde2Tracker.cxx.o
 
 Hyde2Tracker.i: Hyde2Tracker.cxx.i
@@ -160,7 +166,7 @@ Hyde2Tracker.i: Hyde2Tracker.cxx.i
 
 # target to preprocess a source file
 Hyde2Tracker.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2Tracker.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2Tracker.cxx.i
 .PHONY : Hyde2Tracker.cxx.i
 
 Hyde2Tracker.s: Hyde2Tracker.cxx.s
@@ -168,7 +174,7 @@ Hyde2Tracker.s: Hyde2Tracker.cxx.s
 
 # target to generate assembly for a file
 Hyde2Tracker.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2Tracker.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2Tracker.cxx.s
 .PHONY : Hyde2Tracker.cxx.s
 
 Hyde2TrackerModule.o: Hyde2TrackerModule.cxx.o
@@ -176,7 +182,7 @@ Hyde2TrackerModule.o: Hyde2TrackerModule.cxx.o
 
 # target to build an object file
 Hyde2TrackerModule.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerModule.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerModule.cxx.o
 .PHONY : Hyde2TrackerModule.cxx.o
 
 Hyde2TrackerModule.i: Hyde2TrackerModule.cxx.i
@@ -184,7 +190,7 @@ Hyde2TrackerModule.i: Hyde2TrackerModule.cxx.i
 
 # target to preprocess a source file
 Hyde2TrackerModule.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerModule.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerModule.cxx.i
 .PHONY : Hyde2TrackerModule.cxx.i
 
 Hyde2TrackerModule.s: Hyde2TrackerModule.cxx.s
@@ -192,7 +198,7 @@ Hyde2TrackerModule.s: Hyde2TrackerModule.cxx.s
 
 # target to generate assembly for a file
 Hyde2TrackerModule.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerModule.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerModule.cxx.s
 .PHONY : Hyde2TrackerModule.cxx.s
 
 Hyde2TrackerSquare1.o: Hyde2TrackerSquare1.cxx.o
@@ -200,7 +206,7 @@ Hyde2TrackerSquare1.o: Hyde2TrackerSquare1.cxx.o
 
 # target to build an object file
 Hyde2TrackerSquare1.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerSquare1.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerSquare1.cxx.o
 .PHONY : Hyde2TrackerSquare1.cxx.o
 
 Hyde2TrackerSquare1.i: Hyde2TrackerSquare1.cxx.i
@@ -208,7 +214,7 @@ Hyde2TrackerSquare1.i: Hyde2TrackerSquare1.cxx.i
 
 # target to preprocess a source file
 Hyde2TrackerSquare1.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerSquare1.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerSquare1.cxx.i
 .PHONY : Hyde2TrackerSquare1.cxx.i
 
 Hyde2TrackerSquare1.s: Hyde2TrackerSquare1.cxx.s
@@ -216,7 +222,7 @@ Hyde2TrackerSquare1.s: Hyde2TrackerSquare1.cxx.s
 
 # target to generate assembly for a file
 Hyde2TrackerSquare1.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerSquare1.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerSquare1.cxx.s
 .PHONY : Hyde2TrackerSquare1.cxx.s
 
 Hyde2TrackerTrapezoid1.o: Hyde2TrackerTrapezoid1.cxx.o
@@ -224,7 +230,7 @@ Hyde2TrackerTrapezoid1.o: Hyde2TrackerTrapezoid1.cxx.o
 
 # target to build an object file
 Hyde2TrackerTrapezoid1.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid1.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid1.cxx.o
 .PHONY : Hyde2TrackerTrapezoid1.cxx.o
 
 Hyde2TrackerTrapezoid1.i: Hyde2TrackerTrapezoid1.cxx.i
@@ -232,7 +238,7 @@ Hyde2TrackerTrapezoid1.i: Hyde2TrackerTrapezoid1.cxx.i
 
 # target to preprocess a source file
 Hyde2TrackerTrapezoid1.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid1.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid1.cxx.i
 .PHONY : Hyde2TrackerTrapezoid1.cxx.i
 
 Hyde2TrackerTrapezoid1.s: Hyde2TrackerTrapezoid1.cxx.s
@@ -240,7 +246,7 @@ Hyde2TrackerTrapezoid1.s: Hyde2TrackerTrapezoid1.cxx.s
 
 # target to generate assembly for a file
 Hyde2TrackerTrapezoid1.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid1.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid1.cxx.s
 .PHONY : Hyde2TrackerTrapezoid1.cxx.s
 
 Hyde2TrackerTrapezoid2.o: Hyde2TrackerTrapezoid2.cxx.o
@@ -248,7 +254,7 @@ Hyde2TrackerTrapezoid2.o: Hyde2TrackerTrapezoid2.cxx.o
 
 # target to build an object file
 Hyde2TrackerTrapezoid2.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid2.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid2.cxx.o
 .PHONY : Hyde2TrackerTrapezoid2.cxx.o
 
 Hyde2TrackerTrapezoid2.i: Hyde2TrackerTrapezoid2.cxx.i
@@ -256,7 +262,7 @@ Hyde2TrackerTrapezoid2.i: Hyde2TrackerTrapezoid2.cxx.i
 
 # target to preprocess a source file
 Hyde2TrackerTrapezoid2.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid2.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid2.cxx.i
 .PHONY : Hyde2TrackerTrapezoid2.cxx.i
 
 Hyde2TrackerTrapezoid2.s: Hyde2TrackerTrapezoid2.cxx.s
@@ -264,7 +270,7 @@ Hyde2TrackerTrapezoid2.s: Hyde2TrackerTrapezoid2.cxx.s
 
 # target to generate assembly for a file
 Hyde2TrackerTrapezoid2.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid2.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/Hyde2TrackerTrapezoid2.cxx.s
 .PHONY : Hyde2TrackerTrapezoid2.cxx.s
 
 THyde2TrackerData.o: THyde2TrackerData.cxx.o
@@ -272,7 +278,7 @@ THyde2TrackerData.o: THyde2TrackerData.cxx.o
 
 # target to build an object file
 THyde2TrackerData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerData.cxx.o
 .PHONY : THyde2TrackerData.cxx.o
 
 THyde2TrackerData.i: THyde2TrackerData.cxx.i
@@ -280,7 +286,7 @@ THyde2TrackerData.i: THyde2TrackerData.cxx.i
 
 # target to preprocess a source file
 THyde2TrackerData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerData.cxx.i
 .PHONY : THyde2TrackerData.cxx.i
 
 THyde2TrackerData.s: THyde2TrackerData.cxx.s
@@ -288,7 +294,7 @@ THyde2TrackerData.s: THyde2TrackerData.cxx.s
 
 # target to generate assembly for a file
 THyde2TrackerData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerData.cxx.s
 .PHONY : THyde2TrackerData.cxx.s
 
 THyde2TrackerDataDict.o: THyde2TrackerDataDict.cxx.o
@@ -296,7 +302,7 @@ THyde2TrackerDataDict.o: THyde2TrackerDataDict.cxx.o
 
 # target to build an object file
 THyde2TrackerDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerDataDict.cxx.o
 .PHONY : THyde2TrackerDataDict.cxx.o
 
 THyde2TrackerDataDict.i: THyde2TrackerDataDict.cxx.i
@@ -304,7 +310,7 @@ THyde2TrackerDataDict.i: THyde2TrackerDataDict.cxx.i
 
 # target to preprocess a source file
 THyde2TrackerDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerDataDict.cxx.i
 .PHONY : THyde2TrackerDataDict.cxx.i
 
 THyde2TrackerDataDict.s: THyde2TrackerDataDict.cxx.s
@@ -312,7 +318,7 @@ THyde2TrackerDataDict.s: THyde2TrackerDataDict.cxx.s
 
 # target to generate assembly for a file
 THyde2TrackerDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerDataDict.cxx.s
 .PHONY : THyde2TrackerDataDict.cxx.s
 
 THyde2TrackerPhysics.o: THyde2TrackerPhysics.cxx.o
@@ -320,7 +326,7 @@ THyde2TrackerPhysics.o: THyde2TrackerPhysics.cxx.o
 
 # target to build an object file
 THyde2TrackerPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysics.cxx.o
 .PHONY : THyde2TrackerPhysics.cxx.o
 
 THyde2TrackerPhysics.i: THyde2TrackerPhysics.cxx.i
@@ -328,7 +334,7 @@ THyde2TrackerPhysics.i: THyde2TrackerPhysics.cxx.i
 
 # target to preprocess a source file
 THyde2TrackerPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysics.cxx.i
 .PHONY : THyde2TrackerPhysics.cxx.i
 
 THyde2TrackerPhysics.s: THyde2TrackerPhysics.cxx.s
@@ -336,7 +342,7 @@ THyde2TrackerPhysics.s: THyde2TrackerPhysics.cxx.s
 
 # target to generate assembly for a file
 THyde2TrackerPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysics.cxx.s
 .PHONY : THyde2TrackerPhysics.cxx.s
 
 THyde2TrackerPhysicsDict.o: THyde2TrackerPhysicsDict.cxx.o
@@ -344,7 +350,7 @@ THyde2TrackerPhysicsDict.o: THyde2TrackerPhysicsDict.cxx.o
 
 # target to build an object file
 THyde2TrackerPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysicsDict.cxx.o
 .PHONY : THyde2TrackerPhysicsDict.cxx.o
 
 THyde2TrackerPhysicsDict.i: THyde2TrackerPhysicsDict.cxx.i
@@ -352,7 +358,7 @@ THyde2TrackerPhysicsDict.i: THyde2TrackerPhysicsDict.cxx.i
 
 # target to preprocess a source file
 THyde2TrackerPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysicsDict.cxx.i
 .PHONY : THyde2TrackerPhysicsDict.cxx.i
 
 THyde2TrackerPhysicsDict.s: THyde2TrackerPhysicsDict.cxx.s
@@ -360,7 +366,7 @@ THyde2TrackerPhysicsDict.s: THyde2TrackerPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 THyde2TrackerPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/THyde2TrackerPhysicsDict.cxx.s
 .PHONY : THyde2TrackerPhysicsDict.cxx.s
 
 # Help Target
@@ -369,12 +375,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPHyde2Tracker"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPHyde2Tracker"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... Hyde2Tracker.o"
 	@echo "... Hyde2Tracker.i"
 	@echo "... Hyde2Tracker.s"
@@ -413,6 +420,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Helios/Makefile b/NPLib/Helios/Makefile
index b3fd16c24b89f8bf93258e9b0522403ada3d0b3c..75f17110ca8539f384a61b048833705a549e04f2 100644
--- a/NPLib/Helios/Makefile
+++ b/NPLib/Helios/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Helios/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Helios/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Helios/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Helios/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Helios/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Helios/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Helios/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Helios/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Helios/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Helios/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Helios/CMakeFiles/NPHelios.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Helios/CMakeFiles/NPHelios.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Helios/CMakeFiles/NPHelios.dir/rule
 .PHONY : Helios/CMakeFiles/NPHelios.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPHelios: Helios/CMakeFiles/NPHelios.dir/rule
 
 # fast build rule for target.
 NPHelios/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/build
 .PHONY : NPHelios/fast
 
 Helios.o: Helios.cxx.o
@@ -152,7 +158,7 @@ Helios.o: Helios.cxx.o
 
 # target to build an object file
 Helios.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/Helios.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/Helios.cxx.o
 .PHONY : Helios.cxx.o
 
 Helios.i: Helios.cxx.i
@@ -160,7 +166,7 @@ Helios.i: Helios.cxx.i
 
 # target to preprocess a source file
 Helios.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/Helios.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/Helios.cxx.i
 .PHONY : Helios.cxx.i
 
 Helios.s: Helios.cxx.s
@@ -168,7 +174,7 @@ Helios.s: Helios.cxx.s
 
 # target to generate assembly for a file
 Helios.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/Helios.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/Helios.cxx.s
 .PHONY : Helios.cxx.s
 
 THeliosData.o: THeliosData.cxx.o
@@ -176,7 +182,7 @@ THeliosData.o: THeliosData.cxx.o
 
 # target to build an object file
 THeliosData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosData.cxx.o
 .PHONY : THeliosData.cxx.o
 
 THeliosData.i: THeliosData.cxx.i
@@ -184,7 +190,7 @@ THeliosData.i: THeliosData.cxx.i
 
 # target to preprocess a source file
 THeliosData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosData.cxx.i
 .PHONY : THeliosData.cxx.i
 
 THeliosData.s: THeliosData.cxx.s
@@ -192,7 +198,7 @@ THeliosData.s: THeliosData.cxx.s
 
 # target to generate assembly for a file
 THeliosData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosData.cxx.s
 .PHONY : THeliosData.cxx.s
 
 THeliosDataDict.o: THeliosDataDict.cxx.o
@@ -200,7 +206,7 @@ THeliosDataDict.o: THeliosDataDict.cxx.o
 
 # target to build an object file
 THeliosDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosDataDict.cxx.o
 .PHONY : THeliosDataDict.cxx.o
 
 THeliosDataDict.i: THeliosDataDict.cxx.i
@@ -208,7 +214,7 @@ THeliosDataDict.i: THeliosDataDict.cxx.i
 
 # target to preprocess a source file
 THeliosDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosDataDict.cxx.i
 .PHONY : THeliosDataDict.cxx.i
 
 THeliosDataDict.s: THeliosDataDict.cxx.s
@@ -216,7 +222,7 @@ THeliosDataDict.s: THeliosDataDict.cxx.s
 
 # target to generate assembly for a file
 THeliosDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosDataDict.cxx.s
 .PHONY : THeliosDataDict.cxx.s
 
 THeliosPhysics.o: THeliosPhysics.cxx.o
@@ -224,7 +230,7 @@ THeliosPhysics.o: THeliosPhysics.cxx.o
 
 # target to build an object file
 THeliosPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysics.cxx.o
 .PHONY : THeliosPhysics.cxx.o
 
 THeliosPhysics.i: THeliosPhysics.cxx.i
@@ -232,7 +238,7 @@ THeliosPhysics.i: THeliosPhysics.cxx.i
 
 # target to preprocess a source file
 THeliosPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysics.cxx.i
 .PHONY : THeliosPhysics.cxx.i
 
 THeliosPhysics.s: THeliosPhysics.cxx.s
@@ -240,7 +246,7 @@ THeliosPhysics.s: THeliosPhysics.cxx.s
 
 # target to generate assembly for a file
 THeliosPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysics.cxx.s
 .PHONY : THeliosPhysics.cxx.s
 
 THeliosPhysicsDict.o: THeliosPhysicsDict.cxx.o
@@ -248,7 +254,7 @@ THeliosPhysicsDict.o: THeliosPhysicsDict.cxx.o
 
 # target to build an object file
 THeliosPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysicsDict.cxx.o
 .PHONY : THeliosPhysicsDict.cxx.o
 
 THeliosPhysicsDict.i: THeliosPhysicsDict.cxx.i
@@ -256,7 +262,7 @@ THeliosPhysicsDict.i: THeliosPhysicsDict.cxx.i
 
 # target to preprocess a source file
 THeliosPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysicsDict.cxx.i
 .PHONY : THeliosPhysicsDict.cxx.i
 
 THeliosPhysicsDict.s: THeliosPhysicsDict.cxx.s
@@ -264,7 +270,7 @@ THeliosPhysicsDict.s: THeliosPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 THeliosPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/THeliosPhysicsDict.cxx.s
 .PHONY : THeliosPhysicsDict.cxx.s
 
 # Help Target
@@ -273,12 +279,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPHelios"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPHelios"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... Helios.o"
 	@echo "... Helios.i"
 	@echo "... Helios.s"
@@ -305,6 +312,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/HiRA/Makefile b/NPLib/HiRA/Makefile
index 906be8c5f1441699fcc71f41f0f23fe96e7fd8f4..f13094486d0a4629827374199fa7e3bac39e7733 100644
--- a/NPLib/HiRA/Makefile
+++ b/NPLib/HiRA/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/HiRA/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HiRA/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/HiRA/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HiRA/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HiRA/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HiRA/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HiRA/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HiRA/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HiRA/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HiRA/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 HiRA/CMakeFiles/NPHira.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HiRA/CMakeFiles/NPHira.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 HiRA/CMakeFiles/NPHira.dir/rule
 .PHONY : HiRA/CMakeFiles/NPHira.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPHira: HiRA/CMakeFiles/NPHira.dir/rule
 
 # fast build rule for target.
 NPHira/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/build
 .PHONY : NPHira/fast
 
 THiraData.o: THiraData.cxx.o
@@ -152,7 +158,7 @@ THiraData.o: THiraData.cxx.o
 
 # target to build an object file
 THiraData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraData.cxx.o
 .PHONY : THiraData.cxx.o
 
 THiraData.i: THiraData.cxx.i
@@ -160,7 +166,7 @@ THiraData.i: THiraData.cxx.i
 
 # target to preprocess a source file
 THiraData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraData.cxx.i
 .PHONY : THiraData.cxx.i
 
 THiraData.s: THiraData.cxx.s
@@ -168,7 +174,7 @@ THiraData.s: THiraData.cxx.s
 
 # target to generate assembly for a file
 THiraData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraData.cxx.s
 .PHONY : THiraData.cxx.s
 
 THiraDataDict.o: THiraDataDict.cxx.o
@@ -176,7 +182,7 @@ THiraDataDict.o: THiraDataDict.cxx.o
 
 # target to build an object file
 THiraDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraDataDict.cxx.o
 .PHONY : THiraDataDict.cxx.o
 
 THiraDataDict.i: THiraDataDict.cxx.i
@@ -184,7 +190,7 @@ THiraDataDict.i: THiraDataDict.cxx.i
 
 # target to preprocess a source file
 THiraDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraDataDict.cxx.i
 .PHONY : THiraDataDict.cxx.i
 
 THiraDataDict.s: THiraDataDict.cxx.s
@@ -192,7 +198,7 @@ THiraDataDict.s: THiraDataDict.cxx.s
 
 # target to generate assembly for a file
 THiraDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/THiraDataDict.cxx.s
 .PHONY : THiraDataDict.cxx.s
 
 # Help Target
@@ -201,12 +207,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPHira"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPHira"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... THiraData.o"
 	@echo "... THiraData.i"
 	@echo "... THiraData.s"
@@ -224,6 +231,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/InitialConditions/Makefile b/NPLib/InitialConditions/Makefile
index 925a134a2c2d83a01e5f5207245a218ebffd40b3..7ed945f9fd6aa9647d76c12ca076661851a438c3 100644
--- a/NPLib/InitialConditions/Makefile
+++ b/NPLib/InitialConditions/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/InitialConditions/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InitialConditions/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/InitialConditions/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InitialConditions/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InitialConditions/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InitialConditions/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InitialConditions/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InitialConditions/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InitialConditions/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InitialConditions/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 InitialConditions/CMakeFiles/NPInitialConditions.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InitialConditions/CMakeFiles/NPInitialConditions.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InitialConditions/CMakeFiles/NPInitialConditions.dir/rule
 .PHONY : InitialConditions/CMakeFiles/NPInitialConditions.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPInitialConditions: InitialConditions/CMakeFiles/NPInitialConditions.dir/rule
 
 # fast build rule for target.
 NPInitialConditions/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/build
 .PHONY : NPInitialConditions/fast
 
 TInitialConditions.o: TInitialConditions.cxx.o
@@ -152,7 +158,7 @@ TInitialConditions.o: TInitialConditions.cxx.o
 
 # target to build an object file
 TInitialConditions.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditions.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditions.cxx.o
 .PHONY : TInitialConditions.cxx.o
 
 TInitialConditions.i: TInitialConditions.cxx.i
@@ -160,7 +166,7 @@ TInitialConditions.i: TInitialConditions.cxx.i
 
 # target to preprocess a source file
 TInitialConditions.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditions.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditions.cxx.i
 .PHONY : TInitialConditions.cxx.i
 
 TInitialConditions.s: TInitialConditions.cxx.s
@@ -168,7 +174,7 @@ TInitialConditions.s: TInitialConditions.cxx.s
 
 # target to generate assembly for a file
 TInitialConditions.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditions.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditions.cxx.s
 .PHONY : TInitialConditions.cxx.s
 
 TInitialConditionsDict.o: TInitialConditionsDict.cxx.o
@@ -176,7 +182,7 @@ TInitialConditionsDict.o: TInitialConditionsDict.cxx.o
 
 # target to build an object file
 TInitialConditionsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditionsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditionsDict.cxx.o
 .PHONY : TInitialConditionsDict.cxx.o
 
 TInitialConditionsDict.i: TInitialConditionsDict.cxx.i
@@ -184,7 +190,7 @@ TInitialConditionsDict.i: TInitialConditionsDict.cxx.i
 
 # target to preprocess a source file
 TInitialConditionsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditionsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditionsDict.cxx.i
 .PHONY : TInitialConditionsDict.cxx.i
 
 TInitialConditionsDict.s: TInitialConditionsDict.cxx.s
@@ -192,7 +198,7 @@ TInitialConditionsDict.s: TInitialConditionsDict.cxx.s
 
 # target to generate assembly for a file
 TInitialConditionsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditionsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InitialConditions/CMakeFiles/NPInitialConditions.dir/build.make InitialConditions/CMakeFiles/NPInitialConditions.dir/TInitialConditionsDict.cxx.s
 .PHONY : TInitialConditionsDict.cxx.s
 
 # Help Target
@@ -201,12 +207,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
-	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... NPInitialConditions"
+	@echo "... edit_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TInitialConditions.o"
 	@echo "... TInitialConditions.i"
 	@echo "... TInitialConditions.s"
@@ -224,6 +231,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/InitialConditions/TInitialConditions.h b/NPLib/InitialConditions/TInitialConditions.h
index b7a2f23a6060b20d0a4b652a693f0ea8fd490d4c..e6a0b627fad17d619d6ace7ffed79431395a8adf 100644
--- a/NPLib/InitialConditions/TInitialConditions.h
+++ b/NPLib/InitialConditions/TInitialConditions.h
@@ -38,8 +38,8 @@ using namespace std ;
 #include "TVector3.h"
 
 // NPTOOL headers
-#include "NPGlobalSystemOfUnits.h"
-#include "NPPhysicalConstants.h"
+#include "../include/NPGlobalSystemOfUnits.h"
+#include "../include/NPPhysicalConstants.h"
 #ifdef NP_SYSTEM_OF_UNITS_H
 using namespace NPUNITS;
 #endif
diff --git a/NPLib/InteractionCoordinates/Makefile b/NPLib/InteractionCoordinates/Makefile
index fdb853cc3f7dede90eb52533ab3154576e1ea606..6c1519d94bceb44e9c1c0c80a139ae1f37a843c3 100644
--- a/NPLib/InteractionCoordinates/Makefile
+++ b/NPLib/InteractionCoordinates/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/InteractionCoordinates/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InteractionCoordinates/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/InteractionCoordinates/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InteractionCoordinates/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InteractionCoordinates/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InteractionCoordinates/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InteractionCoordinates/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InteractionCoordinates/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InteractionCoordinates/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InteractionCoordinates/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/rule
 .PHONY : InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPInteractionCoordinates: InteractionCoordinates/CMakeFiles/NPInteractionCoordin
 
 # fast build rule for target.
 NPInteractionCoordinates/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build
 .PHONY : NPInteractionCoordinates/fast
 
 TInteractionCoordinates.o: TInteractionCoordinates.cxx.o
@@ -152,7 +158,7 @@ TInteractionCoordinates.o: TInteractionCoordinates.cxx.o
 
 # target to build an object file
 TInteractionCoordinates.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinates.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinates.cxx.o
 .PHONY : TInteractionCoordinates.cxx.o
 
 TInteractionCoordinates.i: TInteractionCoordinates.cxx.i
@@ -160,7 +166,7 @@ TInteractionCoordinates.i: TInteractionCoordinates.cxx.i
 
 # target to preprocess a source file
 TInteractionCoordinates.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinates.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinates.cxx.i
 .PHONY : TInteractionCoordinates.cxx.i
 
 TInteractionCoordinates.s: TInteractionCoordinates.cxx.s
@@ -168,7 +174,7 @@ TInteractionCoordinates.s: TInteractionCoordinates.cxx.s
 
 # target to generate assembly for a file
 TInteractionCoordinates.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinates.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinates.cxx.s
 .PHONY : TInteractionCoordinates.cxx.s
 
 TInteractionCoordinatesDict.o: TInteractionCoordinatesDict.cxx.o
@@ -176,7 +182,7 @@ TInteractionCoordinatesDict.o: TInteractionCoordinatesDict.cxx.o
 
 # target to build an object file
 TInteractionCoordinatesDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinatesDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinatesDict.cxx.o
 .PHONY : TInteractionCoordinatesDict.cxx.o
 
 TInteractionCoordinatesDict.i: TInteractionCoordinatesDict.cxx.i
@@ -184,7 +190,7 @@ TInteractionCoordinatesDict.i: TInteractionCoordinatesDict.cxx.i
 
 # target to preprocess a source file
 TInteractionCoordinatesDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinatesDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinatesDict.cxx.i
 .PHONY : TInteractionCoordinatesDict.cxx.i
 
 TInteractionCoordinatesDict.s: TInteractionCoordinatesDict.cxx.s
@@ -192,7 +198,7 @@ TInteractionCoordinatesDict.s: TInteractionCoordinatesDict.cxx.s
 
 # target to generate assembly for a file
 TInteractionCoordinatesDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinatesDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/TInteractionCoordinatesDict.cxx.s
 .PHONY : TInteractionCoordinatesDict.cxx.s
 
 # Help Target
@@ -201,12 +207,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPInteractionCoordinates"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPInteractionCoordinates"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TInteractionCoordinates.o"
 	@echo "... TInteractionCoordinates.i"
 	@echo "... TInteractionCoordinates.s"
@@ -224,6 +231,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/LaBr3/Makefile b/NPLib/LaBr3/Makefile
index 4bf767f806a3b8c1e22c3a6711b5a801a130d617..bcad2bda7b68ba7b6692e03c5fd552942bbbe409 100644
--- a/NPLib/LaBr3/Makefile
+++ b/NPLib/LaBr3/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/LaBr3/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 LaBr3/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/LaBr3/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 LaBr3/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 LaBr3/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 LaBr3/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 LaBr3/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 LaBr3/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 LaBr3/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 LaBr3/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 LaBr3/CMakeFiles/NPLaBr3.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 LaBr3/CMakeFiles/NPLaBr3.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 LaBr3/CMakeFiles/NPLaBr3.dir/rule
 .PHONY : LaBr3/CMakeFiles/NPLaBr3.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPLaBr3: LaBr3/CMakeFiles/NPLaBr3.dir/rule
 
 # fast build rule for target.
 NPLaBr3/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/build
 .PHONY : NPLaBr3/fast
 
 TLaBr3Data.o: TLaBr3Data.cxx.o
@@ -152,7 +158,7 @@ TLaBr3Data.o: TLaBr3Data.cxx.o
 
 # target to build an object file
 TLaBr3Data.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Data.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Data.cxx.o
 .PHONY : TLaBr3Data.cxx.o
 
 TLaBr3Data.i: TLaBr3Data.cxx.i
@@ -160,7 +166,7 @@ TLaBr3Data.i: TLaBr3Data.cxx.i
 
 # target to preprocess a source file
 TLaBr3Data.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Data.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Data.cxx.i
 .PHONY : TLaBr3Data.cxx.i
 
 TLaBr3Data.s: TLaBr3Data.cxx.s
@@ -168,7 +174,7 @@ TLaBr3Data.s: TLaBr3Data.cxx.s
 
 # target to generate assembly for a file
 TLaBr3Data.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Data.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Data.cxx.s
 .PHONY : TLaBr3Data.cxx.s
 
 TLaBr3DataDict.o: TLaBr3DataDict.cxx.o
@@ -176,7 +182,7 @@ TLaBr3DataDict.o: TLaBr3DataDict.cxx.o
 
 # target to build an object file
 TLaBr3DataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3DataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3DataDict.cxx.o
 .PHONY : TLaBr3DataDict.cxx.o
 
 TLaBr3DataDict.i: TLaBr3DataDict.cxx.i
@@ -184,7 +190,7 @@ TLaBr3DataDict.i: TLaBr3DataDict.cxx.i
 
 # target to preprocess a source file
 TLaBr3DataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3DataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3DataDict.cxx.i
 .PHONY : TLaBr3DataDict.cxx.i
 
 TLaBr3DataDict.s: TLaBr3DataDict.cxx.s
@@ -192,7 +198,7 @@ TLaBr3DataDict.s: TLaBr3DataDict.cxx.s
 
 # target to generate assembly for a file
 TLaBr3DataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3DataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3DataDict.cxx.s
 .PHONY : TLaBr3DataDict.cxx.s
 
 TLaBr3Physics.o: TLaBr3Physics.cxx.o
@@ -200,7 +206,7 @@ TLaBr3Physics.o: TLaBr3Physics.cxx.o
 
 # target to build an object file
 TLaBr3Physics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Physics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Physics.cxx.o
 .PHONY : TLaBr3Physics.cxx.o
 
 TLaBr3Physics.i: TLaBr3Physics.cxx.i
@@ -208,7 +214,7 @@ TLaBr3Physics.i: TLaBr3Physics.cxx.i
 
 # target to preprocess a source file
 TLaBr3Physics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Physics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Physics.cxx.i
 .PHONY : TLaBr3Physics.cxx.i
 
 TLaBr3Physics.s: TLaBr3Physics.cxx.s
@@ -216,7 +222,7 @@ TLaBr3Physics.s: TLaBr3Physics.cxx.s
 
 # target to generate assembly for a file
 TLaBr3Physics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Physics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Physics.cxx.s
 .PHONY : TLaBr3Physics.cxx.s
 
 TLaBr3PhysicsDict.o: TLaBr3PhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TLaBr3PhysicsDict.o: TLaBr3PhysicsDict.cxx.o
 
 # target to build an object file
 TLaBr3PhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3PhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3PhysicsDict.cxx.o
 .PHONY : TLaBr3PhysicsDict.cxx.o
 
 TLaBr3PhysicsDict.i: TLaBr3PhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TLaBr3PhysicsDict.i: TLaBr3PhysicsDict.cxx.i
 
 # target to preprocess a source file
 TLaBr3PhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3PhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3PhysicsDict.cxx.i
 .PHONY : TLaBr3PhysicsDict.cxx.i
 
 TLaBr3PhysicsDict.s: TLaBr3PhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TLaBr3PhysicsDict.s: TLaBr3PhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TLaBr3PhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3PhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3PhysicsDict.cxx.s
 .PHONY : TLaBr3PhysicsDict.cxx.s
 
 TLaBr3Spectra.o: TLaBr3Spectra.cxx.o
@@ -248,7 +254,7 @@ TLaBr3Spectra.o: TLaBr3Spectra.cxx.o
 
 # target to build an object file
 TLaBr3Spectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Spectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Spectra.cxx.o
 .PHONY : TLaBr3Spectra.cxx.o
 
 TLaBr3Spectra.i: TLaBr3Spectra.cxx.i
@@ -256,7 +262,7 @@ TLaBr3Spectra.i: TLaBr3Spectra.cxx.i
 
 # target to preprocess a source file
 TLaBr3Spectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Spectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Spectra.cxx.i
 .PHONY : TLaBr3Spectra.cxx.i
 
 TLaBr3Spectra.s: TLaBr3Spectra.cxx.s
@@ -264,7 +270,7 @@ TLaBr3Spectra.s: TLaBr3Spectra.cxx.s
 
 # target to generate assembly for a file
 TLaBr3Spectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Spectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/TLaBr3Spectra.cxx.s
 .PHONY : TLaBr3Spectra.cxx.s
 
 # Help Target
@@ -273,12 +279,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPLaBr3"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPLaBr3"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TLaBr3Data.o"
 	@echo "... TLaBr3Data.i"
 	@echo "... TLaBr3Data.s"
@@ -305,6 +312,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/MUST2/Makefile b/NPLib/MUST2/Makefile
index 64071dee2befa9f0c656b72cb299df04237c0b43..2f4e1255394bfb61df9b4484fd06e1b369b148bd 100644
--- a/NPLib/MUST2/Makefile
+++ b/NPLib/MUST2/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/MUST2/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 MUST2/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/MUST2/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 MUST2/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 MUST2/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 MUST2/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,39 +126,39 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 MUST2/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 MUST2/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 MUST2/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 MUST2/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
-MUST2/CMakeFiles/NPMust2.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 MUST2/CMakeFiles/NPMust2.dir/rule
-.PHONY : MUST2/CMakeFiles/NPMust2.dir/rule
+MUST2/CMakeFiles/NPMUST2.dir/rule:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 MUST2/CMakeFiles/NPMUST2.dir/rule
+.PHONY : MUST2/CMakeFiles/NPMUST2.dir/rule
 
 # Convenience name for target.
-NPMust2: MUST2/CMakeFiles/NPMust2.dir/rule
-.PHONY : NPMust2
+NPMUST2: MUST2/CMakeFiles/NPMUST2.dir/rule
+.PHONY : NPMUST2
 
 # fast build rule for target.
-NPMust2/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/build
-.PHONY : NPMust2/fast
+NPMUST2/fast:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/build
+.PHONY : NPMUST2/fast
 
 TMust2Data.o: TMust2Data.cxx.o
 .PHONY : TMust2Data.o
 
 # target to build an object file
 TMust2Data.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2Data.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2Data.cxx.o
 .PHONY : TMust2Data.cxx.o
 
 TMust2Data.i: TMust2Data.cxx.i
@@ -160,7 +166,7 @@ TMust2Data.i: TMust2Data.cxx.i
 
 # target to preprocess a source file
 TMust2Data.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2Data.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2Data.cxx.i
 .PHONY : TMust2Data.cxx.i
 
 TMust2Data.s: TMust2Data.cxx.s
@@ -168,7 +174,7 @@ TMust2Data.s: TMust2Data.cxx.s
 
 # target to generate assembly for a file
 TMust2Data.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2Data.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2Data.cxx.s
 .PHONY : TMust2Data.cxx.s
 
 TMust2DataDict.o: TMust2DataDict.cxx.o
@@ -176,7 +182,7 @@ TMust2DataDict.o: TMust2DataDict.cxx.o
 
 # target to build an object file
 TMust2DataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2DataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2DataDict.cxx.o
 .PHONY : TMust2DataDict.cxx.o
 
 TMust2DataDict.i: TMust2DataDict.cxx.i
@@ -184,7 +190,7 @@ TMust2DataDict.i: TMust2DataDict.cxx.i
 
 # target to preprocess a source file
 TMust2DataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2DataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2DataDict.cxx.i
 .PHONY : TMust2DataDict.cxx.i
 
 TMust2DataDict.s: TMust2DataDict.cxx.s
@@ -192,7 +198,7 @@ TMust2DataDict.s: TMust2DataDict.cxx.s
 
 # target to generate assembly for a file
 TMust2DataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2DataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2DataDict.cxx.s
 .PHONY : TMust2DataDict.cxx.s
 
 TMust2Physics.o: TMust2Physics.cxx.o
@@ -200,7 +206,7 @@ TMust2Physics.o: TMust2Physics.cxx.o
 
 # target to build an object file
 TMust2Physics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2Physics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2Physics.cxx.o
 .PHONY : TMust2Physics.cxx.o
 
 TMust2Physics.i: TMust2Physics.cxx.i
@@ -208,7 +214,7 @@ TMust2Physics.i: TMust2Physics.cxx.i
 
 # target to preprocess a source file
 TMust2Physics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2Physics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2Physics.cxx.i
 .PHONY : TMust2Physics.cxx.i
 
 TMust2Physics.s: TMust2Physics.cxx.s
@@ -216,7 +222,7 @@ TMust2Physics.s: TMust2Physics.cxx.s
 
 # target to generate assembly for a file
 TMust2Physics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2Physics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2Physics.cxx.s
 .PHONY : TMust2Physics.cxx.s
 
 TMust2PhysicsDict.o: TMust2PhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TMust2PhysicsDict.o: TMust2PhysicsDict.cxx.o
 
 # target to build an object file
 TMust2PhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2PhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2PhysicsDict.cxx.o
 .PHONY : TMust2PhysicsDict.cxx.o
 
 TMust2PhysicsDict.i: TMust2PhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TMust2PhysicsDict.i: TMust2PhysicsDict.cxx.i
 
 # target to preprocess a source file
 TMust2PhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2PhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2PhysicsDict.cxx.i
 .PHONY : TMust2PhysicsDict.cxx.i
 
 TMust2PhysicsDict.s: TMust2PhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TMust2PhysicsDict.s: TMust2PhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TMust2PhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2PhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2PhysicsDict.cxx.s
 .PHONY : TMust2PhysicsDict.cxx.s
 
 TMust2Spectra.o: TMust2Spectra.cxx.o
@@ -248,7 +254,7 @@ TMust2Spectra.o: TMust2Spectra.cxx.o
 
 # target to build an object file
 TMust2Spectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2Spectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2Spectra.cxx.o
 .PHONY : TMust2Spectra.cxx.o
 
 TMust2Spectra.i: TMust2Spectra.cxx.i
@@ -256,7 +262,7 @@ TMust2Spectra.i: TMust2Spectra.cxx.i
 
 # target to preprocess a source file
 TMust2Spectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2Spectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2Spectra.cxx.i
 .PHONY : TMust2Spectra.cxx.i
 
 TMust2Spectra.s: TMust2Spectra.cxx.s
@@ -264,7 +270,7 @@ TMust2Spectra.s: TMust2Spectra.cxx.s
 
 # target to generate assembly for a file
 TMust2Spectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMust2.dir/build.make MUST2/CMakeFiles/NPMust2.dir/TMust2Spectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/TMust2Spectra.cxx.s
 .PHONY : TMust2Spectra.cxx.s
 
 # Help Target
@@ -273,12 +279,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPMUST2"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPMust2"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TMust2Data.o"
 	@echo "... TMust2Data.i"
 	@echo "... TMust2Data.s"
@@ -305,6 +312,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Makefile b/NPLib/Makefile
index 3bc743c01ba61bab7aafe4ddd7d14b63c7eb0d0a..95762ed694dde8b56176ac1f0c379142670368aa 100644
--- a/NPLib/Makefile
+++ b/NPLib/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,21 +98,21 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles/progress.marks
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/CMakeFiles/progress.marks
 	$(MAKE) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
@@ -134,30 +140,30 @@ depend:
 .PHONY : depend
 
 #=============================================================================
-# Target rules for targets named NPCore
+# Target rules for targets named NPFatima
 
 # Build rule for target.
-NPCore: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 NPCore
-.PHONY : NPCore
+NPFatima: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPFatima
+.PHONY : NPFatima
 
 # fast build rule for target.
-NPCore/fast:
-	$(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/build
-.PHONY : NPCore/fast
+NPFatima/fast:
+	$(MAKE) -f Fatima/CMakeFiles/NPFatima.dir/build.make Fatima/CMakeFiles/NPFatima.dir/build
+.PHONY : NPFatima/fast
 
 #=============================================================================
-# Target rules for targets named NPPhysics
+# Target rules for targets named NPComptonTelescope
 
 # Build rule for target.
-NPPhysics: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 NPPhysics
-.PHONY : NPPhysics
+NPComptonTelescope: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPComptonTelescope
+.PHONY : NPComptonTelescope
 
 # fast build rule for target.
-NPPhysics/fast:
-	$(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/build
-.PHONY : NPPhysics/fast
+NPComptonTelescope/fast:
+	$(MAKE) -f ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build.make ComptonTelescope/CMakeFiles/NPComptonTelescope.dir/build
+.PHONY : NPComptonTelescope/fast
 
 #=============================================================================
 # Target rules for targets named NPAnnularS1
@@ -173,30 +179,433 @@ NPAnnularS1/fast:
 .PHONY : NPAnnularS1/fast
 
 #=============================================================================
-# Target rules for targets named npanalysis
+# Target rules for targets named NPEXL
 
 # Build rule for target.
-npanalysis: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 npanalysis
-.PHONY : npanalysis
+NPEXL: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPEXL
+.PHONY : NPEXL
 
 # fast build rule for target.
-npanalysis/fast:
-	$(MAKE) -f Utility/CMakeFiles/npanalysis.dir/build.make Utility/CMakeFiles/npanalysis.dir/build
-.PHONY : npanalysis/fast
+NPEXL/fast:
+	$(MAKE) -f EXL/CMakeFiles/NPEXL.dir/build.make EXL/CMakeFiles/NPEXL.dir/build
+.PHONY : NPEXL/fast
+
+#=============================================================================
+# Target rules for targets named NPTiara
+
+# Build rule for target.
+NPTiara: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPTiara
+.PHONY : NPTiara
+
+# fast build rule for target.
+NPTiara/fast:
+	$(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/build
+.PHONY : NPTiara/fast
+
+#=============================================================================
+# Target rules for targets named NPChateauCristal
+
+# Build rule for target.
+NPChateauCristal: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPChateauCristal
+.PHONY : NPChateauCristal
+
+# fast build rule for target.
+NPChateauCristal/fast:
+	$(MAKE) -f ChateauCristal/CMakeFiles/NPChateauCristal.dir/build.make ChateauCristal/CMakeFiles/NPChateauCristal.dir/build
+.PHONY : NPChateauCristal/fast
+
+#=============================================================================
+# Target rules for targets named NPMisc
+
+# Build rule for target.
+NPMisc: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPMisc
+.PHONY : NPMisc
+
+# fast build rule for target.
+NPMisc/fast:
+	$(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/build
+.PHONY : NPMisc/fast
+
+#=============================================================================
+# Target rules for targets named NPMaya
+
+# Build rule for target.
+NPMaya: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPMaya
+.PHONY : NPMaya
+
+# fast build rule for target.
+NPMaya/fast:
+	$(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/build
+.PHONY : NPMaya/fast
+
+#=============================================================================
+# Target rules for targets named NPHyde2Tracker
+
+# Build rule for target.
+NPHyde2Tracker: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPHyde2Tracker
+.PHONY : NPHyde2Tracker
+
+# fast build rule for target.
+NPHyde2Tracker/fast:
+	$(MAKE) -f HYDE2/CMakeFiles/NPHyde2Tracker.dir/build.make HYDE2/CMakeFiles/NPHyde2Tracker.dir/build
+.PHONY : NPHyde2Tracker/fast
+
+#=============================================================================
+# Target rules for targets named NPSSSD
+
+# Build rule for target.
+NPSSSD: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPSSSD
+.PHONY : NPSSSD
+
+# fast build rule for target.
+NPSSSD/fast:
+	$(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/build
+.PHONY : NPSSSD/fast
+
+#=============================================================================
+# Target rules for targets named NPSharc
+
+# Build rule for target.
+NPSharc: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPSharc
+.PHONY : NPSharc
+
+# fast build rule for target.
+NPSharc/fast:
+	$(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/build
+.PHONY : NPSharc/fast
 
 #=============================================================================
-# Target rules for targets named nptool-libmap
+# Target rules for targets named NPHelios
 
 # Build rule for target.
-nptool-libmap: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 nptool-libmap
-.PHONY : nptool-libmap
+NPHelios: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPHelios
+.PHONY : NPHelios
 
 # fast build rule for target.
-nptool-libmap/fast:
-	$(MAKE) -f Utility/CMakeFiles/nptool-libmap.dir/build.make Utility/CMakeFiles/nptool-libmap.dir/build
-.PHONY : nptool-libmap/fast
+NPHelios/fast:
+	$(MAKE) -f Helios/CMakeFiles/NPHelios.dir/build.make Helios/CMakeFiles/NPHelios.dir/build
+.PHONY : NPHelios/fast
+
+#=============================================================================
+# Target rules for targets named NPEurogam
+
+# Build rule for target.
+NPEurogam: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPEurogam
+.PHONY : NPEurogam
+
+# fast build rule for target.
+NPEurogam/fast:
+	$(MAKE) -f Eurogam/CMakeFiles/NPEurogam.dir/build.make Eurogam/CMakeFiles/NPEurogam.dir/build
+.PHONY : NPEurogam/fast
+
+#=============================================================================
+# Target rules for targets named NPS2
+
+# Build rule for target.
+NPS2: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPS2
+.PHONY : NPS2
+
+# fast build rule for target.
+NPS2/fast:
+	$(MAKE) -f AnnularS2/CMakeFiles/NPS2.dir/build.make AnnularS2/CMakeFiles/NPS2.dir/build
+.PHONY : NPS2/fast
+
+#=============================================================================
+# Target rules for targets named NPExogam
+
+# Build rule for target.
+NPExogam: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPExogam
+.PHONY : NPExogam
+
+# fast build rule for target.
+NPExogam/fast:
+	$(MAKE) -f Exogam/CMakeFiles/NPExogam.dir/build.make Exogam/CMakeFiles/NPExogam.dir/build
+.PHONY : NPExogam/fast
+
+#=============================================================================
+# Target rules for targets named NPNana
+
+# Build rule for target.
+NPNana: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPNana
+.PHONY : NPNana
+
+# fast build rule for target.
+NPNana/fast:
+	$(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/build
+.PHONY : NPNana/fast
+
+#=============================================================================
+# Target rules for targets named NPCharissa
+
+# Build rule for target.
+NPCharissa: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPCharissa
+.PHONY : NPCharissa
+
+# fast build rule for target.
+NPCharissa/fast:
+	$(MAKE) -f Charissa/CMakeFiles/NPCharissa.dir/build.make Charissa/CMakeFiles/NPCharissa.dir/build
+.PHONY : NPCharissa/fast
+
+#=============================================================================
+# Target rules for targets named NPDUMMYDetector
+
+# Build rule for target.
+NPDUMMYDetector: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPDUMMYDetector
+.PHONY : NPDUMMYDetector
+
+# fast build rule for target.
+NPDUMMYDetector/fast:
+	$(MAKE) -f DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build.make DummyDetector/CMakeFiles/NPDUMMYDetector.dir/build
+.PHONY : NPDUMMYDetector/fast
+
+#=============================================================================
+# Target rules for targets named NPChio
+
+# Build rule for target.
+NPChio: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPChio
+.PHONY : NPChio
+
+# fast build rule for target.
+NPChio/fast:
+	$(MAKE) -f Chio/CMakeFiles/NPChio.dir/build.make Chio/CMakeFiles/NPChio.dir/build
+.PHONY : NPChio/fast
+
+#=============================================================================
+# Target rules for targets named NPW1
+
+# Build rule for target.
+NPW1: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPW1
+.PHONY : NPW1
+
+# fast build rule for target.
+NPW1/fast:
+	$(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/build
+.PHONY : NPW1/fast
+
+#=============================================================================
+# Target rules for targets named NPSiRes
+
+# Build rule for target.
+NPSiRes: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPSiRes
+.PHONY : NPSiRes
+
+# fast build rule for target.
+NPSiRes/fast:
+	$(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/build
+.PHONY : NPSiRes/fast
+
+#=============================================================================
+# Target rules for targets named NPParis
+
+# Build rule for target.
+NPParis: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPParis
+.PHONY : NPParis
+
+# fast build rule for target.
+NPParis/fast:
+	$(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/build
+.PHONY : NPParis/fast
+
+#=============================================================================
+# Target rules for targets named NPRIPS
+
+# Build rule for target.
+NPRIPS: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPRIPS
+.PHONY : NPRIPS
+
+# fast build rule for target.
+NPRIPS/fast:
+	$(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/build
+.PHONY : NPRIPS/fast
+
+#=============================================================================
+# Target rules for targets named NPPlastic
+
+# Build rule for target.
+NPPlastic: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPPlastic
+.PHONY : NPPlastic
+
+# fast build rule for target.
+NPPlastic/fast:
+	$(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/build
+.PHONY : NPPlastic/fast
+
+#=============================================================================
+# Target rules for targets named NPCATS
+
+# Build rule for target.
+NPCATS: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPCATS
+.PHONY : NPCATS
+
+# fast build rule for target.
+NPCATS/fast:
+	$(MAKE) -f CATS/CMakeFiles/NPCATS.dir/build.make CATS/CMakeFiles/NPCATS.dir/build
+.PHONY : NPCATS/fast
+
+#=============================================================================
+# Target rules for targets named NPGASPARD
+
+# Build rule for target.
+NPGASPARD: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPGASPARD
+.PHONY : NPGASPARD
+
+# fast build rule for target.
+NPGASPARD/fast:
+	$(MAKE) -f GASPARD/CMakeFiles/NPGASPARD.dir/build.make GASPARD/CMakeFiles/NPGASPARD.dir/build
+.PHONY : NPGASPARD/fast
+
+#=============================================================================
+# Target rules for targets named NPHira
+
+# Build rule for target.
+NPHira: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPHira
+.PHONY : NPHira
+
+# fast build rule for target.
+NPHira/fast:
+	$(MAKE) -f HiRA/CMakeFiles/NPHira.dir/build.make HiRA/CMakeFiles/NPHira.dir/build
+.PHONY : NPHira/fast
+
+#=============================================================================
+# Target rules for targets named NPMUST2
+
+# Build rule for target.
+NPMUST2: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPMUST2
+.PHONY : NPMUST2
+
+# fast build rule for target.
+NPMUST2/fast:
+	$(MAKE) -f MUST2/CMakeFiles/NPMUST2.dir/build.make MUST2/CMakeFiles/NPMUST2.dir/build
+.PHONY : NPMUST2/fast
+
+#=============================================================================
+# Target rules for targets named NPVamos
+
+# Build rule for target.
+NPVamos: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPVamos
+.PHONY : NPVamos
+
+# fast build rule for target.
+NPVamos/fast:
+	$(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/build
+.PHONY : NPVamos/fast
+
+#=============================================================================
+# Target rules for targets named NPSpeg
+
+# Build rule for target.
+NPSpeg: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPSpeg
+.PHONY : NPSpeg
+
+# fast build rule for target.
+NPSpeg/fast:
+	$(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/build
+.PHONY : NPSpeg/fast
+
+#=============================================================================
+# Target rules for targets named NPSiLi
+
+# Build rule for target.
+NPSiLi: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPSiLi
+.PHONY : NPSiLi
+
+# fast build rule for target.
+NPSiLi/fast:
+	$(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/build
+.PHONY : NPSiLi/fast
+
+#=============================================================================
+# Target rules for targets named NPLaBr3
+
+# Build rule for target.
+NPLaBr3: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPLaBr3
+.PHONY : NPLaBr3
+
+# fast build rule for target.
+NPLaBr3/fast:
+	$(MAKE) -f LaBr3/CMakeFiles/NPLaBr3.dir/build.make LaBr3/CMakeFiles/NPLaBr3.dir/build
+.PHONY : NPLaBr3/fast
+
+#=============================================================================
+# Target rules for targets named NPTigress
+
+# Build rule for target.
+NPTigress: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPTigress
+.PHONY : NPTigress
+
+# fast build rule for target.
+NPTigress/fast:
+	$(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/build
+.PHONY : NPTigress/fast
+
+#=============================================================================
+# Target rules for targets named NPTrifoil
+
+# Build rule for target.
+NPTrifoil: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPTrifoil
+.PHONY : NPTrifoil
+
+# fast build rule for target.
+NPTrifoil/fast:
+	$(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/build
+.PHONY : NPTrifoil/fast
+
+#=============================================================================
+# Target rules for targets named NPCore
+
+# Build rule for target.
+NPCore: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPCore
+.PHONY : NPCore
+
+# fast build rule for target.
+NPCore/fast:
+	$(MAKE) -f Core/CMakeFiles/NPCore.dir/build.make Core/CMakeFiles/NPCore.dir/build
+.PHONY : NPCore/fast
+
+#=============================================================================
+# Target rules for targets named NPPhysics
+
+# Build rule for target.
+NPPhysics: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 NPPhysics
+.PHONY : NPPhysics
+
+# fast build rule for target.
+NPPhysics/fast:
+	$(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/build
+.PHONY : NPPhysics/fast
 
 #=============================================================================
 # Target rules for targets named NPInitialConditions
@@ -224,6 +633,32 @@ NPInteractionCoordinates/fast:
 	$(MAKE) -f InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build.make InteractionCoordinates/CMakeFiles/NPInteractionCoordinates.dir/build
 .PHONY : NPInteractionCoordinates/fast
 
+#=============================================================================
+# Target rules for targets named npanalysis
+
+# Build rule for target.
+npanalysis: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 npanalysis
+.PHONY : npanalysis
+
+# fast build rule for target.
+npanalysis/fast:
+	$(MAKE) -f Utility/CMakeFiles/npanalysis.dir/build.make Utility/CMakeFiles/npanalysis.dir/build
+.PHONY : npanalysis/fast
+
+#=============================================================================
+# Target rules for targets named nptool-installer
+
+# Build rule for target.
+nptool-installer: cmake_check_build_system
+	$(MAKE) -f CMakeFiles/Makefile2 nptool-installer
+.PHONY : nptool-installer
+
+# fast build rule for target.
+nptool-installer/fast:
+	$(MAKE) -f Utility/CMakeFiles/nptool-installer.dir/build.make Utility/CMakeFiles/nptool-installer.dir/build
+.PHONY : nptool-installer/fast
+
 # Help Target
 help:
 	@echo "The following are some of the valid targets for this Makefile:"
@@ -231,17 +666,51 @@ help:
 	@echo "... clean"
 	@echo "... depend"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
+	@echo "... NPFatima"
+	@echo "... NPComptonTelescope"
+	@echo "... NPAnnularS1"
+	@echo "... NPEXL"
+	@echo "... NPTiara"
+	@echo "... NPChateauCristal"
+	@echo "... NPMisc"
+	@echo "... NPMaya"
+	@echo "... NPHyde2Tracker"
+	@echo "... NPSSSD"
+	@echo "... NPSharc"
+	@echo "... NPHelios"
+	@echo "... NPEurogam"
+	@echo "... NPS2"
+	@echo "... NPExogam"
+	@echo "... NPNana"
+	@echo "... NPCharissa"
+	@echo "... NPDUMMYDetector"
+	@echo "... NPChio"
+	@echo "... NPW1"
+	@echo "... NPSiRes"
+	@echo "... NPParis"
+	@echo "... NPRIPS"
+	@echo "... NPPlastic"
+	@echo "... NPCATS"
+	@echo "... NPGASPARD"
+	@echo "... NPHira"
+	@echo "... NPMUST2"
+	@echo "... NPVamos"
+	@echo "... NPSpeg"
+	@echo "... NPSiLi"
+	@echo "... NPLaBr3"
+	@echo "... NPTigress"
+	@echo "... NPTrifoil"
 	@echo "... NPCore"
 	@echo "... NPPhysics"
-	@echo "... NPAnnularS1"
-	@echo "... npanalysis"
-	@echo "... nptool-libmap"
 	@echo "... NPInitialConditions"
 	@echo "... NPInteractionCoordinates"
+	@echo "... npanalysis"
+	@echo "... nptool-installer"
 .PHONY : help
 
 
diff --git a/NPLib/Maya/Makefile b/NPLib/Maya/Makefile
index bc5e3394b64e1a9da14caa6f33918a07d8687ed0..a1f03da53c06316f7d5a94fea8e813812ac607fc 100644
--- a/NPLib/Maya/Makefile
+++ b/NPLib/Maya/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Maya/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Maya/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Maya/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Maya/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Maya/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Maya/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Maya/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Maya/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Maya/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Maya/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Maya/CMakeFiles/NPMaya.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Maya/CMakeFiles/NPMaya.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Maya/CMakeFiles/NPMaya.dir/rule
 .PHONY : Maya/CMakeFiles/NPMaya.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPMaya: Maya/CMakeFiles/NPMaya.dir/rule
 
 # fast build rule for target.
 NPMaya/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/build
 .PHONY : NPMaya/fast
 
 ConfigReader.o: ConfigReader.cxx.o
@@ -152,7 +158,7 @@ ConfigReader.o: ConfigReader.cxx.o
 
 # target to build an object file
 ConfigReader.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/ConfigReader.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/ConfigReader.cxx.o
 .PHONY : ConfigReader.cxx.o
 
 ConfigReader.i: ConfigReader.cxx.i
@@ -160,7 +166,7 @@ ConfigReader.i: ConfigReader.cxx.i
 
 # target to preprocess a source file
 ConfigReader.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/ConfigReader.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/ConfigReader.cxx.i
 .PHONY : ConfigReader.cxx.i
 
 ConfigReader.s: ConfigReader.cxx.s
@@ -168,7 +174,7 @@ ConfigReader.s: ConfigReader.cxx.s
 
 # target to generate assembly for a file
 ConfigReader.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/ConfigReader.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/ConfigReader.cxx.s
 .PHONY : ConfigReader.cxx.s
 
 TMayaData.o: TMayaData.cxx.o
@@ -176,7 +182,7 @@ TMayaData.o: TMayaData.cxx.o
 
 # target to build an object file
 TMayaData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaData.cxx.o
 .PHONY : TMayaData.cxx.o
 
 TMayaData.i: TMayaData.cxx.i
@@ -184,7 +190,7 @@ TMayaData.i: TMayaData.cxx.i
 
 # target to preprocess a source file
 TMayaData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaData.cxx.i
 .PHONY : TMayaData.cxx.i
 
 TMayaData.s: TMayaData.cxx.s
@@ -192,7 +198,7 @@ TMayaData.s: TMayaData.cxx.s
 
 # target to generate assembly for a file
 TMayaData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaData.cxx.s
 .PHONY : TMayaData.cxx.s
 
 TMayaDataDict.o: TMayaDataDict.cxx.o
@@ -200,7 +206,7 @@ TMayaDataDict.o: TMayaDataDict.cxx.o
 
 # target to build an object file
 TMayaDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaDataDict.cxx.o
 .PHONY : TMayaDataDict.cxx.o
 
 TMayaDataDict.i: TMayaDataDict.cxx.i
@@ -208,7 +214,7 @@ TMayaDataDict.i: TMayaDataDict.cxx.i
 
 # target to preprocess a source file
 TMayaDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaDataDict.cxx.i
 .PHONY : TMayaDataDict.cxx.i
 
 TMayaDataDict.s: TMayaDataDict.cxx.s
@@ -216,7 +222,7 @@ TMayaDataDict.s: TMayaDataDict.cxx.s
 
 # target to generate assembly for a file
 TMayaDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaDataDict.cxx.s
 .PHONY : TMayaDataDict.cxx.s
 
 TMayaHisto.o: TMayaHisto.cxx.o
@@ -224,7 +230,7 @@ TMayaHisto.o: TMayaHisto.cxx.o
 
 # target to build an object file
 TMayaHisto.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHisto.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHisto.cxx.o
 .PHONY : TMayaHisto.cxx.o
 
 TMayaHisto.i: TMayaHisto.cxx.i
@@ -232,7 +238,7 @@ TMayaHisto.i: TMayaHisto.cxx.i
 
 # target to preprocess a source file
 TMayaHisto.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHisto.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHisto.cxx.i
 .PHONY : TMayaHisto.cxx.i
 
 TMayaHisto.s: TMayaHisto.cxx.s
@@ -240,7 +246,7 @@ TMayaHisto.s: TMayaHisto.cxx.s
 
 # target to generate assembly for a file
 TMayaHisto.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHisto.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHisto.cxx.s
 .PHONY : TMayaHisto.cxx.s
 
 TMayaHistoDict.o: TMayaHistoDict.cxx.o
@@ -248,7 +254,7 @@ TMayaHistoDict.o: TMayaHistoDict.cxx.o
 
 # target to build an object file
 TMayaHistoDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHistoDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHistoDict.cxx.o
 .PHONY : TMayaHistoDict.cxx.o
 
 TMayaHistoDict.i: TMayaHistoDict.cxx.i
@@ -256,7 +262,7 @@ TMayaHistoDict.i: TMayaHistoDict.cxx.i
 
 # target to preprocess a source file
 TMayaHistoDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHistoDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHistoDict.cxx.i
 .PHONY : TMayaHistoDict.cxx.i
 
 TMayaHistoDict.s: TMayaHistoDict.cxx.s
@@ -264,7 +270,7 @@ TMayaHistoDict.s: TMayaHistoDict.cxx.s
 
 # target to generate assembly for a file
 TMayaHistoDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHistoDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Maya/CMakeFiles/NPMaya.dir/build.make Maya/CMakeFiles/NPMaya.dir/TMayaHistoDict.cxx.s
 .PHONY : TMayaHistoDict.cxx.s
 
 # Help Target
@@ -275,10 +281,11 @@ help:
 	@echo "... depend"
 	@echo "... NPMaya"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... ConfigReader.o"
 	@echo "... ConfigReader.i"
 	@echo "... ConfigReader.s"
@@ -305,6 +312,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Misc/Makefile b/NPLib/Misc/Makefile
index e97506804946b0219a667a23f52a7ea50e67414c..953c0dbeb3287ec104a9987fe1fa5c551c32f67a 100644
--- a/NPLib/Misc/Makefile
+++ b/NPLib/Misc/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Misc/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Misc/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Misc/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Misc/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Misc/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Misc/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Misc/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Misc/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Misc/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Misc/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Misc/CMakeFiles/NPMisc.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Misc/CMakeFiles/NPMisc.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Misc/CMakeFiles/NPMisc.dir/rule
 .PHONY : Misc/CMakeFiles/NPMisc.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPMisc: Misc/CMakeFiles/NPMisc.dir/rule
 
 # fast build rule for target.
 NPMisc/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/build
 .PHONY : NPMisc/fast
 
 TTacData.o: TTacData.cxx.o
@@ -152,7 +158,7 @@ TTacData.o: TTacData.cxx.o
 
 # target to build an object file
 TTacData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacData.cxx.o
 .PHONY : TTacData.cxx.o
 
 TTacData.i: TTacData.cxx.i
@@ -160,7 +166,7 @@ TTacData.i: TTacData.cxx.i
 
 # target to preprocess a source file
 TTacData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacData.cxx.i
 .PHONY : TTacData.cxx.i
 
 TTacData.s: TTacData.cxx.s
@@ -168,7 +174,7 @@ TTacData.s: TTacData.cxx.s
 
 # target to generate assembly for a file
 TTacData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacData.cxx.s
 .PHONY : TTacData.cxx.s
 
 TTacDataDict.o: TTacDataDict.cxx.o
@@ -176,7 +182,7 @@ TTacDataDict.o: TTacDataDict.cxx.o
 
 # target to build an object file
 TTacDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacDataDict.cxx.o
 .PHONY : TTacDataDict.cxx.o
 
 TTacDataDict.i: TTacDataDict.cxx.i
@@ -184,7 +190,7 @@ TTacDataDict.i: TTacDataDict.cxx.i
 
 # target to preprocess a source file
 TTacDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacDataDict.cxx.i
 .PHONY : TTacDataDict.cxx.i
 
 TTacDataDict.s: TTacDataDict.cxx.s
@@ -192,15 +198,63 @@ TTacDataDict.s: TTacDataDict.cxx.s
 
 # target to generate assembly for a file
 TTacDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacDataDict.cxx.s
 .PHONY : TTacDataDict.cxx.s
 
+TTacPhysics.o: TTacPhysics.cxx.o
+.PHONY : TTacPhysics.o
+
+# target to build an object file
+TTacPhysics.cxx.o:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacPhysics.cxx.o
+.PHONY : TTacPhysics.cxx.o
+
+TTacPhysics.i: TTacPhysics.cxx.i
+.PHONY : TTacPhysics.i
+
+# target to preprocess a source file
+TTacPhysics.cxx.i:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacPhysics.cxx.i
+.PHONY : TTacPhysics.cxx.i
+
+TTacPhysics.s: TTacPhysics.cxx.s
+.PHONY : TTacPhysics.s
+
+# target to generate assembly for a file
+TTacPhysics.cxx.s:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacPhysics.cxx.s
+.PHONY : TTacPhysics.cxx.s
+
+TTacPhysicsDict.o: TTacPhysicsDict.cxx.o
+.PHONY : TTacPhysicsDict.o
+
+# target to build an object file
+TTacPhysicsDict.cxx.o:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacPhysicsDict.cxx.o
+.PHONY : TTacPhysicsDict.cxx.o
+
+TTacPhysicsDict.i: TTacPhysicsDict.cxx.i
+.PHONY : TTacPhysicsDict.i
+
+# target to preprocess a source file
+TTacPhysicsDict.cxx.i:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacPhysicsDict.cxx.i
+.PHONY : TTacPhysicsDict.cxx.i
+
+TTacPhysicsDict.s: TTacPhysicsDict.cxx.s
+.PHONY : TTacPhysicsDict.s
+
+# target to generate assembly for a file
+TTacPhysicsDict.cxx.s:
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTacPhysicsDict.cxx.s
+.PHONY : TTacPhysicsDict.cxx.s
+
 TTriggerData.o: TTriggerData.cxx.o
 .PHONY : TTriggerData.o
 
 # target to build an object file
 TTriggerData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerData.cxx.o
 .PHONY : TTriggerData.cxx.o
 
 TTriggerData.i: TTriggerData.cxx.i
@@ -208,7 +262,7 @@ TTriggerData.i: TTriggerData.cxx.i
 
 # target to preprocess a source file
 TTriggerData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerData.cxx.i
 .PHONY : TTriggerData.cxx.i
 
 TTriggerData.s: TTriggerData.cxx.s
@@ -216,7 +270,7 @@ TTriggerData.s: TTriggerData.cxx.s
 
 # target to generate assembly for a file
 TTriggerData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerData.cxx.s
 .PHONY : TTriggerData.cxx.s
 
 TTriggerDataDict.o: TTriggerDataDict.cxx.o
@@ -224,7 +278,7 @@ TTriggerDataDict.o: TTriggerDataDict.cxx.o
 
 # target to build an object file
 TTriggerDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerDataDict.cxx.o
 .PHONY : TTriggerDataDict.cxx.o
 
 TTriggerDataDict.i: TTriggerDataDict.cxx.i
@@ -232,7 +286,7 @@ TTriggerDataDict.i: TTriggerDataDict.cxx.i
 
 # target to preprocess a source file
 TTriggerDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerDataDict.cxx.i
 .PHONY : TTriggerDataDict.cxx.i
 
 TTriggerDataDict.s: TTriggerDataDict.cxx.s
@@ -240,7 +294,7 @@ TTriggerDataDict.s: TTriggerDataDict.cxx.s
 
 # target to generate assembly for a file
 TTriggerDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Misc/CMakeFiles/NPMisc.dir/build.make Misc/CMakeFiles/NPMisc.dir/TTriggerDataDict.cxx.s
 .PHONY : TTriggerDataDict.cxx.s
 
 # Help Target
@@ -249,18 +303,25 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPMisc"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
-	@echo "... NPMisc"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TTacData.o"
 	@echo "... TTacData.i"
 	@echo "... TTacData.s"
 	@echo "... TTacDataDict.o"
 	@echo "... TTacDataDict.i"
 	@echo "... TTacDataDict.s"
+	@echo "... TTacPhysics.o"
+	@echo "... TTacPhysics.i"
+	@echo "... TTacPhysics.s"
+	@echo "... TTacPhysicsDict.o"
+	@echo "... TTacPhysicsDict.i"
+	@echo "... TTacPhysicsDict.s"
 	@echo "... TTriggerData.o"
 	@echo "... TTriggerData.i"
 	@echo "... TTriggerData.s"
@@ -278,6 +339,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Nana/Makefile b/NPLib/Nana/Makefile
index b5eb02e52d43d64f35922cfb5ea76806017b57ff..d95a911e04ca5054a87d3bd9347b30f2026b18ae 100644
--- a/NPLib/Nana/Makefile
+++ b/NPLib/Nana/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Nana/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Nana/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Nana/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Nana/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Nana/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Nana/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Nana/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Nana/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Nana/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Nana/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Nana/CMakeFiles/NPNana.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Nana/CMakeFiles/NPNana.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Nana/CMakeFiles/NPNana.dir/rule
 .PHONY : Nana/CMakeFiles/NPNana.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPNana: Nana/CMakeFiles/NPNana.dir/rule
 
 # fast build rule for target.
 NPNana/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/build
 .PHONY : NPNana/fast
 
 TNanaData.o: TNanaData.cxx.o
@@ -152,7 +158,7 @@ TNanaData.o: TNanaData.cxx.o
 
 # target to build an object file
 TNanaData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaData.cxx.o
 .PHONY : TNanaData.cxx.o
 
 TNanaData.i: TNanaData.cxx.i
@@ -160,7 +166,7 @@ TNanaData.i: TNanaData.cxx.i
 
 # target to preprocess a source file
 TNanaData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaData.cxx.i
 .PHONY : TNanaData.cxx.i
 
 TNanaData.s: TNanaData.cxx.s
@@ -168,7 +174,7 @@ TNanaData.s: TNanaData.cxx.s
 
 # target to generate assembly for a file
 TNanaData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaData.cxx.s
 .PHONY : TNanaData.cxx.s
 
 TNanaDataDict.o: TNanaDataDict.cxx.o
@@ -176,7 +182,7 @@ TNanaDataDict.o: TNanaDataDict.cxx.o
 
 # target to build an object file
 TNanaDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaDataDict.cxx.o
 .PHONY : TNanaDataDict.cxx.o
 
 TNanaDataDict.i: TNanaDataDict.cxx.i
@@ -184,7 +190,7 @@ TNanaDataDict.i: TNanaDataDict.cxx.i
 
 # target to preprocess a source file
 TNanaDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaDataDict.cxx.i
 .PHONY : TNanaDataDict.cxx.i
 
 TNanaDataDict.s: TNanaDataDict.cxx.s
@@ -192,7 +198,7 @@ TNanaDataDict.s: TNanaDataDict.cxx.s
 
 # target to generate assembly for a file
 TNanaDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaDataDict.cxx.s
 .PHONY : TNanaDataDict.cxx.s
 
 TNanaPhysics.o: TNanaPhysics.cxx.o
@@ -200,7 +206,7 @@ TNanaPhysics.o: TNanaPhysics.cxx.o
 
 # target to build an object file
 TNanaPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysics.cxx.o
 .PHONY : TNanaPhysics.cxx.o
 
 TNanaPhysics.i: TNanaPhysics.cxx.i
@@ -208,7 +214,7 @@ TNanaPhysics.i: TNanaPhysics.cxx.i
 
 # target to preprocess a source file
 TNanaPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysics.cxx.i
 .PHONY : TNanaPhysics.cxx.i
 
 TNanaPhysics.s: TNanaPhysics.cxx.s
@@ -216,7 +222,7 @@ TNanaPhysics.s: TNanaPhysics.cxx.s
 
 # target to generate assembly for a file
 TNanaPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysics.cxx.s
 .PHONY : TNanaPhysics.cxx.s
 
 TNanaPhysicsDict.o: TNanaPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TNanaPhysicsDict.o: TNanaPhysicsDict.cxx.o
 
 # target to build an object file
 TNanaPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysicsDict.cxx.o
 .PHONY : TNanaPhysicsDict.cxx.o
 
 TNanaPhysicsDict.i: TNanaPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TNanaPhysicsDict.i: TNanaPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TNanaPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysicsDict.cxx.i
 .PHONY : TNanaPhysicsDict.cxx.i
 
 TNanaPhysicsDict.s: TNanaPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TNanaPhysicsDict.s: TNanaPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TNanaPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Nana/CMakeFiles/NPNana.dir/build.make Nana/CMakeFiles/NPNana.dir/TNanaPhysicsDict.cxx.s
 .PHONY : TNanaPhysicsDict.cxx.s
 
 # Help Target
@@ -249,12 +255,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPNana"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPNana"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TNanaData.o"
 	@echo "... TNanaData.i"
 	@echo "... TNanaData.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Paris/Makefile b/NPLib/Paris/Makefile
index 4f7c24fadbf2dccadfb0007681fb13f668fa5427..a205f7774c281ba4513d819b0105dfefd6ea2ab1 100644
--- a/NPLib/Paris/Makefile
+++ b/NPLib/Paris/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Paris/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Paris/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Paris/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Paris/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Paris/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Paris/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Paris/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Paris/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Paris/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Paris/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Paris/CMakeFiles/NPParis.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Paris/CMakeFiles/NPParis.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Paris/CMakeFiles/NPParis.dir/rule
 .PHONY : Paris/CMakeFiles/NPParis.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPParis: Paris/CMakeFiles/NPParis.dir/rule
 
 # fast build rule for target.
 NPParis/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/build
 .PHONY : NPParis/fast
 
 TParisData.o: TParisData.cxx.o
@@ -152,7 +158,7 @@ TParisData.o: TParisData.cxx.o
 
 # target to build an object file
 TParisData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisData.cxx.o
 .PHONY : TParisData.cxx.o
 
 TParisData.i: TParisData.cxx.i
@@ -160,7 +166,7 @@ TParisData.i: TParisData.cxx.i
 
 # target to preprocess a source file
 TParisData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisData.cxx.i
 .PHONY : TParisData.cxx.i
 
 TParisData.s: TParisData.cxx.s
@@ -168,7 +174,7 @@ TParisData.s: TParisData.cxx.s
 
 # target to generate assembly for a file
 TParisData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisData.cxx.s
 .PHONY : TParisData.cxx.s
 
 TParisDataDict.o: TParisDataDict.cxx.o
@@ -176,7 +182,7 @@ TParisDataDict.o: TParisDataDict.cxx.o
 
 # target to build an object file
 TParisDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisDataDict.cxx.o
 .PHONY : TParisDataDict.cxx.o
 
 TParisDataDict.i: TParisDataDict.cxx.i
@@ -184,7 +190,7 @@ TParisDataDict.i: TParisDataDict.cxx.i
 
 # target to preprocess a source file
 TParisDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisDataDict.cxx.i
 .PHONY : TParisDataDict.cxx.i
 
 TParisDataDict.s: TParisDataDict.cxx.s
@@ -192,7 +198,7 @@ TParisDataDict.s: TParisDataDict.cxx.s
 
 # target to generate assembly for a file
 TParisDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisDataDict.cxx.s
 .PHONY : TParisDataDict.cxx.s
 
 TParisPhysics.o: TParisPhysics.cxx.o
@@ -200,7 +206,7 @@ TParisPhysics.o: TParisPhysics.cxx.o
 
 # target to build an object file
 TParisPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysics.cxx.o
 .PHONY : TParisPhysics.cxx.o
 
 TParisPhysics.i: TParisPhysics.cxx.i
@@ -208,7 +214,7 @@ TParisPhysics.i: TParisPhysics.cxx.i
 
 # target to preprocess a source file
 TParisPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysics.cxx.i
 .PHONY : TParisPhysics.cxx.i
 
 TParisPhysics.s: TParisPhysics.cxx.s
@@ -216,7 +222,7 @@ TParisPhysics.s: TParisPhysics.cxx.s
 
 # target to generate assembly for a file
 TParisPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysics.cxx.s
 .PHONY : TParisPhysics.cxx.s
 
 TParisPhysicsDict.o: TParisPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TParisPhysicsDict.o: TParisPhysicsDict.cxx.o
 
 # target to build an object file
 TParisPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysicsDict.cxx.o
 .PHONY : TParisPhysicsDict.cxx.o
 
 TParisPhysicsDict.i: TParisPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TParisPhysicsDict.i: TParisPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TParisPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysicsDict.cxx.i
 .PHONY : TParisPhysicsDict.cxx.i
 
 TParisPhysicsDict.s: TParisPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TParisPhysicsDict.s: TParisPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TParisPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Paris/CMakeFiles/NPParis.dir/build.make Paris/CMakeFiles/NPParis.dir/TParisPhysicsDict.cxx.s
 .PHONY : TParisPhysicsDict.cxx.s
 
 # Help Target
@@ -251,10 +257,11 @@ help:
 	@echo "... depend"
 	@echo "... NPParis"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TParisData.o"
 	@echo "... TParisData.i"
 	@echo "... TParisData.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Physics/Makefile b/NPLib/Physics/Makefile
index 3a06a70afc9623b010a309d33d402336cb30b5a9..f8c0173e7059ba5cc97c896fd94dc7b1e8c992f6 100644
--- a/NPLib/Physics/Makefile
+++ b/NPLib/Physics/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Physics/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Physics/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Physics/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Physics/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Physics/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Physics/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Physics/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Physics/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Physics/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Physics/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Physics/CMakeFiles/NPPhysics.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Physics/CMakeFiles/NPPhysics.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Physics/CMakeFiles/NPPhysics.dir/rule
 .PHONY : Physics/CMakeFiles/NPPhysics.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPPhysics: Physics/CMakeFiles/NPPhysics.dir/rule
 
 # fast build rule for target.
 NPPhysics/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/build
 .PHONY : NPPhysics/fast
 
 NPBeam.o: NPBeam.cxx.o
@@ -152,7 +158,7 @@ NPBeam.o: NPBeam.cxx.o
 
 # target to build an object file
 NPBeam.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPBeam.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPBeam.cxx.o
 .PHONY : NPBeam.cxx.o
 
 NPBeam.i: NPBeam.cxx.i
@@ -160,7 +166,7 @@ NPBeam.i: NPBeam.cxx.i
 
 # target to preprocess a source file
 NPBeam.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPBeam.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPBeam.cxx.i
 .PHONY : NPBeam.cxx.i
 
 NPBeam.s: NPBeam.cxx.s
@@ -168,7 +174,7 @@ NPBeam.s: NPBeam.cxx.s
 
 # target to generate assembly for a file
 NPBeam.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPBeam.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPBeam.cxx.s
 .PHONY : NPBeam.cxx.s
 
 NPEnergyLoss.o: NPEnergyLoss.cxx.o
@@ -176,7 +182,7 @@ NPEnergyLoss.o: NPEnergyLoss.cxx.o
 
 # target to build an object file
 NPEnergyLoss.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPEnergyLoss.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPEnergyLoss.cxx.o
 .PHONY : NPEnergyLoss.cxx.o
 
 NPEnergyLoss.i: NPEnergyLoss.cxx.i
@@ -184,7 +190,7 @@ NPEnergyLoss.i: NPEnergyLoss.cxx.i
 
 # target to preprocess a source file
 NPEnergyLoss.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPEnergyLoss.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPEnergyLoss.cxx.i
 .PHONY : NPEnergyLoss.cxx.i
 
 NPEnergyLoss.s: NPEnergyLoss.cxx.s
@@ -192,7 +198,7 @@ NPEnergyLoss.s: NPEnergyLoss.cxx.s
 
 # target to generate assembly for a file
 NPEnergyLoss.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPEnergyLoss.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPEnergyLoss.cxx.s
 .PHONY : NPEnergyLoss.cxx.s
 
 NPFunction.o: NPFunction.cxx.o
@@ -200,7 +206,7 @@ NPFunction.o: NPFunction.cxx.o
 
 # target to build an object file
 NPFunction.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPFunction.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPFunction.cxx.o
 .PHONY : NPFunction.cxx.o
 
 NPFunction.i: NPFunction.cxx.i
@@ -208,7 +214,7 @@ NPFunction.i: NPFunction.cxx.i
 
 # target to preprocess a source file
 NPFunction.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPFunction.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPFunction.cxx.i
 .PHONY : NPFunction.cxx.i
 
 NPFunction.s: NPFunction.cxx.s
@@ -216,7 +222,7 @@ NPFunction.s: NPFunction.cxx.s
 
 # target to generate assembly for a file
 NPFunction.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPFunction.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPFunction.cxx.s
 .PHONY : NPFunction.cxx.s
 
 NPNucleus.o: NPNucleus.cxx.o
@@ -224,7 +230,7 @@ NPNucleus.o: NPNucleus.cxx.o
 
 # target to build an object file
 NPNucleus.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPNucleus.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPNucleus.cxx.o
 .PHONY : NPNucleus.cxx.o
 
 NPNucleus.i: NPNucleus.cxx.i
@@ -232,7 +238,7 @@ NPNucleus.i: NPNucleus.cxx.i
 
 # target to preprocess a source file
 NPNucleus.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPNucleus.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPNucleus.cxx.i
 .PHONY : NPNucleus.cxx.i
 
 NPNucleus.s: NPNucleus.cxx.s
@@ -240,7 +246,7 @@ NPNucleus.s: NPNucleus.cxx.s
 
 # target to generate assembly for a file
 NPNucleus.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPNucleus.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPNucleus.cxx.s
 .PHONY : NPNucleus.cxx.s
 
 NPReaction.o: NPReaction.cxx.o
@@ -248,7 +254,7 @@ NPReaction.o: NPReaction.cxx.o
 
 # target to build an object file
 NPReaction.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReaction.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReaction.cxx.o
 .PHONY : NPReaction.cxx.o
 
 NPReaction.i: NPReaction.cxx.i
@@ -256,7 +262,7 @@ NPReaction.i: NPReaction.cxx.i
 
 # target to preprocess a source file
 NPReaction.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReaction.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReaction.cxx.i
 .PHONY : NPReaction.cxx.i
 
 NPReaction.s: NPReaction.cxx.s
@@ -264,7 +270,7 @@ NPReaction.s: NPReaction.cxx.s
 
 # target to generate assembly for a file
 NPReaction.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReaction.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReaction.cxx.s
 .PHONY : NPReaction.cxx.s
 
 NPReactionDict.o: NPReactionDict.cxx.o
@@ -272,7 +278,7 @@ NPReactionDict.o: NPReactionDict.cxx.o
 
 # target to build an object file
 NPReactionDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReactionDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReactionDict.cxx.o
 .PHONY : NPReactionDict.cxx.o
 
 NPReactionDict.i: NPReactionDict.cxx.i
@@ -280,7 +286,7 @@ NPReactionDict.i: NPReactionDict.cxx.i
 
 # target to preprocess a source file
 NPReactionDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReactionDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReactionDict.cxx.i
 .PHONY : NPReactionDict.cxx.i
 
 NPReactionDict.s: NPReactionDict.cxx.s
@@ -288,7 +294,7 @@ NPReactionDict.s: NPReactionDict.cxx.s
 
 # target to generate assembly for a file
 NPReactionDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReactionDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Physics/CMakeFiles/NPPhysics.dir/build.make Physics/CMakeFiles/NPPhysics.dir/NPReactionDict.cxx.s
 .PHONY : NPReactionDict.cxx.s
 
 # Help Target
@@ -297,12 +303,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPPhysics"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPPhysics"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... NPBeam.o"
 	@echo "... NPBeam.i"
 	@echo "... NPBeam.s"
@@ -332,6 +339,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Plastic/Makefile b/NPLib/Plastic/Makefile
index c6f7b689f5e1f164b279cb0ac8474fa7842c05de..49db8f5a74c510f97b6fd0e930bf36de7632f529 100644
--- a/NPLib/Plastic/Makefile
+++ b/NPLib/Plastic/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Plastic/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Plastic/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Plastic/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Plastic/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Plastic/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Plastic/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Plastic/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Plastic/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Plastic/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Plastic/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Plastic/CMakeFiles/NPPlastic.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Plastic/CMakeFiles/NPPlastic.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Plastic/CMakeFiles/NPPlastic.dir/rule
 .PHONY : Plastic/CMakeFiles/NPPlastic.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPPlastic: Plastic/CMakeFiles/NPPlastic.dir/rule
 
 # fast build rule for target.
 NPPlastic/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/build
 .PHONY : NPPlastic/fast
 
 TPlasticData.o: TPlasticData.cxx.o
@@ -152,7 +158,7 @@ TPlasticData.o: TPlasticData.cxx.o
 
 # target to build an object file
 TPlasticData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticData.cxx.o
 .PHONY : TPlasticData.cxx.o
 
 TPlasticData.i: TPlasticData.cxx.i
@@ -160,7 +166,7 @@ TPlasticData.i: TPlasticData.cxx.i
 
 # target to preprocess a source file
 TPlasticData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticData.cxx.i
 .PHONY : TPlasticData.cxx.i
 
 TPlasticData.s: TPlasticData.cxx.s
@@ -168,7 +174,7 @@ TPlasticData.s: TPlasticData.cxx.s
 
 # target to generate assembly for a file
 TPlasticData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticData.cxx.s
 .PHONY : TPlasticData.cxx.s
 
 TPlasticDataDict.o: TPlasticDataDict.cxx.o
@@ -176,7 +182,7 @@ TPlasticDataDict.o: TPlasticDataDict.cxx.o
 
 # target to build an object file
 TPlasticDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticDataDict.cxx.o
 .PHONY : TPlasticDataDict.cxx.o
 
 TPlasticDataDict.i: TPlasticDataDict.cxx.i
@@ -184,7 +190,7 @@ TPlasticDataDict.i: TPlasticDataDict.cxx.i
 
 # target to preprocess a source file
 TPlasticDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticDataDict.cxx.i
 .PHONY : TPlasticDataDict.cxx.i
 
 TPlasticDataDict.s: TPlasticDataDict.cxx.s
@@ -192,7 +198,7 @@ TPlasticDataDict.s: TPlasticDataDict.cxx.s
 
 # target to generate assembly for a file
 TPlasticDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticDataDict.cxx.s
 .PHONY : TPlasticDataDict.cxx.s
 
 TPlasticPhysics.o: TPlasticPhysics.cxx.o
@@ -200,7 +206,7 @@ TPlasticPhysics.o: TPlasticPhysics.cxx.o
 
 # target to build an object file
 TPlasticPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysics.cxx.o
 .PHONY : TPlasticPhysics.cxx.o
 
 TPlasticPhysics.i: TPlasticPhysics.cxx.i
@@ -208,7 +214,7 @@ TPlasticPhysics.i: TPlasticPhysics.cxx.i
 
 # target to preprocess a source file
 TPlasticPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysics.cxx.i
 .PHONY : TPlasticPhysics.cxx.i
 
 TPlasticPhysics.s: TPlasticPhysics.cxx.s
@@ -216,7 +222,7 @@ TPlasticPhysics.s: TPlasticPhysics.cxx.s
 
 # target to generate assembly for a file
 TPlasticPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysics.cxx.s
 .PHONY : TPlasticPhysics.cxx.s
 
 TPlasticPhysicsDict.o: TPlasticPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TPlasticPhysicsDict.o: TPlasticPhysicsDict.cxx.o
 
 # target to build an object file
 TPlasticPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysicsDict.cxx.o
 .PHONY : TPlasticPhysicsDict.cxx.o
 
 TPlasticPhysicsDict.i: TPlasticPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TPlasticPhysicsDict.i: TPlasticPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TPlasticPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysicsDict.cxx.i
 .PHONY : TPlasticPhysicsDict.cxx.i
 
 TPlasticPhysicsDict.s: TPlasticPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TPlasticPhysicsDict.s: TPlasticPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TPlasticPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Plastic/CMakeFiles/NPPlastic.dir/build.make Plastic/CMakeFiles/NPPlastic.dir/TPlasticPhysicsDict.cxx.s
 .PHONY : TPlasticPhysicsDict.cxx.s
 
 # Help Target
@@ -249,12 +255,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPPlastic"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPPlastic"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TPlasticData.o"
 	@echo "... TPlasticData.i"
 	@echo "... TPlasticData.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Riken/Makefile b/NPLib/Riken/Makefile
index 5417c3ae6eda9f615e94116460ba6b040e1c6d3e..90695802444a4a51e3bd5150be1874f58223dc48 100644
--- a/NPLib/Riken/Makefile
+++ b/NPLib/Riken/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Riken/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Riken/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Riken/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Riken/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Riken/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Riken/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Riken/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Riken/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Riken/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Riken/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Riken/CMakeFiles/NPRIPS.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Riken/CMakeFiles/NPRIPS.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Riken/CMakeFiles/NPRIPS.dir/rule
 .PHONY : Riken/CMakeFiles/NPRIPS.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPRIPS: Riken/CMakeFiles/NPRIPS.dir/rule
 
 # fast build rule for target.
 NPRIPS/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/build
 .PHONY : NPRIPS/fast
 
 TRIPSData.o: TRIPSData.cxx.o
@@ -152,7 +158,7 @@ TRIPSData.o: TRIPSData.cxx.o
 
 # target to build an object file
 TRIPSData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSData.cxx.o
 .PHONY : TRIPSData.cxx.o
 
 TRIPSData.i: TRIPSData.cxx.i
@@ -160,7 +166,7 @@ TRIPSData.i: TRIPSData.cxx.i
 
 # target to preprocess a source file
 TRIPSData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSData.cxx.i
 .PHONY : TRIPSData.cxx.i
 
 TRIPSData.s: TRIPSData.cxx.s
@@ -168,7 +174,7 @@ TRIPSData.s: TRIPSData.cxx.s
 
 # target to generate assembly for a file
 TRIPSData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSData.cxx.s
 .PHONY : TRIPSData.cxx.s
 
 TRIPSDataDict.o: TRIPSDataDict.cxx.o
@@ -176,7 +182,7 @@ TRIPSDataDict.o: TRIPSDataDict.cxx.o
 
 # target to build an object file
 TRIPSDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSDataDict.cxx.o
 .PHONY : TRIPSDataDict.cxx.o
 
 TRIPSDataDict.i: TRIPSDataDict.cxx.i
@@ -184,7 +190,7 @@ TRIPSDataDict.i: TRIPSDataDict.cxx.i
 
 # target to preprocess a source file
 TRIPSDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSDataDict.cxx.i
 .PHONY : TRIPSDataDict.cxx.i
 
 TRIPSDataDict.s: TRIPSDataDict.cxx.s
@@ -192,7 +198,7 @@ TRIPSDataDict.s: TRIPSDataDict.cxx.s
 
 # target to generate assembly for a file
 TRIPSDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Riken/CMakeFiles/NPRIPS.dir/build.make Riken/CMakeFiles/NPRIPS.dir/TRIPSDataDict.cxx.s
 .PHONY : TRIPSDataDict.cxx.s
 
 # Help Target
@@ -203,10 +209,11 @@ help:
 	@echo "... depend"
 	@echo "... NPRIPS"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TRIPSData.o"
 	@echo "... TRIPSData.i"
 	@echo "... TRIPSData.s"
@@ -224,6 +231,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/SSSD/Makefile b/NPLib/SSSD/Makefile
index 7c4b15675daa5a6347f15771ebb077a9ed6577e9..5a7a46cd5966106e37d560f5b7fd12872adc87d7 100644
--- a/NPLib/SSSD/Makefile
+++ b/NPLib/SSSD/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/SSSD/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SSSD/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/SSSD/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SSSD/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SSSD/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SSSD/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SSSD/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SSSD/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SSSD/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SSSD/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 SSSD/CMakeFiles/NPSSSD.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SSSD/CMakeFiles/NPSSSD.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SSSD/CMakeFiles/NPSSSD.dir/rule
 .PHONY : SSSD/CMakeFiles/NPSSSD.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPSSSD: SSSD/CMakeFiles/NPSSSD.dir/rule
 
 # fast build rule for target.
 NPSSSD/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/build
 .PHONY : NPSSSD/fast
 
 TSSSDData.o: TSSSDData.cxx.o
@@ -152,7 +158,7 @@ TSSSDData.o: TSSSDData.cxx.o
 
 # target to build an object file
 TSSSDData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDData.cxx.o
 .PHONY : TSSSDData.cxx.o
 
 TSSSDData.i: TSSSDData.cxx.i
@@ -160,7 +166,7 @@ TSSSDData.i: TSSSDData.cxx.i
 
 # target to preprocess a source file
 TSSSDData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDData.cxx.i
 .PHONY : TSSSDData.cxx.i
 
 TSSSDData.s: TSSSDData.cxx.s
@@ -168,7 +174,7 @@ TSSSDData.s: TSSSDData.cxx.s
 
 # target to generate assembly for a file
 TSSSDData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDData.cxx.s
 .PHONY : TSSSDData.cxx.s
 
 TSSSDDataDict.o: TSSSDDataDict.cxx.o
@@ -176,7 +182,7 @@ TSSSDDataDict.o: TSSSDDataDict.cxx.o
 
 # target to build an object file
 TSSSDDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDDataDict.cxx.o
 .PHONY : TSSSDDataDict.cxx.o
 
 TSSSDDataDict.i: TSSSDDataDict.cxx.i
@@ -184,7 +190,7 @@ TSSSDDataDict.i: TSSSDDataDict.cxx.i
 
 # target to preprocess a source file
 TSSSDDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDDataDict.cxx.i
 .PHONY : TSSSDDataDict.cxx.i
 
 TSSSDDataDict.s: TSSSDDataDict.cxx.s
@@ -192,7 +198,7 @@ TSSSDDataDict.s: TSSSDDataDict.cxx.s
 
 # target to generate assembly for a file
 TSSSDDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDDataDict.cxx.s
 .PHONY : TSSSDDataDict.cxx.s
 
 TSSSDPhysics.o: TSSSDPhysics.cxx.o
@@ -200,7 +206,7 @@ TSSSDPhysics.o: TSSSDPhysics.cxx.o
 
 # target to build an object file
 TSSSDPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysics.cxx.o
 .PHONY : TSSSDPhysics.cxx.o
 
 TSSSDPhysics.i: TSSSDPhysics.cxx.i
@@ -208,7 +214,7 @@ TSSSDPhysics.i: TSSSDPhysics.cxx.i
 
 # target to preprocess a source file
 TSSSDPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysics.cxx.i
 .PHONY : TSSSDPhysics.cxx.i
 
 TSSSDPhysics.s: TSSSDPhysics.cxx.s
@@ -216,7 +222,7 @@ TSSSDPhysics.s: TSSSDPhysics.cxx.s
 
 # target to generate assembly for a file
 TSSSDPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysics.cxx.s
 .PHONY : TSSSDPhysics.cxx.s
 
 TSSSDPhysicsDict.o: TSSSDPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TSSSDPhysicsDict.o: TSSSDPhysicsDict.cxx.o
 
 # target to build an object file
 TSSSDPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysicsDict.cxx.o
 .PHONY : TSSSDPhysicsDict.cxx.o
 
 TSSSDPhysicsDict.i: TSSSDPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TSSSDPhysicsDict.i: TSSSDPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TSSSDPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysicsDict.cxx.i
 .PHONY : TSSSDPhysicsDict.cxx.i
 
 TSSSDPhysicsDict.s: TSSSDPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TSSSDPhysicsDict.s: TSSSDPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TSSSDPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SSSD/CMakeFiles/NPSSSD.dir/build.make SSSD/CMakeFiles/NPSSSD.dir/TSSSDPhysicsDict.cxx.s
 .PHONY : TSSSDPhysicsDict.cxx.s
 
 # Help Target
@@ -251,10 +257,11 @@ help:
 	@echo "... depend"
 	@echo "... NPSSSD"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TSSSDData.o"
 	@echo "... TSSSDData.i"
 	@echo "... TSSSDData.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Sharc/Makefile b/NPLib/Sharc/Makefile
index 4b659a772a123acf363ce265da18e45ae95aee80..4edc61a12efdb8d7f0fe5992fbaac4a1253bea50 100644
--- a/NPLib/Sharc/Makefile
+++ b/NPLib/Sharc/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Sharc/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Sharc/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Sharc/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Sharc/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Sharc/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Sharc/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Sharc/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Sharc/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Sharc/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Sharc/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Sharc/CMakeFiles/NPSharc.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Sharc/CMakeFiles/NPSharc.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Sharc/CMakeFiles/NPSharc.dir/rule
 .PHONY : Sharc/CMakeFiles/NPSharc.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPSharc: Sharc/CMakeFiles/NPSharc.dir/rule
 
 # fast build rule for target.
 NPSharc/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/build
 .PHONY : NPSharc/fast
 
 TSharcData.o: TSharcData.cxx.o
@@ -152,7 +158,7 @@ TSharcData.o: TSharcData.cxx.o
 
 # target to build an object file
 TSharcData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcData.cxx.o
 .PHONY : TSharcData.cxx.o
 
 TSharcData.i: TSharcData.cxx.i
@@ -160,7 +166,7 @@ TSharcData.i: TSharcData.cxx.i
 
 # target to preprocess a source file
 TSharcData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcData.cxx.i
 .PHONY : TSharcData.cxx.i
 
 TSharcData.s: TSharcData.cxx.s
@@ -168,7 +174,7 @@ TSharcData.s: TSharcData.cxx.s
 
 # target to generate assembly for a file
 TSharcData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcData.cxx.s
 .PHONY : TSharcData.cxx.s
 
 TSharcDataDict.o: TSharcDataDict.cxx.o
@@ -176,7 +182,7 @@ TSharcDataDict.o: TSharcDataDict.cxx.o
 
 # target to build an object file
 TSharcDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcDataDict.cxx.o
 .PHONY : TSharcDataDict.cxx.o
 
 TSharcDataDict.i: TSharcDataDict.cxx.i
@@ -184,7 +190,7 @@ TSharcDataDict.i: TSharcDataDict.cxx.i
 
 # target to preprocess a source file
 TSharcDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcDataDict.cxx.i
 .PHONY : TSharcDataDict.cxx.i
 
 TSharcDataDict.s: TSharcDataDict.cxx.s
@@ -192,7 +198,7 @@ TSharcDataDict.s: TSharcDataDict.cxx.s
 
 # target to generate assembly for a file
 TSharcDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcDataDict.cxx.s
 .PHONY : TSharcDataDict.cxx.s
 
 TSharcPhysics.o: TSharcPhysics.cxx.o
@@ -200,7 +206,7 @@ TSharcPhysics.o: TSharcPhysics.cxx.o
 
 # target to build an object file
 TSharcPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysics.cxx.o
 .PHONY : TSharcPhysics.cxx.o
 
 TSharcPhysics.i: TSharcPhysics.cxx.i
@@ -208,7 +214,7 @@ TSharcPhysics.i: TSharcPhysics.cxx.i
 
 # target to preprocess a source file
 TSharcPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysics.cxx.i
 .PHONY : TSharcPhysics.cxx.i
 
 TSharcPhysics.s: TSharcPhysics.cxx.s
@@ -216,7 +222,7 @@ TSharcPhysics.s: TSharcPhysics.cxx.s
 
 # target to generate assembly for a file
 TSharcPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysics.cxx.s
 .PHONY : TSharcPhysics.cxx.s
 
 TSharcPhysicsDict.o: TSharcPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TSharcPhysicsDict.o: TSharcPhysicsDict.cxx.o
 
 # target to build an object file
 TSharcPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysicsDict.cxx.o
 .PHONY : TSharcPhysicsDict.cxx.o
 
 TSharcPhysicsDict.i: TSharcPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TSharcPhysicsDict.i: TSharcPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TSharcPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysicsDict.cxx.i
 .PHONY : TSharcPhysicsDict.cxx.i
 
 TSharcPhysicsDict.s: TSharcPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TSharcPhysicsDict.s: TSharcPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TSharcPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Sharc/CMakeFiles/NPSharc.dir/build.make Sharc/CMakeFiles/NPSharc.dir/TSharcPhysicsDict.cxx.s
 .PHONY : TSharcPhysicsDict.cxx.s
 
 # Help Target
@@ -249,12 +255,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPSharc"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPSharc"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TSharcData.o"
 	@echo "... TSharcData.i"
 	@echo "... TSharcData.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/SiLi/Makefile b/NPLib/SiLi/Makefile
index 06cd0493217e93ca6a2617d44130532a5566df22..ee4e533b4e8c41e6912de9518d5625ff7d51173c 100644
--- a/NPLib/SiLi/Makefile
+++ b/NPLib/SiLi/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/SiLi/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiLi/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/SiLi/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiLi/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiLi/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiLi/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiLi/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiLi/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiLi/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiLi/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 SiLi/CMakeFiles/NPSiLi.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiLi/CMakeFiles/NPSiLi.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiLi/CMakeFiles/NPSiLi.dir/rule
 .PHONY : SiLi/CMakeFiles/NPSiLi.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPSiLi: SiLi/CMakeFiles/NPSiLi.dir/rule
 
 # fast build rule for target.
 NPSiLi/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/build
 .PHONY : NPSiLi/fast
 
 TSiLiData.o: TSiLiData.cxx.o
@@ -152,7 +158,7 @@ TSiLiData.o: TSiLiData.cxx.o
 
 # target to build an object file
 TSiLiData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiData.cxx.o
 .PHONY : TSiLiData.cxx.o
 
 TSiLiData.i: TSiLiData.cxx.i
@@ -160,7 +166,7 @@ TSiLiData.i: TSiLiData.cxx.i
 
 # target to preprocess a source file
 TSiLiData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiData.cxx.i
 .PHONY : TSiLiData.cxx.i
 
 TSiLiData.s: TSiLiData.cxx.s
@@ -168,7 +174,7 @@ TSiLiData.s: TSiLiData.cxx.s
 
 # target to generate assembly for a file
 TSiLiData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiData.cxx.s
 .PHONY : TSiLiData.cxx.s
 
 TSiLiDataDict.o: TSiLiDataDict.cxx.o
@@ -176,7 +182,7 @@ TSiLiDataDict.o: TSiLiDataDict.cxx.o
 
 # target to build an object file
 TSiLiDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiDataDict.cxx.o
 .PHONY : TSiLiDataDict.cxx.o
 
 TSiLiDataDict.i: TSiLiDataDict.cxx.i
@@ -184,7 +190,7 @@ TSiLiDataDict.i: TSiLiDataDict.cxx.i
 
 # target to preprocess a source file
 TSiLiDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiDataDict.cxx.i
 .PHONY : TSiLiDataDict.cxx.i
 
 TSiLiDataDict.s: TSiLiDataDict.cxx.s
@@ -192,7 +198,7 @@ TSiLiDataDict.s: TSiLiDataDict.cxx.s
 
 # target to generate assembly for a file
 TSiLiDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiDataDict.cxx.s
 .PHONY : TSiLiDataDict.cxx.s
 
 TSiLiPhysics.o: TSiLiPhysics.cxx.o
@@ -200,7 +206,7 @@ TSiLiPhysics.o: TSiLiPhysics.cxx.o
 
 # target to build an object file
 TSiLiPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysics.cxx.o
 .PHONY : TSiLiPhysics.cxx.o
 
 TSiLiPhysics.i: TSiLiPhysics.cxx.i
@@ -208,7 +214,7 @@ TSiLiPhysics.i: TSiLiPhysics.cxx.i
 
 # target to preprocess a source file
 TSiLiPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysics.cxx.i
 .PHONY : TSiLiPhysics.cxx.i
 
 TSiLiPhysics.s: TSiLiPhysics.cxx.s
@@ -216,7 +222,7 @@ TSiLiPhysics.s: TSiLiPhysics.cxx.s
 
 # target to generate assembly for a file
 TSiLiPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysics.cxx.s
 .PHONY : TSiLiPhysics.cxx.s
 
 TSiLiPhysicsDict.o: TSiLiPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TSiLiPhysicsDict.o: TSiLiPhysicsDict.cxx.o
 
 # target to build an object file
 TSiLiPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysicsDict.cxx.o
 .PHONY : TSiLiPhysicsDict.cxx.o
 
 TSiLiPhysicsDict.i: TSiLiPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TSiLiPhysicsDict.i: TSiLiPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TSiLiPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysicsDict.cxx.i
 .PHONY : TSiLiPhysicsDict.cxx.i
 
 TSiLiPhysicsDict.s: TSiLiPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TSiLiPhysicsDict.s: TSiLiPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TSiLiPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiPhysicsDict.cxx.s
 .PHONY : TSiLiPhysicsDict.cxx.s
 
 TSiLiSpectra.o: TSiLiSpectra.cxx.o
@@ -248,7 +254,7 @@ TSiLiSpectra.o: TSiLiSpectra.cxx.o
 
 # target to build an object file
 TSiLiSpectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiSpectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiSpectra.cxx.o
 .PHONY : TSiLiSpectra.cxx.o
 
 TSiLiSpectra.i: TSiLiSpectra.cxx.i
@@ -256,7 +262,7 @@ TSiLiSpectra.i: TSiLiSpectra.cxx.i
 
 # target to preprocess a source file
 TSiLiSpectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiSpectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiSpectra.cxx.i
 .PHONY : TSiLiSpectra.cxx.i
 
 TSiLiSpectra.s: TSiLiSpectra.cxx.s
@@ -264,7 +270,7 @@ TSiLiSpectra.s: TSiLiSpectra.cxx.s
 
 # target to generate assembly for a file
 TSiLiSpectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiSpectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiLi/CMakeFiles/NPSiLi.dir/build.make SiLi/CMakeFiles/NPSiLi.dir/TSiLiSpectra.cxx.s
 .PHONY : TSiLiSpectra.cxx.s
 
 # Help Target
@@ -273,12 +279,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPSiLi"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPSiLi"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TSiLiData.o"
 	@echo "... TSiLiData.i"
 	@echo "... TSiLiData.s"
@@ -305,6 +312,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/SiRes/Makefile b/NPLib/SiRes/Makefile
index f3fba4f51fd5b5ebe131244cd5594d221107ffca..1f0d5e292718e7770b0af23c7954ff3174de373d 100644
--- a/NPLib/SiRes/Makefile
+++ b/NPLib/SiRes/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/SiRes/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiRes/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/SiRes/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiRes/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiRes/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiRes/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiRes/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiRes/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiRes/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiRes/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 SiRes/CMakeFiles/NPSiRes.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiRes/CMakeFiles/NPSiRes.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 SiRes/CMakeFiles/NPSiRes.dir/rule
 .PHONY : SiRes/CMakeFiles/NPSiRes.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPSiRes: SiRes/CMakeFiles/NPSiRes.dir/rule
 
 # fast build rule for target.
 NPSiRes/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/build
 .PHONY : NPSiRes/fast
 
 TSiResData.o: TSiResData.cxx.o
@@ -152,7 +158,7 @@ TSiResData.o: TSiResData.cxx.o
 
 # target to build an object file
 TSiResData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResData.cxx.o
 .PHONY : TSiResData.cxx.o
 
 TSiResData.i: TSiResData.cxx.i
@@ -160,7 +166,7 @@ TSiResData.i: TSiResData.cxx.i
 
 # target to preprocess a source file
 TSiResData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResData.cxx.i
 .PHONY : TSiResData.cxx.i
 
 TSiResData.s: TSiResData.cxx.s
@@ -168,7 +174,7 @@ TSiResData.s: TSiResData.cxx.s
 
 # target to generate assembly for a file
 TSiResData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResData.cxx.s
 .PHONY : TSiResData.cxx.s
 
 TSiResDataDict.o: TSiResDataDict.cxx.o
@@ -176,7 +182,7 @@ TSiResDataDict.o: TSiResDataDict.cxx.o
 
 # target to build an object file
 TSiResDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResDataDict.cxx.o
 .PHONY : TSiResDataDict.cxx.o
 
 TSiResDataDict.i: TSiResDataDict.cxx.i
@@ -184,7 +190,7 @@ TSiResDataDict.i: TSiResDataDict.cxx.i
 
 # target to preprocess a source file
 TSiResDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResDataDict.cxx.i
 .PHONY : TSiResDataDict.cxx.i
 
 TSiResDataDict.s: TSiResDataDict.cxx.s
@@ -192,7 +198,7 @@ TSiResDataDict.s: TSiResDataDict.cxx.s
 
 # target to generate assembly for a file
 TSiResDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResDataDict.cxx.s
 .PHONY : TSiResDataDict.cxx.s
 
 TSiResPhysics.o: TSiResPhysics.cxx.o
@@ -200,7 +206,7 @@ TSiResPhysics.o: TSiResPhysics.cxx.o
 
 # target to build an object file
 TSiResPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysics.cxx.o
 .PHONY : TSiResPhysics.cxx.o
 
 TSiResPhysics.i: TSiResPhysics.cxx.i
@@ -208,7 +214,7 @@ TSiResPhysics.i: TSiResPhysics.cxx.i
 
 # target to preprocess a source file
 TSiResPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysics.cxx.i
 .PHONY : TSiResPhysics.cxx.i
 
 TSiResPhysics.s: TSiResPhysics.cxx.s
@@ -216,7 +222,7 @@ TSiResPhysics.s: TSiResPhysics.cxx.s
 
 # target to generate assembly for a file
 TSiResPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysics.cxx.s
 .PHONY : TSiResPhysics.cxx.s
 
 TSiResPhysicsDict.o: TSiResPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TSiResPhysicsDict.o: TSiResPhysicsDict.cxx.o
 
 # target to build an object file
 TSiResPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysicsDict.cxx.o
 .PHONY : TSiResPhysicsDict.cxx.o
 
 TSiResPhysicsDict.i: TSiResPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TSiResPhysicsDict.i: TSiResPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TSiResPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysicsDict.cxx.i
 .PHONY : TSiResPhysicsDict.cxx.i
 
 TSiResPhysicsDict.s: TSiResPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TSiResPhysicsDict.s: TSiResPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TSiResPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResPhysicsDict.cxx.s
 .PHONY : TSiResPhysicsDict.cxx.s
 
 TSiResSpectra.o: TSiResSpectra.cxx.o
@@ -248,7 +254,7 @@ TSiResSpectra.o: TSiResSpectra.cxx.o
 
 # target to build an object file
 TSiResSpectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResSpectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResSpectra.cxx.o
 .PHONY : TSiResSpectra.cxx.o
 
 TSiResSpectra.i: TSiResSpectra.cxx.i
@@ -256,7 +262,7 @@ TSiResSpectra.i: TSiResSpectra.cxx.i
 
 # target to preprocess a source file
 TSiResSpectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResSpectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResSpectra.cxx.i
 .PHONY : TSiResSpectra.cxx.i
 
 TSiResSpectra.s: TSiResSpectra.cxx.s
@@ -264,7 +270,7 @@ TSiResSpectra.s: TSiResSpectra.cxx.s
 
 # target to generate assembly for a file
 TSiResSpectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResSpectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f SiRes/CMakeFiles/NPSiRes.dir/build.make SiRes/CMakeFiles/NPSiRes.dir/TSiResSpectra.cxx.s
 .PHONY : TSiResSpectra.cxx.s
 
 # Help Target
@@ -273,12 +279,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPSiRes"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPSiRes"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TSiResData.o"
 	@echo "... TSiResData.i"
 	@echo "... TSiResData.s"
@@ -305,6 +312,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Speg/Makefile b/NPLib/Speg/Makefile
index 2fb33f34744d78e4d0ee59f4f77faefcaf1b433c..fdf497363ef352aa6cf3113dc4a288ba92fa7c72 100644
--- a/NPLib/Speg/Makefile
+++ b/NPLib/Speg/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Speg/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Speg/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Speg/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Speg/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Speg/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Speg/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Speg/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Speg/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Speg/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Speg/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Speg/CMakeFiles/NPSpeg.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Speg/CMakeFiles/NPSpeg.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Speg/CMakeFiles/NPSpeg.dir/rule
 .PHONY : Speg/CMakeFiles/NPSpeg.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPSpeg: Speg/CMakeFiles/NPSpeg.dir/rule
 
 # fast build rule for target.
 NPSpeg/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/build
 .PHONY : NPSpeg/fast
 
 TSpegCHIOData.o: TSpegCHIOData.cxx.o
@@ -152,7 +158,7 @@ TSpegCHIOData.o: TSpegCHIOData.cxx.o
 
 # target to build an object file
 TSpegCHIOData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIOData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIOData.cxx.o
 .PHONY : TSpegCHIOData.cxx.o
 
 TSpegCHIOData.i: TSpegCHIOData.cxx.i
@@ -160,7 +166,7 @@ TSpegCHIOData.i: TSpegCHIOData.cxx.i
 
 # target to preprocess a source file
 TSpegCHIOData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIOData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIOData.cxx.i
 .PHONY : TSpegCHIOData.cxx.i
 
 TSpegCHIOData.s: TSpegCHIOData.cxx.s
@@ -168,7 +174,7 @@ TSpegCHIOData.s: TSpegCHIOData.cxx.s
 
 # target to generate assembly for a file
 TSpegCHIOData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIOData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIOData.cxx.s
 .PHONY : TSpegCHIOData.cxx.s
 
 TSpegCHIODataDict.o: TSpegCHIODataDict.cxx.o
@@ -176,7 +182,7 @@ TSpegCHIODataDict.o: TSpegCHIODataDict.cxx.o
 
 # target to build an object file
 TSpegCHIODataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIODataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIODataDict.cxx.o
 .PHONY : TSpegCHIODataDict.cxx.o
 
 TSpegCHIODataDict.i: TSpegCHIODataDict.cxx.i
@@ -184,7 +190,7 @@ TSpegCHIODataDict.i: TSpegCHIODataDict.cxx.i
 
 # target to preprocess a source file
 TSpegCHIODataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIODataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIODataDict.cxx.i
 .PHONY : TSpegCHIODataDict.cxx.i
 
 TSpegCHIODataDict.s: TSpegCHIODataDict.cxx.s
@@ -192,7 +198,7 @@ TSpegCHIODataDict.s: TSpegCHIODataDict.cxx.s
 
 # target to generate assembly for a file
 TSpegCHIODataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIODataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegCHIODataDict.cxx.s
 .PHONY : TSpegCHIODataDict.cxx.s
 
 TSpegDCData.o: TSpegDCData.cxx.o
@@ -200,7 +206,7 @@ TSpegDCData.o: TSpegDCData.cxx.o
 
 # target to build an object file
 TSpegDCData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCData.cxx.o
 .PHONY : TSpegDCData.cxx.o
 
 TSpegDCData.i: TSpegDCData.cxx.i
@@ -208,7 +214,7 @@ TSpegDCData.i: TSpegDCData.cxx.i
 
 # target to preprocess a source file
 TSpegDCData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCData.cxx.i
 .PHONY : TSpegDCData.cxx.i
 
 TSpegDCData.s: TSpegDCData.cxx.s
@@ -216,7 +222,7 @@ TSpegDCData.s: TSpegDCData.cxx.s
 
 # target to generate assembly for a file
 TSpegDCData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCData.cxx.s
 .PHONY : TSpegDCData.cxx.s
 
 TSpegDCDataDict.o: TSpegDCDataDict.cxx.o
@@ -224,7 +230,7 @@ TSpegDCDataDict.o: TSpegDCDataDict.cxx.o
 
 # target to build an object file
 TSpegDCDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCDataDict.cxx.o
 .PHONY : TSpegDCDataDict.cxx.o
 
 TSpegDCDataDict.i: TSpegDCDataDict.cxx.i
@@ -232,7 +238,7 @@ TSpegDCDataDict.i: TSpegDCDataDict.cxx.i
 
 # target to preprocess a source file
 TSpegDCDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCDataDict.cxx.i
 .PHONY : TSpegDCDataDict.cxx.i
 
 TSpegDCDataDict.s: TSpegDCDataDict.cxx.s
@@ -240,7 +246,7 @@ TSpegDCDataDict.s: TSpegDCDataDict.cxx.s
 
 # target to generate assembly for a file
 TSpegDCDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegDCDataDict.cxx.s
 .PHONY : TSpegDCDataDict.cxx.s
 
 TSpegPhysics.o: TSpegPhysics.cxx.o
@@ -248,7 +254,7 @@ TSpegPhysics.o: TSpegPhysics.cxx.o
 
 # target to build an object file
 TSpegPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysics.cxx.o
 .PHONY : TSpegPhysics.cxx.o
 
 TSpegPhysics.i: TSpegPhysics.cxx.i
@@ -256,7 +262,7 @@ TSpegPhysics.i: TSpegPhysics.cxx.i
 
 # target to preprocess a source file
 TSpegPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysics.cxx.i
 .PHONY : TSpegPhysics.cxx.i
 
 TSpegPhysics.s: TSpegPhysics.cxx.s
@@ -264,7 +270,7 @@ TSpegPhysics.s: TSpegPhysics.cxx.s
 
 # target to generate assembly for a file
 TSpegPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysics.cxx.s
 .PHONY : TSpegPhysics.cxx.s
 
 TSpegPhysicsDict.o: TSpegPhysicsDict.cxx.o
@@ -272,7 +278,7 @@ TSpegPhysicsDict.o: TSpegPhysicsDict.cxx.o
 
 # target to build an object file
 TSpegPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysicsDict.cxx.o
 .PHONY : TSpegPhysicsDict.cxx.o
 
 TSpegPhysicsDict.i: TSpegPhysicsDict.cxx.i
@@ -280,7 +286,7 @@ TSpegPhysicsDict.i: TSpegPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TSpegPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysicsDict.cxx.i
 .PHONY : TSpegPhysicsDict.cxx.i
 
 TSpegPhysicsDict.s: TSpegPhysicsDict.cxx.s
@@ -288,7 +294,7 @@ TSpegPhysicsDict.s: TSpegPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TSpegPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPhysicsDict.cxx.s
 .PHONY : TSpegPhysicsDict.cxx.s
 
 TSpegPlasticData.o: TSpegPlasticData.cxx.o
@@ -296,7 +302,7 @@ TSpegPlasticData.o: TSpegPlasticData.cxx.o
 
 # target to build an object file
 TSpegPlasticData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticData.cxx.o
 .PHONY : TSpegPlasticData.cxx.o
 
 TSpegPlasticData.i: TSpegPlasticData.cxx.i
@@ -304,7 +310,7 @@ TSpegPlasticData.i: TSpegPlasticData.cxx.i
 
 # target to preprocess a source file
 TSpegPlasticData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticData.cxx.i
 .PHONY : TSpegPlasticData.cxx.i
 
 TSpegPlasticData.s: TSpegPlasticData.cxx.s
@@ -312,7 +318,7 @@ TSpegPlasticData.s: TSpegPlasticData.cxx.s
 
 # target to generate assembly for a file
 TSpegPlasticData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticData.cxx.s
 .PHONY : TSpegPlasticData.cxx.s
 
 TSpegPlasticDataDict.o: TSpegPlasticDataDict.cxx.o
@@ -320,7 +326,7 @@ TSpegPlasticDataDict.o: TSpegPlasticDataDict.cxx.o
 
 # target to build an object file
 TSpegPlasticDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticDataDict.cxx.o
 .PHONY : TSpegPlasticDataDict.cxx.o
 
 TSpegPlasticDataDict.i: TSpegPlasticDataDict.cxx.i
@@ -328,7 +334,7 @@ TSpegPlasticDataDict.i: TSpegPlasticDataDict.cxx.i
 
 # target to preprocess a source file
 TSpegPlasticDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticDataDict.cxx.i
 .PHONY : TSpegPlasticDataDict.cxx.i
 
 TSpegPlasticDataDict.s: TSpegPlasticDataDict.cxx.s
@@ -336,7 +342,7 @@ TSpegPlasticDataDict.s: TSpegPlasticDataDict.cxx.s
 
 # target to generate assembly for a file
 TSpegPlasticDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Speg/CMakeFiles/NPSpeg.dir/build.make Speg/CMakeFiles/NPSpeg.dir/TSpegPlasticDataDict.cxx.s
 .PHONY : TSpegPlasticDataDict.cxx.s
 
 # Help Target
@@ -345,12 +351,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPSpeg"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPSpeg"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TSpegCHIOData.o"
 	@echo "... TSpegCHIOData.i"
 	@echo "... TSpegCHIOData.s"
@@ -386,6 +393,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Tiara/Makefile b/NPLib/Tiara/Makefile
index 39267765bfd3ce563bb8d46d8d29de0b3ec4e3e5..0d2f8a89cd901bf4a12fdef56faae9ee636becd7 100644
--- a/NPLib/Tiara/Makefile
+++ b/NPLib/Tiara/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Tiara/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tiara/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Tiara/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tiara/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tiara/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tiara/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tiara/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tiara/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tiara/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tiara/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Tiara/CMakeFiles/NPTiara.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tiara/CMakeFiles/NPTiara.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tiara/CMakeFiles/NPTiara.dir/rule
 .PHONY : Tiara/CMakeFiles/NPTiara.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPTiara: Tiara/CMakeFiles/NPTiara.dir/rule
 
 # fast build rule for target.
 NPTiara/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/build
 .PHONY : NPTiara/fast
 
 TTiaraBarrelData.o: TTiaraBarrelData.cxx.o
@@ -152,7 +158,7 @@ TTiaraBarrelData.o: TTiaraBarrelData.cxx.o
 
 # target to build an object file
 TTiaraBarrelData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelData.cxx.o
 .PHONY : TTiaraBarrelData.cxx.o
 
 TTiaraBarrelData.i: TTiaraBarrelData.cxx.i
@@ -160,7 +166,7 @@ TTiaraBarrelData.i: TTiaraBarrelData.cxx.i
 
 # target to preprocess a source file
 TTiaraBarrelData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelData.cxx.i
 .PHONY : TTiaraBarrelData.cxx.i
 
 TTiaraBarrelData.s: TTiaraBarrelData.cxx.s
@@ -168,7 +174,7 @@ TTiaraBarrelData.s: TTiaraBarrelData.cxx.s
 
 # target to generate assembly for a file
 TTiaraBarrelData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelData.cxx.s
 .PHONY : TTiaraBarrelData.cxx.s
 
 TTiaraBarrelDataDict.o: TTiaraBarrelDataDict.cxx.o
@@ -176,7 +182,7 @@ TTiaraBarrelDataDict.o: TTiaraBarrelDataDict.cxx.o
 
 # target to build an object file
 TTiaraBarrelDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelDataDict.cxx.o
 .PHONY : TTiaraBarrelDataDict.cxx.o
 
 TTiaraBarrelDataDict.i: TTiaraBarrelDataDict.cxx.i
@@ -184,7 +190,7 @@ TTiaraBarrelDataDict.i: TTiaraBarrelDataDict.cxx.i
 
 # target to preprocess a source file
 TTiaraBarrelDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelDataDict.cxx.i
 .PHONY : TTiaraBarrelDataDict.cxx.i
 
 TTiaraBarrelDataDict.s: TTiaraBarrelDataDict.cxx.s
@@ -192,7 +198,7 @@ TTiaraBarrelDataDict.s: TTiaraBarrelDataDict.cxx.s
 
 # target to generate assembly for a file
 TTiaraBarrelDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelDataDict.cxx.s
 .PHONY : TTiaraBarrelDataDict.cxx.s
 
 TTiaraBarrelPhysics.o: TTiaraBarrelPhysics.cxx.o
@@ -200,7 +206,7 @@ TTiaraBarrelPhysics.o: TTiaraBarrelPhysics.cxx.o
 
 # target to build an object file
 TTiaraBarrelPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysics.cxx.o
 .PHONY : TTiaraBarrelPhysics.cxx.o
 
 TTiaraBarrelPhysics.i: TTiaraBarrelPhysics.cxx.i
@@ -208,7 +214,7 @@ TTiaraBarrelPhysics.i: TTiaraBarrelPhysics.cxx.i
 
 # target to preprocess a source file
 TTiaraBarrelPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysics.cxx.i
 .PHONY : TTiaraBarrelPhysics.cxx.i
 
 TTiaraBarrelPhysics.s: TTiaraBarrelPhysics.cxx.s
@@ -216,7 +222,7 @@ TTiaraBarrelPhysics.s: TTiaraBarrelPhysics.cxx.s
 
 # target to generate assembly for a file
 TTiaraBarrelPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysics.cxx.s
 .PHONY : TTiaraBarrelPhysics.cxx.s
 
 TTiaraBarrelPhysicsDict.o: TTiaraBarrelPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TTiaraBarrelPhysicsDict.o: TTiaraBarrelPhysicsDict.cxx.o
 
 # target to build an object file
 TTiaraBarrelPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysicsDict.cxx.o
 .PHONY : TTiaraBarrelPhysicsDict.cxx.o
 
 TTiaraBarrelPhysicsDict.i: TTiaraBarrelPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TTiaraBarrelPhysicsDict.i: TTiaraBarrelPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TTiaraBarrelPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysicsDict.cxx.i
 .PHONY : TTiaraBarrelPhysicsDict.cxx.i
 
 TTiaraBarrelPhysicsDict.s: TTiaraBarrelPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TTiaraBarrelPhysicsDict.s: TTiaraBarrelPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TTiaraBarrelPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelPhysicsDict.cxx.s
 .PHONY : TTiaraBarrelPhysicsDict.cxx.s
 
 TTiaraBarrelSpectra.o: TTiaraBarrelSpectra.cxx.o
@@ -248,7 +254,7 @@ TTiaraBarrelSpectra.o: TTiaraBarrelSpectra.cxx.o
 
 # target to build an object file
 TTiaraBarrelSpectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelSpectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelSpectra.cxx.o
 .PHONY : TTiaraBarrelSpectra.cxx.o
 
 TTiaraBarrelSpectra.i: TTiaraBarrelSpectra.cxx.i
@@ -256,7 +262,7 @@ TTiaraBarrelSpectra.i: TTiaraBarrelSpectra.cxx.i
 
 # target to preprocess a source file
 TTiaraBarrelSpectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelSpectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelSpectra.cxx.i
 .PHONY : TTiaraBarrelSpectra.cxx.i
 
 TTiaraBarrelSpectra.s: TTiaraBarrelSpectra.cxx.s
@@ -264,7 +270,7 @@ TTiaraBarrelSpectra.s: TTiaraBarrelSpectra.cxx.s
 
 # target to generate assembly for a file
 TTiaraBarrelSpectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelSpectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraBarrelSpectra.cxx.s
 .PHONY : TTiaraBarrelSpectra.cxx.s
 
 TTiaraHyballData.o: TTiaraHyballData.cxx.o
@@ -272,7 +278,7 @@ TTiaraHyballData.o: TTiaraHyballData.cxx.o
 
 # target to build an object file
 TTiaraHyballData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballData.cxx.o
 .PHONY : TTiaraHyballData.cxx.o
 
 TTiaraHyballData.i: TTiaraHyballData.cxx.i
@@ -280,7 +286,7 @@ TTiaraHyballData.i: TTiaraHyballData.cxx.i
 
 # target to preprocess a source file
 TTiaraHyballData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballData.cxx.i
 .PHONY : TTiaraHyballData.cxx.i
 
 TTiaraHyballData.s: TTiaraHyballData.cxx.s
@@ -288,7 +294,7 @@ TTiaraHyballData.s: TTiaraHyballData.cxx.s
 
 # target to generate assembly for a file
 TTiaraHyballData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballData.cxx.s
 .PHONY : TTiaraHyballData.cxx.s
 
 TTiaraHyballDataDict.o: TTiaraHyballDataDict.cxx.o
@@ -296,7 +302,7 @@ TTiaraHyballDataDict.o: TTiaraHyballDataDict.cxx.o
 
 # target to build an object file
 TTiaraHyballDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballDataDict.cxx.o
 .PHONY : TTiaraHyballDataDict.cxx.o
 
 TTiaraHyballDataDict.i: TTiaraHyballDataDict.cxx.i
@@ -304,7 +310,7 @@ TTiaraHyballDataDict.i: TTiaraHyballDataDict.cxx.i
 
 # target to preprocess a source file
 TTiaraHyballDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballDataDict.cxx.i
 .PHONY : TTiaraHyballDataDict.cxx.i
 
 TTiaraHyballDataDict.s: TTiaraHyballDataDict.cxx.s
@@ -312,7 +318,7 @@ TTiaraHyballDataDict.s: TTiaraHyballDataDict.cxx.s
 
 # target to generate assembly for a file
 TTiaraHyballDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballDataDict.cxx.s
 .PHONY : TTiaraHyballDataDict.cxx.s
 
 TTiaraHyballPhysics.o: TTiaraHyballPhysics.cxx.o
@@ -320,7 +326,7 @@ TTiaraHyballPhysics.o: TTiaraHyballPhysics.cxx.o
 
 # target to build an object file
 TTiaraHyballPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysics.cxx.o
 .PHONY : TTiaraHyballPhysics.cxx.o
 
 TTiaraHyballPhysics.i: TTiaraHyballPhysics.cxx.i
@@ -328,7 +334,7 @@ TTiaraHyballPhysics.i: TTiaraHyballPhysics.cxx.i
 
 # target to preprocess a source file
 TTiaraHyballPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysics.cxx.i
 .PHONY : TTiaraHyballPhysics.cxx.i
 
 TTiaraHyballPhysics.s: TTiaraHyballPhysics.cxx.s
@@ -336,7 +342,7 @@ TTiaraHyballPhysics.s: TTiaraHyballPhysics.cxx.s
 
 # target to generate assembly for a file
 TTiaraHyballPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysics.cxx.s
 .PHONY : TTiaraHyballPhysics.cxx.s
 
 TTiaraHyballPhysicsDict.o: TTiaraHyballPhysicsDict.cxx.o
@@ -344,7 +350,7 @@ TTiaraHyballPhysicsDict.o: TTiaraHyballPhysicsDict.cxx.o
 
 # target to build an object file
 TTiaraHyballPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysicsDict.cxx.o
 .PHONY : TTiaraHyballPhysicsDict.cxx.o
 
 TTiaraHyballPhysicsDict.i: TTiaraHyballPhysicsDict.cxx.i
@@ -352,7 +358,7 @@ TTiaraHyballPhysicsDict.i: TTiaraHyballPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TTiaraHyballPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysicsDict.cxx.i
 .PHONY : TTiaraHyballPhysicsDict.cxx.i
 
 TTiaraHyballPhysicsDict.s: TTiaraHyballPhysicsDict.cxx.s
@@ -360,7 +366,7 @@ TTiaraHyballPhysicsDict.s: TTiaraHyballPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TTiaraHyballPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballPhysicsDict.cxx.s
 .PHONY : TTiaraHyballPhysicsDict.cxx.s
 
 TTiaraHyballSpectra.o: TTiaraHyballSpectra.cxx.o
@@ -368,7 +374,7 @@ TTiaraHyballSpectra.o: TTiaraHyballSpectra.cxx.o
 
 # target to build an object file
 TTiaraHyballSpectra.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballSpectra.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballSpectra.cxx.o
 .PHONY : TTiaraHyballSpectra.cxx.o
 
 TTiaraHyballSpectra.i: TTiaraHyballSpectra.cxx.i
@@ -376,7 +382,7 @@ TTiaraHyballSpectra.i: TTiaraHyballSpectra.cxx.i
 
 # target to preprocess a source file
 TTiaraHyballSpectra.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballSpectra.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballSpectra.cxx.i
 .PHONY : TTiaraHyballSpectra.cxx.i
 
 TTiaraHyballSpectra.s: TTiaraHyballSpectra.cxx.s
@@ -384,7 +390,7 @@ TTiaraHyballSpectra.s: TTiaraHyballSpectra.cxx.s
 
 # target to generate assembly for a file
 TTiaraHyballSpectra.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballSpectra.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tiara/CMakeFiles/NPTiara.dir/build.make Tiara/CMakeFiles/NPTiara.dir/TTiaraHyballSpectra.cxx.s
 .PHONY : TTiaraHyballSpectra.cxx.s
 
 # Help Target
@@ -395,10 +401,11 @@ help:
 	@echo "... depend"
 	@echo "... NPTiara"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TTiaraBarrelData.o"
 	@echo "... TTiaraBarrelData.i"
 	@echo "... TTiaraBarrelData.s"
@@ -440,6 +447,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
index 48352e2b1345532415f03bf898855e9846d7c854..1f544792110d2e4cbb1b5cc26856514977d1c5da 100644
--- a/NPLib/Tiara/TTiaraBarrelPhysics.cxx
+++ b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
@@ -704,8 +704,8 @@ void TTiaraBarrelPhysics::BuildPhysicalEvent(){
       class brlproxy{
         public:
           brlproxy(){
-            NPA::DetectorFactory::getInstance()->AddToken("TiaraBarrel","Tiara");
-            NPA::DetectorFactory::getInstance()->AddDetector("TiaraBarrel",TTiaraBarrelPhysics::Construct);
+            NPA::DetectorFactory::getInstance()->AddToken("TiaraInnerBarrel","Tiara");
+            NPA::DetectorFactory::getInstance()->AddDetector("TiaraInnerBarrel",TTiaraBarrelPhysics::Construct);
           }
       };
 
diff --git a/NPLib/Tigress/Makefile b/NPLib/Tigress/Makefile
index 33a330b8150041965bd7c243419db6634cbfe524..470e26c79de2a26bfdfff176bc1b3b96caf47f56 100644
--- a/NPLib/Tigress/Makefile
+++ b/NPLib/Tigress/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Tigress/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tigress/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Tigress/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tigress/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tigress/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tigress/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tigress/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tigress/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tigress/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tigress/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Tigress/CMakeFiles/NPTigress.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tigress/CMakeFiles/NPTigress.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Tigress/CMakeFiles/NPTigress.dir/rule
 .PHONY : Tigress/CMakeFiles/NPTigress.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPTigress: Tigress/CMakeFiles/NPTigress.dir/rule
 
 # fast build rule for target.
 NPTigress/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/build
 .PHONY : NPTigress/fast
 
 TTigressData.o: TTigressData.cxx.o
@@ -152,7 +158,7 @@ TTigressData.o: TTigressData.cxx.o
 
 # target to build an object file
 TTigressData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressData.cxx.o
 .PHONY : TTigressData.cxx.o
 
 TTigressData.i: TTigressData.cxx.i
@@ -160,7 +166,7 @@ TTigressData.i: TTigressData.cxx.i
 
 # target to preprocess a source file
 TTigressData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressData.cxx.i
 .PHONY : TTigressData.cxx.i
 
 TTigressData.s: TTigressData.cxx.s
@@ -168,7 +174,7 @@ TTigressData.s: TTigressData.cxx.s
 
 # target to generate assembly for a file
 TTigressData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressData.cxx.s
 .PHONY : TTigressData.cxx.s
 
 TTigressDataDict.o: TTigressDataDict.cxx.o
@@ -176,7 +182,7 @@ TTigressDataDict.o: TTigressDataDict.cxx.o
 
 # target to build an object file
 TTigressDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressDataDict.cxx.o
 .PHONY : TTigressDataDict.cxx.o
 
 TTigressDataDict.i: TTigressDataDict.cxx.i
@@ -184,7 +190,7 @@ TTigressDataDict.i: TTigressDataDict.cxx.i
 
 # target to preprocess a source file
 TTigressDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressDataDict.cxx.i
 .PHONY : TTigressDataDict.cxx.i
 
 TTigressDataDict.s: TTigressDataDict.cxx.s
@@ -192,7 +198,7 @@ TTigressDataDict.s: TTigressDataDict.cxx.s
 
 # target to generate assembly for a file
 TTigressDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressDataDict.cxx.s
 .PHONY : TTigressDataDict.cxx.s
 
 TTigressPhysics.o: TTigressPhysics.cxx.o
@@ -200,7 +206,7 @@ TTigressPhysics.o: TTigressPhysics.cxx.o
 
 # target to build an object file
 TTigressPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysics.cxx.o
 .PHONY : TTigressPhysics.cxx.o
 
 TTigressPhysics.i: TTigressPhysics.cxx.i
@@ -208,7 +214,7 @@ TTigressPhysics.i: TTigressPhysics.cxx.i
 
 # target to preprocess a source file
 TTigressPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysics.cxx.i
 .PHONY : TTigressPhysics.cxx.i
 
 TTigressPhysics.s: TTigressPhysics.cxx.s
@@ -216,7 +222,7 @@ TTigressPhysics.s: TTigressPhysics.cxx.s
 
 # target to generate assembly for a file
 TTigressPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysics.cxx.s
 .PHONY : TTigressPhysics.cxx.s
 
 TTigressPhysicsDict.o: TTigressPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TTigressPhysicsDict.o: TTigressPhysicsDict.cxx.o
 
 # target to build an object file
 TTigressPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysicsDict.cxx.o
 .PHONY : TTigressPhysicsDict.cxx.o
 
 TTigressPhysicsDict.i: TTigressPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TTigressPhysicsDict.i: TTigressPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TTigressPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysicsDict.cxx.i
 .PHONY : TTigressPhysicsDict.cxx.i
 
 TTigressPhysicsDict.s: TTigressPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TTigressPhysicsDict.s: TTigressPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TTigressPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Tigress/CMakeFiles/NPTigress.dir/build.make Tigress/CMakeFiles/NPTigress.dir/TTigressPhysicsDict.cxx.s
 .PHONY : TTigressPhysicsDict.cxx.s
 
 # Help Target
@@ -249,12 +255,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPTigress"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPTigress"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TTigressData.o"
 	@echo "... TTigressData.i"
 	@echo "... TTigressData.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Trifoil/Makefile b/NPLib/Trifoil/Makefile
index 56bbc467469609e1b13b4a497c9baf965581d3ca..b1a2ccc0d3faea5600a9d3d0d3d97295f2e9edee 100644
--- a/NPLib/Trifoil/Makefile
+++ b/NPLib/Trifoil/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Trifoil/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Trifoil/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Trifoil/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Trifoil/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Trifoil/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Trifoil/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Trifoil/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Trifoil/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Trifoil/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Trifoil/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Trifoil/CMakeFiles/NPTrifoil.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Trifoil/CMakeFiles/NPTrifoil.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Trifoil/CMakeFiles/NPTrifoil.dir/rule
 .PHONY : Trifoil/CMakeFiles/NPTrifoil.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPTrifoil: Trifoil/CMakeFiles/NPTrifoil.dir/rule
 
 # fast build rule for target.
 NPTrifoil/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/build
 .PHONY : NPTrifoil/fast
 
 TTrifoilData.o: TTrifoilData.cxx.o
@@ -152,7 +158,7 @@ TTrifoilData.o: TTrifoilData.cxx.o
 
 # target to build an object file
 TTrifoilData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilData.cxx.o
 .PHONY : TTrifoilData.cxx.o
 
 TTrifoilData.i: TTrifoilData.cxx.i
@@ -160,7 +166,7 @@ TTrifoilData.i: TTrifoilData.cxx.i
 
 # target to preprocess a source file
 TTrifoilData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilData.cxx.i
 .PHONY : TTrifoilData.cxx.i
 
 TTrifoilData.s: TTrifoilData.cxx.s
@@ -168,7 +174,7 @@ TTrifoilData.s: TTrifoilData.cxx.s
 
 # target to generate assembly for a file
 TTrifoilData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilData.cxx.s
 .PHONY : TTrifoilData.cxx.s
 
 TTrifoilDataDict.o: TTrifoilDataDict.cxx.o
@@ -176,7 +182,7 @@ TTrifoilDataDict.o: TTrifoilDataDict.cxx.o
 
 # target to build an object file
 TTrifoilDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilDataDict.cxx.o
 .PHONY : TTrifoilDataDict.cxx.o
 
 TTrifoilDataDict.i: TTrifoilDataDict.cxx.i
@@ -184,7 +190,7 @@ TTrifoilDataDict.i: TTrifoilDataDict.cxx.i
 
 # target to preprocess a source file
 TTrifoilDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilDataDict.cxx.i
 .PHONY : TTrifoilDataDict.cxx.i
 
 TTrifoilDataDict.s: TTrifoilDataDict.cxx.s
@@ -192,7 +198,7 @@ TTrifoilDataDict.s: TTrifoilDataDict.cxx.s
 
 # target to generate assembly for a file
 TTrifoilDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilDataDict.cxx.s
 .PHONY : TTrifoilDataDict.cxx.s
 
 TTrifoilPhysics.o: TTrifoilPhysics.cxx.o
@@ -200,7 +206,7 @@ TTrifoilPhysics.o: TTrifoilPhysics.cxx.o
 
 # target to build an object file
 TTrifoilPhysics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysics.cxx.o
 .PHONY : TTrifoilPhysics.cxx.o
 
 TTrifoilPhysics.i: TTrifoilPhysics.cxx.i
@@ -208,7 +214,7 @@ TTrifoilPhysics.i: TTrifoilPhysics.cxx.i
 
 # target to preprocess a source file
 TTrifoilPhysics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysics.cxx.i
 .PHONY : TTrifoilPhysics.cxx.i
 
 TTrifoilPhysics.s: TTrifoilPhysics.cxx.s
@@ -216,7 +222,7 @@ TTrifoilPhysics.s: TTrifoilPhysics.cxx.s
 
 # target to generate assembly for a file
 TTrifoilPhysics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysics.cxx.s
 .PHONY : TTrifoilPhysics.cxx.s
 
 TTrifoilPhysicsDict.o: TTrifoilPhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TTrifoilPhysicsDict.o: TTrifoilPhysicsDict.cxx.o
 
 # target to build an object file
 TTrifoilPhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysicsDict.cxx.o
 .PHONY : TTrifoilPhysicsDict.cxx.o
 
 TTrifoilPhysicsDict.i: TTrifoilPhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TTrifoilPhysicsDict.i: TTrifoilPhysicsDict.cxx.i
 
 # target to preprocess a source file
 TTrifoilPhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysicsDict.cxx.i
 .PHONY : TTrifoilPhysicsDict.cxx.i
 
 TTrifoilPhysicsDict.s: TTrifoilPhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TTrifoilPhysicsDict.s: TTrifoilPhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TTrifoilPhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Trifoil/CMakeFiles/NPTrifoil.dir/build.make Trifoil/CMakeFiles/NPTrifoil.dir/TTrifoilPhysicsDict.cxx.s
 .PHONY : TTrifoilPhysicsDict.cxx.s
 
 # Help Target
@@ -249,12 +255,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPTrifoil"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
-	@echo "... NPTrifoil"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TTrifoilData.o"
 	@echo "... TTrifoilData.i"
 	@echo "... TTrifoilData.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/Vamos/Makefile b/NPLib/Vamos/Makefile
index 650bbab4c58068daab818f3436edfa6b22754760..881740810da95d4546c142bde777732af1df0c04 100644
--- a/NPLib/Vamos/Makefile
+++ b/NPLib/Vamos/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/Vamos/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Vamos/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/Vamos/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Vamos/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Vamos/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Vamos/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Vamos/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Vamos/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Vamos/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Vamos/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 Vamos/CMakeFiles/NPVamos.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Vamos/CMakeFiles/NPVamos.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 Vamos/CMakeFiles/NPVamos.dir/rule
 .PHONY : Vamos/CMakeFiles/NPVamos.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPVamos: Vamos/CMakeFiles/NPVamos.dir/rule
 
 # fast build rule for target.
 NPVamos/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/build
 .PHONY : NPVamos/fast
 
 TVamosCHIOData.o: TVamosCHIOData.cxx.o
@@ -152,7 +158,7 @@ TVamosCHIOData.o: TVamosCHIOData.cxx.o
 
 # target to build an object file
 TVamosCHIOData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIOData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIOData.cxx.o
 .PHONY : TVamosCHIOData.cxx.o
 
 TVamosCHIOData.i: TVamosCHIOData.cxx.i
@@ -160,7 +166,7 @@ TVamosCHIOData.i: TVamosCHIOData.cxx.i
 
 # target to preprocess a source file
 TVamosCHIOData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIOData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIOData.cxx.i
 .PHONY : TVamosCHIOData.cxx.i
 
 TVamosCHIOData.s: TVamosCHIOData.cxx.s
@@ -168,7 +174,7 @@ TVamosCHIOData.s: TVamosCHIOData.cxx.s
 
 # target to generate assembly for a file
 TVamosCHIOData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIOData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIOData.cxx.s
 .PHONY : TVamosCHIOData.cxx.s
 
 TVamosCHIODataDict.o: TVamosCHIODataDict.cxx.o
@@ -176,7 +182,7 @@ TVamosCHIODataDict.o: TVamosCHIODataDict.cxx.o
 
 # target to build an object file
 TVamosCHIODataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIODataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIODataDict.cxx.o
 .PHONY : TVamosCHIODataDict.cxx.o
 
 TVamosCHIODataDict.i: TVamosCHIODataDict.cxx.i
@@ -184,7 +190,7 @@ TVamosCHIODataDict.i: TVamosCHIODataDict.cxx.i
 
 # target to preprocess a source file
 TVamosCHIODataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIODataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIODataDict.cxx.i
 .PHONY : TVamosCHIODataDict.cxx.i
 
 TVamosCHIODataDict.s: TVamosCHIODataDict.cxx.s
@@ -192,7 +198,7 @@ TVamosCHIODataDict.s: TVamosCHIODataDict.cxx.s
 
 # target to generate assembly for a file
 TVamosCHIODataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIODataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosCHIODataDict.cxx.s
 .PHONY : TVamosCHIODataDict.cxx.s
 
 TVamosDCData.o: TVamosDCData.cxx.o
@@ -200,7 +206,7 @@ TVamosDCData.o: TVamosDCData.cxx.o
 
 # target to build an object file
 TVamosDCData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCData.cxx.o
 .PHONY : TVamosDCData.cxx.o
 
 TVamosDCData.i: TVamosDCData.cxx.i
@@ -208,7 +214,7 @@ TVamosDCData.i: TVamosDCData.cxx.i
 
 # target to preprocess a source file
 TVamosDCData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCData.cxx.i
 .PHONY : TVamosDCData.cxx.i
 
 TVamosDCData.s: TVamosDCData.cxx.s
@@ -216,7 +222,7 @@ TVamosDCData.s: TVamosDCData.cxx.s
 
 # target to generate assembly for a file
 TVamosDCData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCData.cxx.s
 .PHONY : TVamosDCData.cxx.s
 
 TVamosDCDataDict.o: TVamosDCDataDict.cxx.o
@@ -224,7 +230,7 @@ TVamosDCDataDict.o: TVamosDCDataDict.cxx.o
 
 # target to build an object file
 TVamosDCDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCDataDict.cxx.o
 .PHONY : TVamosDCDataDict.cxx.o
 
 TVamosDCDataDict.i: TVamosDCDataDict.cxx.i
@@ -232,7 +238,7 @@ TVamosDCDataDict.i: TVamosDCDataDict.cxx.i
 
 # target to preprocess a source file
 TVamosDCDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCDataDict.cxx.i
 .PHONY : TVamosDCDataDict.cxx.i
 
 TVamosDCDataDict.s: TVamosDCDataDict.cxx.s
@@ -240,7 +246,7 @@ TVamosDCDataDict.s: TVamosDCDataDict.cxx.s
 
 # target to generate assembly for a file
 TVamosDCDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosDCDataDict.cxx.s
 .PHONY : TVamosDCDataDict.cxx.s
 
 TVamosFingerData.o: TVamosFingerData.cxx.o
@@ -248,7 +254,7 @@ TVamosFingerData.o: TVamosFingerData.cxx.o
 
 # target to build an object file
 TVamosFingerData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerData.cxx.o
 .PHONY : TVamosFingerData.cxx.o
 
 TVamosFingerData.i: TVamosFingerData.cxx.i
@@ -256,7 +262,7 @@ TVamosFingerData.i: TVamosFingerData.cxx.i
 
 # target to preprocess a source file
 TVamosFingerData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerData.cxx.i
 .PHONY : TVamosFingerData.cxx.i
 
 TVamosFingerData.s: TVamosFingerData.cxx.s
@@ -264,7 +270,7 @@ TVamosFingerData.s: TVamosFingerData.cxx.s
 
 # target to generate assembly for a file
 TVamosFingerData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerData.cxx.s
 .PHONY : TVamosFingerData.cxx.s
 
 TVamosFingerDataDict.o: TVamosFingerDataDict.cxx.o
@@ -272,7 +278,7 @@ TVamosFingerDataDict.o: TVamosFingerDataDict.cxx.o
 
 # target to build an object file
 TVamosFingerDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerDataDict.cxx.o
 .PHONY : TVamosFingerDataDict.cxx.o
 
 TVamosFingerDataDict.i: TVamosFingerDataDict.cxx.i
@@ -280,7 +286,7 @@ TVamosFingerDataDict.i: TVamosFingerDataDict.cxx.i
 
 # target to preprocess a source file
 TVamosFingerDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerDataDict.cxx.i
 .PHONY : TVamosFingerDataDict.cxx.i
 
 TVamosFingerDataDict.s: TVamosFingerDataDict.cxx.s
@@ -288,7 +294,7 @@ TVamosFingerDataDict.s: TVamosFingerDataDict.cxx.s
 
 # target to generate assembly for a file
 TVamosFingerDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosFingerDataDict.cxx.s
 .PHONY : TVamosFingerDataDict.cxx.s
 
 TVamosPlasticData.o: TVamosPlasticData.cxx.o
@@ -296,7 +302,7 @@ TVamosPlasticData.o: TVamosPlasticData.cxx.o
 
 # target to build an object file
 TVamosPlasticData.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticData.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticData.cxx.o
 .PHONY : TVamosPlasticData.cxx.o
 
 TVamosPlasticData.i: TVamosPlasticData.cxx.i
@@ -304,7 +310,7 @@ TVamosPlasticData.i: TVamosPlasticData.cxx.i
 
 # target to preprocess a source file
 TVamosPlasticData.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticData.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticData.cxx.i
 .PHONY : TVamosPlasticData.cxx.i
 
 TVamosPlasticData.s: TVamosPlasticData.cxx.s
@@ -312,7 +318,7 @@ TVamosPlasticData.s: TVamosPlasticData.cxx.s
 
 # target to generate assembly for a file
 TVamosPlasticData.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticData.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticData.cxx.s
 .PHONY : TVamosPlasticData.cxx.s
 
 TVamosPlasticDataDict.o: TVamosPlasticDataDict.cxx.o
@@ -320,7 +326,7 @@ TVamosPlasticDataDict.o: TVamosPlasticDataDict.cxx.o
 
 # target to build an object file
 TVamosPlasticDataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticDataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticDataDict.cxx.o
 .PHONY : TVamosPlasticDataDict.cxx.o
 
 TVamosPlasticDataDict.i: TVamosPlasticDataDict.cxx.i
@@ -328,7 +334,7 @@ TVamosPlasticDataDict.i: TVamosPlasticDataDict.cxx.i
 
 # target to preprocess a source file
 TVamosPlasticDataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticDataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticDataDict.cxx.i
 .PHONY : TVamosPlasticDataDict.cxx.i
 
 TVamosPlasticDataDict.s: TVamosPlasticDataDict.cxx.s
@@ -336,7 +342,7 @@ TVamosPlasticDataDict.s: TVamosPlasticDataDict.cxx.s
 
 # target to generate assembly for a file
 TVamosPlasticDataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticDataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f Vamos/CMakeFiles/NPVamos.dir/build.make Vamos/CMakeFiles/NPVamos.dir/TVamosPlasticDataDict.cxx.s
 .PHONY : TVamosPlasticDataDict.cxx.s
 
 # Help Target
@@ -347,10 +353,11 @@ help:
 	@echo "... depend"
 	@echo "... NPVamos"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TVamosCHIOData.o"
 	@echo "... TVamosCHIOData.i"
 	@echo "... TVamosCHIOData.s"
@@ -386,6 +393,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPLib/W1/Makefile b/NPLib/W1/Makefile
index a87ce6f7e9482375fd0c333bcc3a95f0bd36b09d..4791eccaadb3f1f19cc8f7c8d45be40e988b818e 100644
--- a/NPLib/W1/Makefile
+++ b/NPLib/W1/Makefile
@@ -1,14 +1,10 @@
 # CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.1
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Default target executed when no arguments are given to make.
 default_target: all
 .PHONY : default_target
 
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-.PHONY : .NOTPARALLEL
-
 #=============================================================================
 # Special targets provided by cmake.
 
@@ -34,55 +30,65 @@ cmake_force:
 SHELL = /bin/sh
 
 # The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
 
 # The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
 
 # Escaping for special characters.
 EQUALS = =
 
 # The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_SOURCE_DIR = /home/rw00227/nptool/NPLib
 
 # The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/adrienmatta/Desktop/nptool/NPLib
+CMAKE_BINARY_DIR = /home/rw00227/nptool/NPLib
 
 #=============================================================================
 # Targets provided globally by CMake.
 
 # Special rule for the target edit_cache
 edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
-	/opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+	/usr/bin/cmake -i .
 .PHONY : edit_cache
 
 # Special rule for the target edit_cache
 edit_cache/fast: edit_cache
 .PHONY : edit_cache/fast
 
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
 # Special rule for the target install
 install: preinstall
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install
 
 # Special rule for the target install
 install/fast: preinstall/fast
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/opt/local/bin/cmake -P cmake_install.cmake
+	/usr/bin/cmake -P cmake_install.cmake
 .PHONY : install/fast
 
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
 # Special rule for the target list_install_components
 list_install_components:
 	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
@@ -92,26 +98,26 @@ list_install_components:
 list_install_components/fast: list_install_components
 .PHONY : list_install_components/fast
 
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
 
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
 
 # The main all target
 all: cmake_check_build_system
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles /Users/adrienmatta/Desktop/nptool/NPLib/W1/CMakeFiles/progress.marks
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 W1/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /Users/adrienmatta/Desktop/nptool/NPLib/CMakeFiles 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles /home/rw00227/nptool/NPLib/W1/CMakeFiles/progress.marks
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 W1/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/rw00227/nptool/NPLib/CMakeFiles 0
 .PHONY : all
 
 # The main clean target
 clean:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 W1/clean
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 W1/clean
 .PHONY : clean
 
 # The main clean target
@@ -120,22 +126,22 @@ clean/fast: clean
 
 # Prepare targets for installation.
 preinstall: all
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 W1/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 W1/preinstall
 .PHONY : preinstall
 
 # Prepare targets for installation.
 preinstall/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 W1/preinstall
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 W1/preinstall
 .PHONY : preinstall/fast
 
 # clear depends
 depend:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 .PHONY : depend
 
 # Convenience name for target.
 W1/CMakeFiles/NPW1.dir/rule:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 W1/CMakeFiles/NPW1.dir/rule
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f CMakeFiles/Makefile2 W1/CMakeFiles/NPW1.dir/rule
 .PHONY : W1/CMakeFiles/NPW1.dir/rule
 
 # Convenience name for target.
@@ -144,7 +150,7 @@ NPW1: W1/CMakeFiles/NPW1.dir/rule
 
 # fast build rule for target.
 NPW1/fast:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/build
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/build
 .PHONY : NPW1/fast
 
 TW1Data.o: TW1Data.cxx.o
@@ -152,7 +158,7 @@ TW1Data.o: TW1Data.cxx.o
 
 # target to build an object file
 TW1Data.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Data.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Data.cxx.o
 .PHONY : TW1Data.cxx.o
 
 TW1Data.i: TW1Data.cxx.i
@@ -160,7 +166,7 @@ TW1Data.i: TW1Data.cxx.i
 
 # target to preprocess a source file
 TW1Data.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Data.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Data.cxx.i
 .PHONY : TW1Data.cxx.i
 
 TW1Data.s: TW1Data.cxx.s
@@ -168,7 +174,7 @@ TW1Data.s: TW1Data.cxx.s
 
 # target to generate assembly for a file
 TW1Data.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Data.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Data.cxx.s
 .PHONY : TW1Data.cxx.s
 
 TW1DataDict.o: TW1DataDict.cxx.o
@@ -176,7 +182,7 @@ TW1DataDict.o: TW1DataDict.cxx.o
 
 # target to build an object file
 TW1DataDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1DataDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1DataDict.cxx.o
 .PHONY : TW1DataDict.cxx.o
 
 TW1DataDict.i: TW1DataDict.cxx.i
@@ -184,7 +190,7 @@ TW1DataDict.i: TW1DataDict.cxx.i
 
 # target to preprocess a source file
 TW1DataDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1DataDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1DataDict.cxx.i
 .PHONY : TW1DataDict.cxx.i
 
 TW1DataDict.s: TW1DataDict.cxx.s
@@ -192,7 +198,7 @@ TW1DataDict.s: TW1DataDict.cxx.s
 
 # target to generate assembly for a file
 TW1DataDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1DataDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1DataDict.cxx.s
 .PHONY : TW1DataDict.cxx.s
 
 TW1Physics.o: TW1Physics.cxx.o
@@ -200,7 +206,7 @@ TW1Physics.o: TW1Physics.cxx.o
 
 # target to build an object file
 TW1Physics.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Physics.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Physics.cxx.o
 .PHONY : TW1Physics.cxx.o
 
 TW1Physics.i: TW1Physics.cxx.i
@@ -208,7 +214,7 @@ TW1Physics.i: TW1Physics.cxx.i
 
 # target to preprocess a source file
 TW1Physics.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Physics.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Physics.cxx.i
 .PHONY : TW1Physics.cxx.i
 
 TW1Physics.s: TW1Physics.cxx.s
@@ -216,7 +222,7 @@ TW1Physics.s: TW1Physics.cxx.s
 
 # target to generate assembly for a file
 TW1Physics.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Physics.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1Physics.cxx.s
 .PHONY : TW1Physics.cxx.s
 
 TW1PhysicsDict.o: TW1PhysicsDict.cxx.o
@@ -224,7 +230,7 @@ TW1PhysicsDict.o: TW1PhysicsDict.cxx.o
 
 # target to build an object file
 TW1PhysicsDict.cxx.o:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1PhysicsDict.cxx.o
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1PhysicsDict.cxx.o
 .PHONY : TW1PhysicsDict.cxx.o
 
 TW1PhysicsDict.i: TW1PhysicsDict.cxx.i
@@ -232,7 +238,7 @@ TW1PhysicsDict.i: TW1PhysicsDict.cxx.i
 
 # target to preprocess a source file
 TW1PhysicsDict.cxx.i:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1PhysicsDict.cxx.i
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1PhysicsDict.cxx.i
 .PHONY : TW1PhysicsDict.cxx.i
 
 TW1PhysicsDict.s: TW1PhysicsDict.cxx.s
@@ -240,7 +246,7 @@ TW1PhysicsDict.s: TW1PhysicsDict.cxx.s
 
 # target to generate assembly for a file
 TW1PhysicsDict.cxx.s:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1PhysicsDict.cxx.s
+	cd /home/rw00227/nptool/NPLib && $(MAKE) -f W1/CMakeFiles/NPW1.dir/build.make W1/CMakeFiles/NPW1.dir/TW1PhysicsDict.cxx.s
 .PHONY : TW1PhysicsDict.cxx.s
 
 # Help Target
@@ -249,12 +255,13 @@ help:
 	@echo "... all (the default if no target is provided)"
 	@echo "... clean"
 	@echo "... depend"
+	@echo "... NPW1"
 	@echo "... edit_cache"
-	@echo "... rebuild_cache"
 	@echo "... install"
-	@echo "... NPW1"
-	@echo "... list_install_components"
 	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... rebuild_cache"
 	@echo "... TW1Data.o"
 	@echo "... TW1Data.i"
 	@echo "... TW1Data.s"
@@ -278,6 +285,6 @@ help:
 # No rule that depends on this can have commands that come from listfiles
 # because they might be regenerated.
 cmake_check_build_system:
-	cd /Users/adrienmatta/Desktop/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+	cd /home/rw00227/nptool/NPLib && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
 .PHONY : cmake_check_build_system
 
diff --git a/NPSimulation/Tiara/Tiara.cc b/NPSimulation/Tiara/Tiara.cc
index 8e6c4136309bd91031c4577abe185673eee8e1bf..9eb3fd5803bb4bd093bee01d15ed1948b488d89b 100644
--- a/NPSimulation/Tiara/Tiara.cc
+++ b/NPSimulation/Tiara/Tiara.cc
@@ -251,6 +251,12 @@ void Tiara::ReadSensitive(const G4Event* event){
       m_EventBarrel->SetOuterE(Info[7],Info[9],E);
       m_EventBarrel->SetOuterT(Info[7],Info[9],Info[1]); 
     }
+          // Interraction Coordinates
+//      ms_InterCoord->SetDetectedPositionX(Info[2]) ;
+//      ms_InterCoord->SetDetectedPositionY(Info[3]) ;
+//      ms_InterCoord->SetDetectedPositionZ(Info[4]) ;
+//      ms_InterCoord->SetDetectedAngleTheta(Info[5]/deg) ;
+//      ms_InterCoord->SetDetectedAnglePhi(Info[6]/deg) ;
   }
   // Clear Map for next event
   OuterBarrelHitMap->clear();
@@ -282,7 +288,12 @@ void Tiara::ReadSensitive(const G4Event* event){
       m_EventHyball->SetSectorE(Info[7],Info[9],EF);
       m_EventHyball->SetSectorT(Info[7],Info[9],Info[1]); 
     }
-
+    // Interraction Coordinates
+//    ms_InterCoord->SetDetectedPositionX(Info[2]) ;
+//    ms_InterCoord->SetDetectedPositionY(Info[3]) ;
+//    ms_InterCoord->SetDetectedPositionZ(Info[4]) ;
+//    ms_InterCoord->SetDetectedAngleTheta(Info[5]/deg) ;
+//    ms_InterCoord->SetDetectedAnglePhi(Info[6]/deg) ;
   }
   // Clear Map for next event
   HyballHitMap->clear();