diff --git a/Misc/NPEnvironment.bash b/Misc/NPEnvironment.bash
index 7e7d5183cfe65ec7f8b4ea15a44bf4993eb59419..28e88981e41d8261547abab54d06f42696cb6491 100644
--- a/Misc/NPEnvironment.bash
+++ b/Misc/NPEnvironment.bash
@@ -3,17 +3,14 @@
# NPTool Needs
export NPTOOL=/YourPathToNPTool/NPTool
-export NPLIB=$NPTOOL/NPLib
-export NPSIM=$NPTOOL/NPSimulation
-export NPANA=$NPTOOL/NPAnalysis
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$NPLIB/lib
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$NPTOOL/NPLib/lib
# alias
-alias Simulation='$NPSIM/bin/$G4SYSTEM/Simulation'
+alias Simulation='$NPTOOL/NPSimulation/bin/$G4SYSTEM/Simulation'
alias Analysis='$NPANA/Analysis'
-alias NPT='cd $NPTOOL'
-alias NPL='cd $NPLIB'
-alias NPS='cd $NPSIM'
-alias NPA='cd $NPANA'
+alias NPT='cd $NPTOOL'
+alias NPL='cd $NPTOOL/NPLib'
+alias NPS='cd $NPTOOL/NPSimulation'
+alias NPA='cd $NPTOOL/NPAnalysis'
diff --git a/Misc/NPEnvironment.tchrc b/Misc/NPEnvironment.tchrc
index 955dca78fceb2e133bea22a87b3024e97458b221..05a302adcfb114989a7c9acdde854b46b8d53924 100644
--- a/Misc/NPEnvironment.tchrc
+++ b/Misc/NPEnvironment.tchrc
@@ -3,17 +3,14 @@
# NPTool Needs
setenv NPTOOL /home/local1/geant4/NPTool.Paris
-setenv NPLIB $NPTOOL/NPLib
-setenv NPSIM $NPTOOL/NPSimulation
-setenv NPANA $NPTOOL/NPAnalysis
-setenv LD_LIBRARY_PATH $NPLIB/lib:$LD_LIBRARY_PATH
-source $NPLIB/liblist
+setenv LD_LIBRARY_PATH $NPTOOL/NPLib/lib:$LD_LIBRARY_PATH
+source $NPTOOL/NPLib/liblist
# alias
-alias Simulation '$NPSIM/bin/$G4SYSTEM/Simulation'
+alias Simulation '$NPTOOL/NPSimulation/bin/$G4SYSTEM/Simulation'
alias Analysis '$NPANA/Analysis'
-alias NPT 'cd $NPTOOL'
-alias NPL 'cd $NPLIB'
-alias NPS 'cd $NPSIM'
-alias NPA 'cd $NPANA'
+alias NPT 'cd $NPTOOL'
+alias NPL 'cd $NPTOOL/NPLib'
+alias NPS 'cd $NPTOOL/NPSimulation'
+alias NPA 'cd $NPTOOL/NPAnalysis'
diff --git a/Misc/rootlogon.C b/Misc/rootlogon.C
index be6b2ad7bdbaaecb90e62309580ea9c9d642e485..039796fc866b48d98896e372ec827f476ca76187 100644
--- a/Misc/rootlogon.C
+++ b/Misc/rootlogon.C
@@ -22,8 +22,8 @@
*****************************************************************************/
{
// Load NPToolLogon.C macro dealing with all the NPLib shared libraries
- TString path = gSystem->Getenv("NPLIB");
- gROOT->ProcessLine(Form(".L %s/scripts/NPToolLogon.C+", path.Data()));
+ TString path = gSystem->Getenv("NPTOOL");
+ gROOT->ProcessLine(Form(".L %s/NPLib/scripts/NPToolLogon.C+", path.Data()));
// No Init Display
NPToolLogon();
diff --git a/NPAnalysis/10He_Riken/Makefile b/NPAnalysis/10He_Riken/Makefile
index 702853b4ce67b172ee870654abb867771b47cce8..8c3232c0768002d1c10d8d4cf6b8160444f57203 100644
--- a/NPAnalysis/10He_Riken/Makefile
+++ b/NPAnalysis/10He_Riken/Makefile
@@ -1,9 +1,9 @@
# include same architecture file than for NPLib
# so that consistency is ensured
-include $(NPLIB)/Makefile.arch
+include $(NPTOOL)/NPLib/Makefile.arch
# additional libraries
-LIBRARY = `$(NPLIB)/liblist`
+LIBRARY = `$(NPTOOL)/NPLib/liblist`
LIBRARY += -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB)
PROGRAMS = Analysis
diff --git a/NPAnalysis/Gaspard/Makefile b/NPAnalysis/Gaspard/Makefile
index 702853b4ce67b172ee870654abb867771b47cce8..8c3232c0768002d1c10d8d4cf6b8160444f57203 100644
--- a/NPAnalysis/Gaspard/Makefile
+++ b/NPAnalysis/Gaspard/Makefile
@@ -1,9 +1,9 @@
# include same architecture file than for NPLib
# so that consistency is ensured
-include $(NPLIB)/Makefile.arch
+include $(NPTOOL)/NPLib/Makefile.arch
# additional libraries
-LIBRARY = `$(NPLIB)/liblist`
+LIBRARY = `$(NPTOOL)/NPLib/liblist`
LIBRARY += -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB)
PROGRAMS = Analysis
diff --git a/NPAnalysis/Hyde/Makefile b/NPAnalysis/Hyde/Makefile
index 702853b4ce67b172ee870654abb867771b47cce8..8c3232c0768002d1c10d8d4cf6b8160444f57203 100644
--- a/NPAnalysis/Hyde/Makefile
+++ b/NPAnalysis/Hyde/Makefile
@@ -1,9 +1,9 @@
# include same architecture file than for NPLib
# so that consistency is ensured
-include $(NPLIB)/Makefile.arch
+include $(NPTOOL)/NPLib/Makefile.arch
# additional libraries
-LIBRARY = `$(NPLIB)/liblist`
+LIBRARY = `$(NPTOOL)/NPLib/liblist`
LIBRARY += -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB)
PROGRAMS = Analysis
diff --git a/NPAnalysis/MakePhysicalTree/Makefile b/NPAnalysis/MakePhysicalTree/Makefile
index 702853b4ce67b172ee870654abb867771b47cce8..8c3232c0768002d1c10d8d4cf6b8160444f57203 100644
--- a/NPAnalysis/MakePhysicalTree/Makefile
+++ b/NPAnalysis/MakePhysicalTree/Makefile
@@ -1,9 +1,9 @@
# include same architecture file than for NPLib
# so that consistency is ensured
-include $(NPLIB)/Makefile.arch
+include $(NPTOOL)/NPLib/Makefile.arch
# additional libraries
-LIBRARY = `$(NPLIB)/liblist`
+LIBRARY = `$(NPTOOL)/NPLib/liblist`
LIBRARY += -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB)
PROGRAMS = Analysis
diff --git a/NPAnalysis/Paris/Makefile b/NPAnalysis/Paris/Makefile
index 702853b4ce67b172ee870654abb867771b47cce8..8c3232c0768002d1c10d8d4cf6b8160444f57203 100644
--- a/NPAnalysis/Paris/Makefile
+++ b/NPAnalysis/Paris/Makefile
@@ -1,9 +1,9 @@
# include same architecture file than for NPLib
# so that consistency is ensured
-include $(NPLIB)/Makefile.arch
+include $(NPTOOL)/NPLib/Makefile.arch
# additional libraries
-LIBRARY = `$(NPLIB)/liblist`
+LIBRARY = `$(NPTOOL)/NPLib/liblist`
LIBRARY += -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB)
PROGRAMS = Analysis
diff --git a/NPAnalysis/RRC66/Makefile b/NPAnalysis/RRC66/Makefile
index 702853b4ce67b172ee870654abb867771b47cce8..8c3232c0768002d1c10d8d4cf6b8160444f57203 100644
--- a/NPAnalysis/RRC66/Makefile
+++ b/NPAnalysis/RRC66/Makefile
@@ -1,9 +1,9 @@
# include same architecture file than for NPLib
# so that consistency is ensured
-include $(NPLIB)/Makefile.arch
+include $(NPTOOL)/NPLib/Makefile.arch
# additional libraries
-LIBRARY = `$(NPLIB)/liblist`
+LIBRARY = `$(NPTOOL)/NPLib/liblist`
LIBRARY += -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB)
PROGRAMS = Analysis
diff --git a/NPAnalysis/W1/Makefile b/NPAnalysis/W1/Makefile
index 702853b4ce67b172ee870654abb867771b47cce8..8c3232c0768002d1c10d8d4cf6b8160444f57203 100644
--- a/NPAnalysis/W1/Makefile
+++ b/NPAnalysis/W1/Makefile
@@ -1,9 +1,9 @@
# include same architecture file than for NPLib
# so that consistency is ensured
-include $(NPLIB)/Makefile.arch
+include $(NPTOOL)/NPLib/Makefile.arch
# additional libraries
-LIBRARY = `$(NPLIB)/liblist`
+LIBRARY = `$(NPTOOL)/NPLib/liblist`
LIBRARY += -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB)
PROGRAMS = Analysis
diff --git a/NPAnalysis/must2/Makefile b/NPAnalysis/must2/Makefile
index 702853b4ce67b172ee870654abb867771b47cce8..8c3232c0768002d1c10d8d4cf6b8160444f57203 100644
--- a/NPAnalysis/must2/Makefile
+++ b/NPAnalysis/must2/Makefile
@@ -1,9 +1,9 @@
# include same architecture file than for NPLib
# so that consistency is ensured
-include $(NPLIB)/Makefile.arch
+include $(NPTOOL)/NPLib/Makefile.arch
# additional libraries
-LIBRARY = `$(NPLIB)/liblist`
+LIBRARY = `$(NPTOOL)/NPLib/liblist`
LIBRARY += -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB)
PROGRAMS = Analysis
diff --git a/NPAnalysis/sssd/Makefile b/NPAnalysis/sssd/Makefile
index 702853b4ce67b172ee870654abb867771b47cce8..8c3232c0768002d1c10d8d4cf6b8160444f57203 100644
--- a/NPAnalysis/sssd/Makefile
+++ b/NPAnalysis/sssd/Makefile
@@ -1,9 +1,9 @@
# include same architecture file than for NPLib
# so that consistency is ensured
-include $(NPLIB)/Makefile.arch
+include $(NPTOOL)/NPLib/Makefile.arch
# additional libraries
-LIBRARY = `$(NPLIB)/liblist`
+LIBRARY = `$(NPTOOL)/NPLib/liblist`
LIBRARY += -L$(CLHEP_LIB_DIR) -l$(CLHEP_LIB)
PROGRAMS = Analysis
diff --git a/NPLib/Makefile b/NPLib/Makefile
index d9939ba9a1ce34a3552d14f10e1fd10ddfd31586..37a81adf6ba8d8dbc38de53d4b6711107e9ecfd3 100644
--- a/NPLib/Makefile
+++ b/NPLib/Makefile
@@ -1,4 +1,4 @@
-include Makefile.arch
+include $(NPTOOL)/NPLib/Makefile.arch
#------------------------------------------------------------------------------
SHARELIB = SharedLib
@@ -29,7 +29,7 @@ SharedLib:
############# Clean and More ##########
clean:
- ./scripts/makefile.sh clean
+ $(NPTOOL)/NPLib/scripts/makefile.sh clean
distclean:
rm -f ./lib/*
diff --git a/NPLib/Makefile.arch b/NPLib/Makefile.arch
index 2968bd84f174b090a47bf44233c8087ec18b80c6..2d8aec4e0bb51415ed0d2c1dd3932814d18548d0 100644
--- a/NPLib/Makefile.arch
+++ b/NPLib/Makefile.arch
@@ -483,7 +483,7 @@ LDFLAGS += $(ROOTLDFLAGS)
LIBS = $(ROOTLIBS) $(SYSLIBS)
GLIBS = $(ROOTGLIBS) $(SYSLIBS)
-INCLUDE = -I$(CLHEP_BASE_DIR)/include -I$(NPLIB)/include
+INCLUDE = -I$(CLHEP_BASE_DIR)/include -I$(NPTOOL)/NPLib/include
ifneq ($(ALTCC),)
CC = $(ALTCC)
diff --git a/NPLib/Physics/NPNucleus.cxx b/NPLib/Physics/NPNucleus.cxx
index 0115cc0edfee8e08b25079039d2fc015e0bf3168..5dec2f6ca226fcef5edc6fdbc0ad32803cbf0f55 100644
--- a/NPLib/Physics/NPNucleus.cxx
+++ b/NPLib/Physics/NPNucleus.cxx
@@ -53,8 +53,8 @@ Nucleus::Nucleus(string isotope)
const char* Isotope = isotope.c_str();
ifstream inFile;
- string Path = getenv("NPLIB") ;
- string FileName = Path + "/Physics/nubtab03.asc";
+ string Path = getenv("NPTOOL") ;
+ string FileName = Path + "/NPLib/Physics/nubtab03.asc";
inFile.open(FileName.c_str());
// reading the file
@@ -82,8 +82,8 @@ Nucleus::Nucleus(int Z, int A)
// open the file to read and check if it is open
ifstream inFile;
- string Path = getenv("NPLIB") ;
- string FileName = Path + "/Physics/nubtab03.asc";
+ string Path = getenv("NPTOOL") ;
+ string FileName = Path + "/NPLib/Physics/nubtab03.asc";
inFile.open(FileName.c_str());
// reading the file
diff --git a/NPLib/scripts/NPToolLogon.C b/NPLib/scripts/NPToolLogon.C
index c01c049016731e76b5796b57575df2137130d6e3..8740775c92f13c0fe21681d43491d82404f8d965 100644
--- a/NPLib/scripts/NPToolLogon.C
+++ b/NPLib/scripts/NPToolLogon.C
@@ -36,15 +36,15 @@ using namespace std;
void NPToolLogon(bool verbosemode = false)
{
TString currentpath = gSystem->Getenv("PWD");
- TString path = gSystem->Getenv("NPLIB");
+ TString path = gSystem->Getenv("NPTOOL");
// Add include path
- if (verbosemode) cout << "NPTool: adding include path : " << path << "/include" << endl;
- gROOT->ProcessLine(Form(".include %s/include", path.Data()));
+ if (verbosemode) cout << "NPTool: adding include path : " << path << "/NPLib/include" << endl;
+ gROOT->ProcessLine(Form(".include %s/NPLib/include", path.Data()));
// Add shared libraries
if (verbosemode) cout << "NPTool: loading NPLib shared libraries ..." << endl;
- TString libpath = Form("%s/lib", path.Data());
+ TString libpath = Form("%s/NPLib/lib", path.Data());
TSystemDirectory libdir("libdir", libpath);
TList* listfile = libdir.GetListOfFiles();
@@ -64,12 +64,12 @@ void NPToolLogon(bool verbosemode = false)
while (listfile->At(i)) {
TString libname = listfile->At(i++)->GetName();
if (libname.Contains("so") && !libname.Contains("libVDetector.so")) {
- TString lib = libpath + "/" + libname;
+ TString lib = libpath + "/" + libname;
gSystem->Load(lib);
}
}
- gROOT->ProcessLine(".L $NPLIB/include/RootInput.h+");
+ gROOT->ProcessLine(".L $NPTOOL/NPLib/include/RootInput.h+");
// Since the libdir.GetListOfFiles() commands cds to the
// libidr directory, one has to return to the initial
diff --git a/NPLib/scripts/buildliblist.sh b/NPLib/scripts/buildliblist.sh
index d952c837652849478498b40f5f1c5a743c5dcde5..b12480117a53c7d0c3272e10fb8a331f4d7f26f3 100755
--- a/NPLib/scripts/buildliblist.sh
+++ b/NPLib/scripts/buildliblist.sh
@@ -30,7 +30,13 @@ if [ -e $outfile ] ; then
fi ;
# create output file
-echo "echo -L$NPLIB/lib \\" >> $outfile
+echo "#! /bin/bash" >> $outfile
+echo "#" >> $outfile
+echo "# WARNING:" >> $outfile
+echo "# This file is automatically generated when NPLib libraries are built through the make command." >> $outfile
+echo "# If you modify this file by hand, changes won't persist the next time you compile NPLib." >> $outfile
+echo "#" >> $outfile
+echo "echo -L$NPTOOL/NPLib/lib \\" >> $outfile
chmod a+x $outfile
# loop on *.so files in lib/ directory
diff --git a/NPSimulation/GNUmakefile b/NPSimulation/GNUmakefile
index 08256961e27652015ac90c72986404f9905a68e5..b9dc9d467335e422192082f05e514cc9d00a96a0 100644
--- a/NPSimulation/GNUmakefile
+++ b/NPSimulation/GNUmakefile
@@ -18,9 +18,9 @@ G4WORKDIR = ./
G4BIN = ./bin
CPPFLAGS += $(shell root-config --cflags)
-CPPFLAGS += -I$(NPLIB)/include
+CPPFLAGS += -I$(NPTOOL)/NPLib/include
EXTRALIBS = $(shell root-config --glibs) -lMathMore
-EXTRALIBS += `$(NPLIB)/liblist`
+EXTRALIBS += `$(NPTOOL)/NPLib/liblist`
.PHONY: all
all: lib bin