diff --git a/Inputs/EventGenerator/12Cppa.reaction b/Inputs/EventGenerator/12Cppa.reaction
new file mode 100644
index 0000000000000000000000000000000000000000..39a41410b9a502d5563004ed577b3790460780b6
--- /dev/null
+++ b/Inputs/EventGenerator/12Cppa.reaction
@@ -0,0 +1,32 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%Beam energy given in MeV ; Excitation in MeV
+Beam
+ Particle= 1H
+ Energy= 18
+ SigmaEnergy= 0
+ SigmaThetaX= 0
+ SigmaPhiY= 0
+ SigmaX= 0
+ SigmaY= 0
+ MeanThetaX= 0
+ MeanPhiY= 0
+ MeanX= 0
+ MeanY= 0
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+TwoBodyReaction
+ Beam= 1H
+ Target= 12C
+ Light= 1H
+ Heavy= 12C
+ ExcitationEnergyLight= 0.0
+ ExcitationEnergyHeavy= 12.7
+ CrossSectionPath= flat.txt CS
+ ShootLight= 1
+ ShootHeavy= 1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ParticleDecay 12C
+ Daughter= 4He 4He 4He
+ ExcitationEnergy= 0 0 0
+ shoot= 1 1 1
diff --git a/Inputs/EventGenerator/Angel.reaction b/Inputs/EventGenerator/Angel.reaction
new file mode 100644
index 0000000000000000000000000000000000000000..3ff0f666d38d29025d20b32551a073faac79bce1
--- /dev/null
+++ b/Inputs/EventGenerator/Angel.reaction
@@ -0,0 +1,22 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Beam energy given in MeV ; Excitation in MeV ; SigmaXY in mm
+% SigmaThetaX/PhiY in deg
+Transfert
+ Beam= 5He
+ Target= 208Pb
+ Light= 5He
+ Heavy= 208Pb
+ ExcitationEnergyLight= 0.0
+ ExcitationEnergyHeavy= 0.0
+ BeamEnergy= 22
+ BeamEnergySpread= 10
+ SigmaThetaX= 0
+ SigmaPhiY= 0
+ SigmaX= 0
+ SigmaY= 0
+ CrossSectionPath= flat.txt
+ ShootLight= 1
+ ShootHeavy= 0
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/NPSimulation/src/AnnularS1.cc b/NPSimulation/AnnularS1/AnnularS1.cc
similarity index 100%
rename from NPSimulation/src/AnnularS1.cc
rename to NPSimulation/AnnularS1/AnnularS1.cc
diff --git a/NPSimulation/include/AnnularS1.hh b/NPSimulation/AnnularS1/AnnularS1.hh
similarity index 100%
rename from NPSimulation/include/AnnularS1.hh
rename to NPSimulation/AnnularS1/AnnularS1.hh
diff --git a/NPSimulation/src/AnnularS1Scorers.cc b/NPSimulation/AnnularS1/AnnularS1Scorers.cc
similarity index 100%
rename from NPSimulation/src/AnnularS1Scorers.cc
rename to NPSimulation/AnnularS1/AnnularS1Scorers.cc
diff --git a/NPSimulation/include/AnnularS1Scorers.hh b/NPSimulation/AnnularS1/AnnularS1Scorers.hh
similarity index 100%
rename from NPSimulation/include/AnnularS1Scorers.hh
rename to NPSimulation/AnnularS1/AnnularS1Scorers.hh
diff --git a/NPSimulation/src/ComptonTelescope.cc b/NPSimulation/ComptonTelescope/ComptonTelescope.cc
similarity index 100%
rename from NPSimulation/src/ComptonTelescope.cc
rename to NPSimulation/ComptonTelescope/ComptonTelescope.cc
diff --git a/NPSimulation/include/ComptonTelescope.hh b/NPSimulation/ComptonTelescope/ComptonTelescope.hh
old mode 100755
new mode 100644
similarity index 100%
rename from NPSimulation/include/ComptonTelescope.hh
rename to NPSimulation/ComptonTelescope/ComptonTelescope.hh
diff --git a/NPSimulation/src/ComptonTelescopeScorers.cc b/NPSimulation/ComptonTelescope/ComptonTelescopeScorers.cc
similarity index 100%
rename from NPSimulation/src/ComptonTelescopeScorers.cc
rename to NPSimulation/ComptonTelescope/ComptonTelescopeScorers.cc
diff --git a/NPSimulation/include/ComptonTelescopeScorers.hh b/NPSimulation/ComptonTelescope/ComptonTelescopeScorers.hh
old mode 100755
new mode 100644
similarity index 100%
rename from NPSimulation/include/ComptonTelescopeScorers.hh
rename to NPSimulation/ComptonTelescope/ComptonTelescopeScorers.hh
diff --git a/NPSimulation/src/DummyDetector.cc b/NPSimulation/DummyDetector/DummyDetector.cc
similarity index 100%
rename from NPSimulation/src/DummyDetector.cc
rename to NPSimulation/DummyDetector/DummyDetector.cc
diff --git a/NPSimulation/include/DummyDetector.hh b/NPSimulation/DummyDetector/DummyDetector.hh
similarity index 100%
rename from NPSimulation/include/DummyDetector.hh
rename to NPSimulation/DummyDetector/DummyDetector.hh
diff --git a/NPSimulation/src/Eurogam.cc b/NPSimulation/Eurogam/Eurogam.cc
similarity index 100%
rename from NPSimulation/src/Eurogam.cc
rename to NPSimulation/Eurogam/Eurogam.cc
diff --git a/NPSimulation/include/Eurogam.hh b/NPSimulation/Eurogam/Eurogam.hh
old mode 100755
new mode 100644
similarity index 100%
rename from NPSimulation/include/Eurogam.hh
rename to NPSimulation/Eurogam/Eurogam.hh
diff --git a/NPSimulation/src/GaspardScorers.cc b/NPSimulation/GASPARD/GaspardScorers.cc
similarity index 100%
rename from NPSimulation/src/GaspardScorers.cc
rename to NPSimulation/GASPARD/GaspardScorers.cc
diff --git a/NPSimulation/include/GaspardScorers.hh b/NPSimulation/GASPARD/GaspardScorers.hh
similarity index 100%
rename from NPSimulation/include/GaspardScorers.hh
rename to NPSimulation/GASPARD/GaspardScorers.hh
diff --git a/NPSimulation/src/GaspardTracker.cc b/NPSimulation/GASPARD/GaspardTracker.cc
similarity index 100%
rename from NPSimulation/src/GaspardTracker.cc
rename to NPSimulation/GASPARD/GaspardTracker.cc
diff --git a/NPSimulation/include/GaspardTracker.hh b/NPSimulation/GASPARD/GaspardTracker.hh
similarity index 100%
rename from NPSimulation/include/GaspardTracker.hh
rename to NPSimulation/GASPARD/GaspardTracker.hh
diff --git a/NPSimulation/src/GaspardTrackerAnnular.cc b/NPSimulation/GASPARD/GaspardTrackerAnnular.cc
similarity index 100%
rename from NPSimulation/src/GaspardTrackerAnnular.cc
rename to NPSimulation/GASPARD/GaspardTrackerAnnular.cc
diff --git a/NPSimulation/include/GaspardTrackerAnnular.hh b/NPSimulation/GASPARD/GaspardTrackerAnnular.hh
similarity index 100%
rename from NPSimulation/include/GaspardTrackerAnnular.hh
rename to NPSimulation/GASPARD/GaspardTrackerAnnular.hh
diff --git a/NPSimulation/src/GaspardTrackerDummyShape.cc b/NPSimulation/GASPARD/GaspardTrackerDummyShape.cc
similarity index 100%
rename from NPSimulation/src/GaspardTrackerDummyShape.cc
rename to NPSimulation/GASPARD/GaspardTrackerDummyShape.cc
diff --git a/NPSimulation/include/GaspardTrackerDummyShape.hh b/NPSimulation/GASPARD/GaspardTrackerDummyShape.hh
similarity index 100%
rename from NPSimulation/include/GaspardTrackerDummyShape.hh
rename to NPSimulation/GASPARD/GaspardTrackerDummyShape.hh
diff --git a/NPSimulation/src/GaspardTrackerModule.cc b/NPSimulation/GASPARD/GaspardTrackerModule.cc
similarity index 100%
rename from NPSimulation/src/GaspardTrackerModule.cc
rename to NPSimulation/GASPARD/GaspardTrackerModule.cc
diff --git a/NPSimulation/include/GaspardTrackerModule.hh b/NPSimulation/GASPARD/GaspardTrackerModule.hh
similarity index 100%
rename from NPSimulation/include/GaspardTrackerModule.hh
rename to NPSimulation/GASPARD/GaspardTrackerModule.hh
diff --git a/NPSimulation/src/GaspardTrackerSquare.cc b/NPSimulation/GASPARD/GaspardTrackerSquare.cc
similarity index 99%
rename from NPSimulation/src/GaspardTrackerSquare.cc
rename to NPSimulation/GASPARD/GaspardTrackerSquare.cc
index 3f0b13412541061fbec644380f747529e58e7298..dac055ae83f690fd12ebb95817829e5ffd83a6fc 100644
--- a/NPSimulation/src/GaspardTrackerSquare.cc
+++ b/NPSimulation/GASPARD/GaspardTrackerSquare.cc
@@ -54,7 +54,6 @@
#include "GeneralScorers.hh"
#include "GaspardScorers.hh"
#include "RootOutput.h"
-#include "MUST2Array.hh"
// CLHEP
#include "CLHEP/Random/RandGauss.h"
diff --git a/NPSimulation/include/GaspardTrackerSquare.hh b/NPSimulation/GASPARD/GaspardTrackerSquare.hh
similarity index 100%
rename from NPSimulation/include/GaspardTrackerSquare.hh
rename to NPSimulation/GASPARD/GaspardTrackerSquare.hh
diff --git a/NPSimulation/src/GaspardTrackerTrapezoid.cc b/NPSimulation/GASPARD/GaspardTrackerTrapezoid.cc
similarity index 100%
rename from NPSimulation/src/GaspardTrackerTrapezoid.cc
rename to NPSimulation/GASPARD/GaspardTrackerTrapezoid.cc
diff --git a/NPSimulation/include/GaspardTrackerTrapezoid.hh b/NPSimulation/GASPARD/GaspardTrackerTrapezoid.hh
similarity index 100%
rename from NPSimulation/include/GaspardTrackerTrapezoid.hh
rename to NPSimulation/GASPARD/GaspardTrackerTrapezoid.hh
diff --git a/NPSimulation/src/Helios.cc b/NPSimulation/Helios/Helios.cc
similarity index 100%
rename from NPSimulation/src/Helios.cc
rename to NPSimulation/Helios/Helios.cc
diff --git a/NPSimulation/include/Helios.hh b/NPSimulation/Helios/Helios.hh
similarity index 100%
rename from NPSimulation/include/Helios.hh
rename to NPSimulation/Helios/Helios.hh
diff --git a/NPSimulation/src/HeliosDetDummyShape.cc b/NPSimulation/Helios/HeliosDetDummyShape.cc
similarity index 100%
rename from NPSimulation/src/HeliosDetDummyShape.cc
rename to NPSimulation/Helios/HeliosDetDummyShape.cc
diff --git a/NPSimulation/include/HeliosDetDummyShape.hh b/NPSimulation/Helios/HeliosDetDummyShape.hh
similarity index 100%
rename from NPSimulation/include/HeliosDetDummyShape.hh
rename to NPSimulation/Helios/HeliosDetDummyShape.hh
diff --git a/NPSimulation/src/HeliosModule.cc b/NPSimulation/Helios/HeliosModule.cc
similarity index 100%
rename from NPSimulation/src/HeliosModule.cc
rename to NPSimulation/Helios/HeliosModule.cc
diff --git a/NPSimulation/include/HeliosModule.hh b/NPSimulation/Helios/HeliosModule.hh
similarity index 100%
rename from NPSimulation/include/HeliosModule.hh
rename to NPSimulation/Helios/HeliosModule.hh
diff --git a/NPSimulation/src/HeliosScorers.cc b/NPSimulation/Helios/HeliosScorers.cc
similarity index 100%
rename from NPSimulation/src/HeliosScorers.cc
rename to NPSimulation/Helios/HeliosScorers.cc
diff --git a/NPSimulation/include/HeliosScorers.hh b/NPSimulation/Helios/HeliosScorers.hh
similarity index 100%
rename from NPSimulation/include/HeliosScorers.hh
rename to NPSimulation/Helios/HeliosScorers.hh
diff --git a/NPSimulation/src/Hyde2Scorers.cc b/NPSimulation/Hyde2/Hyde2Scorers.cc
similarity index 100%
rename from NPSimulation/src/Hyde2Scorers.cc
rename to NPSimulation/Hyde2/Hyde2Scorers.cc
diff --git a/NPSimulation/include/Hyde2Scorers.hh b/NPSimulation/Hyde2/Hyde2Scorers.hh
similarity index 100%
rename from NPSimulation/include/Hyde2Scorers.hh
rename to NPSimulation/Hyde2/Hyde2Scorers.hh
diff --git a/NPSimulation/src/Hyde2Tracker.cc b/NPSimulation/Hyde2/Hyde2Tracker.cc
similarity index 100%
rename from NPSimulation/src/Hyde2Tracker.cc
rename to NPSimulation/Hyde2/Hyde2Tracker.cc
diff --git a/NPSimulation/include/Hyde2Tracker.hh b/NPSimulation/Hyde2/Hyde2Tracker.hh
similarity index 100%
rename from NPSimulation/include/Hyde2Tracker.hh
rename to NPSimulation/Hyde2/Hyde2Tracker.hh
diff --git a/NPSimulation/src/Hyde2TrackerModule.cc b/NPSimulation/Hyde2/Hyde2TrackerModule.cc
similarity index 100%
rename from NPSimulation/src/Hyde2TrackerModule.cc
rename to NPSimulation/Hyde2/Hyde2TrackerModule.cc
diff --git a/NPSimulation/include/Hyde2TrackerModule.hh b/NPSimulation/Hyde2/Hyde2TrackerModule.hh
similarity index 100%
rename from NPSimulation/include/Hyde2TrackerModule.hh
rename to NPSimulation/Hyde2/Hyde2TrackerModule.hh
diff --git a/NPSimulation/src/Hyde2TrackerSquare1.cc b/NPSimulation/Hyde2/Hyde2TrackerSquare1.cc
similarity index 100%
rename from NPSimulation/src/Hyde2TrackerSquare1.cc
rename to NPSimulation/Hyde2/Hyde2TrackerSquare1.cc
diff --git a/NPSimulation/include/Hyde2TrackerSquare1.hh b/NPSimulation/Hyde2/Hyde2TrackerSquare1.hh
similarity index 100%
rename from NPSimulation/include/Hyde2TrackerSquare1.hh
rename to NPSimulation/Hyde2/Hyde2TrackerSquare1.hh
diff --git a/NPSimulation/src/Hyde2TrackerTrapezoid1.cc b/NPSimulation/Hyde2/Hyde2TrackerTrapezoid1.cc
similarity index 100%
rename from NPSimulation/src/Hyde2TrackerTrapezoid1.cc
rename to NPSimulation/Hyde2/Hyde2TrackerTrapezoid1.cc
diff --git a/NPSimulation/include/Hyde2TrackerTrapezoid1.hh b/NPSimulation/Hyde2/Hyde2TrackerTrapezoid1.hh
similarity index 100%
rename from NPSimulation/include/Hyde2TrackerTrapezoid1.hh
rename to NPSimulation/Hyde2/Hyde2TrackerTrapezoid1.hh
diff --git a/NPSimulation/src/Hyde2TrackerTrapezoid2.cc b/NPSimulation/Hyde2/Hyde2TrackerTrapezoid2.cc
similarity index 100%
rename from NPSimulation/src/Hyde2TrackerTrapezoid2.cc
rename to NPSimulation/Hyde2/Hyde2TrackerTrapezoid2.cc
diff --git a/NPSimulation/include/Hyde2TrackerTrapezoid2.hh b/NPSimulation/Hyde2/Hyde2TrackerTrapezoid2.hh
similarity index 100%
rename from NPSimulation/include/Hyde2TrackerTrapezoid2.hh
rename to NPSimulation/Hyde2/Hyde2TrackerTrapezoid2.hh
diff --git a/NPSimulation/src/MUST2Array.cc b/NPSimulation/MUST2/MUST2Array.cc
similarity index 100%
rename from NPSimulation/src/MUST2Array.cc
rename to NPSimulation/MUST2/MUST2Array.cc
diff --git a/NPSimulation/include/MUST2Array.hh b/NPSimulation/MUST2/MUST2Array.hh
similarity index 100%
rename from NPSimulation/include/MUST2Array.hh
rename to NPSimulation/MUST2/MUST2Array.hh
diff --git a/NPSimulation/src/Must2Scorers.cc b/NPSimulation/MUST2/MUST2Scorers.cc
similarity index 100%
rename from NPSimulation/src/Must2Scorers.cc
rename to NPSimulation/MUST2/MUST2Scorers.cc
diff --git a/NPSimulation/include/Must2Scorers.hh b/NPSimulation/MUST2/MUST2Scorers.hh
similarity index 100%
rename from NPSimulation/include/Must2Scorers.hh
rename to NPSimulation/MUST2/MUST2Scorers.hh
diff --git a/NPSimulation/Makefile b/NPSimulation/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..e7de1373b8a932315dbe35af7d6d8a5172b97f83
--- /dev/null
+++ b/NPSimulation/Makefile
@@ -0,0 +1,24 @@
+COPYFILES = CopyIncSrcFiles
+DELFILES = DelIncSrcFiles
+NPSIM = NPSimulation
+
+all: $(DELFILES) $(COPYFILES) $(NPSIM)
+
+
+CopyIncSrcFiles:
+ ./scripts/copyfiles.sh
+
+DelIncSrcFiles:
+ ./scripts/deletefiles.sh
+
+NPSimulation:
+ make -f Makefile.geant4
+
+clean:
+ ./scripts/deletefiles.sh
+
+distclean:
+ ./scripts/deletefiles.sh
+ @echo " + Deleting bin and tmp directories"
+ rm -rf bin
+ rm -rf tmp
diff --git a/NPSimulation/GNUmakefile b/NPSimulation/Makefile.geant4
similarity index 86%
rename from NPSimulation/GNUmakefile
rename to NPSimulation/Makefile.geant4
index 7d2d4a26d9641bf4aba4dc6c35794056b8bfaa5b..f1327d3472bca05e358dbb73048d367796b301fc 100644
--- a/NPSimulation/GNUmakefile
+++ b/NPSimulation/Makefile.geant4
@@ -6,6 +6,9 @@
ROOTCONFIG := root-config
ARCH := $(shell $(ROOTCONFIG) --arch)
+#COPYFILES = CopyIncSrcFiles
+
+# G4 makefile
name := Simulation
G4TARGET := $(name)
G4EXLIB := true
@@ -30,8 +33,13 @@ endif
EXTRALIBS = $(shell root-config --glibs) -lMathMore
EXTRALIBS += `$(NPTOOL)/NPLib/liblist`
.PHONY: all
+#all: $(COPYFILES) lib bin
all: lib bin
+# copying files associated to selected detectors
+#CopyIncSrcFiles:
+# ./copyfiles.sh
+
cleanVRML:
rm -r *.wrl
diff --git a/NPSimulation/src/Paris.cc b/NPSimulation/Paris/Paris.cc
similarity index 100%
rename from NPSimulation/src/Paris.cc
rename to NPSimulation/Paris/Paris.cc
diff --git a/NPSimulation/include/Paris.hh b/NPSimulation/Paris/Paris.hh
similarity index 100%
rename from NPSimulation/include/Paris.hh
rename to NPSimulation/Paris/Paris.hh
diff --git a/NPSimulation/src/ParisCluster.cc b/NPSimulation/Paris/ParisCluster.cc
similarity index 100%
rename from NPSimulation/src/ParisCluster.cc
rename to NPSimulation/Paris/ParisCluster.cc
diff --git a/NPSimulation/include/ParisCluster.hh b/NPSimulation/Paris/ParisCluster.hh
similarity index 100%
rename from NPSimulation/include/ParisCluster.hh
rename to NPSimulation/Paris/ParisCluster.hh
diff --git a/NPSimulation/src/ParisModule.cc b/NPSimulation/Paris/ParisModule.cc
similarity index 100%
rename from NPSimulation/src/ParisModule.cc
rename to NPSimulation/Paris/ParisModule.cc
diff --git a/NPSimulation/include/ParisModule.hh b/NPSimulation/Paris/ParisModule.hh
similarity index 100%
rename from NPSimulation/include/ParisModule.hh
rename to NPSimulation/Paris/ParisModule.hh
diff --git a/NPSimulation/src/ParisPhoswich.cc b/NPSimulation/Paris/ParisPhoswich.cc
similarity index 100%
rename from NPSimulation/src/ParisPhoswich.cc
rename to NPSimulation/Paris/ParisPhoswich.cc
diff --git a/NPSimulation/include/ParisPhoswich.hh b/NPSimulation/Paris/ParisPhoswich.hh
similarity index 100%
rename from NPSimulation/include/ParisPhoswich.hh
rename to NPSimulation/Paris/ParisPhoswich.hh
diff --git a/NPSimulation/src/ParisScorers.cc b/NPSimulation/Paris/ParisScorers.cc
similarity index 100%
rename from NPSimulation/src/ParisScorers.cc
rename to NPSimulation/Paris/ParisScorers.cc
diff --git a/NPSimulation/include/ParisScorers.hh b/NPSimulation/Paris/ParisScorers.hh
similarity index 100%
rename from NPSimulation/include/ParisScorers.hh
rename to NPSimulation/Paris/ParisScorers.hh
diff --git a/NPSimulation/src/Plastic.cc b/NPSimulation/Plastic/Plastic.cc
similarity index 100%
rename from NPSimulation/src/Plastic.cc
rename to NPSimulation/Plastic/Plastic.cc
diff --git a/NPSimulation/include/Plastic.hh b/NPSimulation/Plastic/Plastic.hh
similarity index 100%
rename from NPSimulation/include/Plastic.hh
rename to NPSimulation/Plastic/Plastic.hh
diff --git a/NPSimulation/src/ThinSi.cc b/NPSimulation/SSSD/ThinSi.cc
similarity index 100%
rename from NPSimulation/src/ThinSi.cc
rename to NPSimulation/SSSD/ThinSi.cc
diff --git a/NPSimulation/include/ThinSi.hh b/NPSimulation/SSSD/ThinSi.hh
similarity index 100%
rename from NPSimulation/include/ThinSi.hh
rename to NPSimulation/SSSD/ThinSi.hh
diff --git a/NPSimulation/src/ThinSiScorers.cc b/NPSimulation/SSSD/ThinSiScorers.cc
similarity index 100%
rename from NPSimulation/src/ThinSiScorers.cc
rename to NPSimulation/SSSD/ThinSiScorers.cc
diff --git a/NPSimulation/include/ThinSiScorers.hh b/NPSimulation/SSSD/ThinSiScorers.hh
similarity index 100%
rename from NPSimulation/include/ThinSiScorers.hh
rename to NPSimulation/SSSD/ThinSiScorers.hh
diff --git a/NPSimulation/src/Sharc.cc b/NPSimulation/Sharc/Sharc.cc
similarity index 99%
rename from NPSimulation/src/Sharc.cc
rename to NPSimulation/Sharc/Sharc.cc
index 09e0ec913ce1f3c1dd7fc7158ee9c4a9f635bfae..e4e5b7f5a43527137e3480df834ffe88108e360b 100644
--- a/NPSimulation/src/Sharc.cc
+++ b/NPSimulation/Sharc/Sharc.cc
@@ -29,7 +29,6 @@
//G4 sensitive
#include "G4SDManager.hh"
-#include "G4MultiFunctionalDetector.hh"
//G4 various object
#include "G4MaterialTable.hh"
diff --git a/NPSimulation/include/Sharc.hh b/NPSimulation/Sharc/Sharc.hh
similarity index 99%
rename from NPSimulation/include/Sharc.hh
rename to NPSimulation/Sharc/Sharc.hh
index c2f14653e963e63e086d58fa3a5b1245e01e4708..2f12f08019074f6885ecbb17818331b5bb1846bc 100644
--- a/NPSimulation/include/Sharc.hh
+++ b/NPSimulation/Sharc/Sharc.hh
@@ -32,6 +32,7 @@
#include "G4RotationMatrix.hh"
#include "G4LogicalVolume.hh"
#include "G4VisAttributes.hh"
+#include "G4MultiFunctionalDetector.hh"
// NPSimulation header
#include "VDetector.hh"
diff --git a/NPSimulation/src/SharcScorers.cc b/NPSimulation/Sharc/SharcScorers.cc
similarity index 100%
rename from NPSimulation/src/SharcScorers.cc
rename to NPSimulation/Sharc/SharcScorers.cc
diff --git a/NPSimulation/include/SharcScorers.hh b/NPSimulation/Sharc/SharcScorers.hh
similarity index 100%
rename from NPSimulation/include/SharcScorers.hh
rename to NPSimulation/Sharc/SharcScorers.hh
diff --git a/NPSimulation/src/Shield.cc b/NPSimulation/Shield/Shield.cc
similarity index 100%
rename from NPSimulation/src/Shield.cc
rename to NPSimulation/Shield/Shield.cc
diff --git a/NPSimulation/include/Shield.hh b/NPSimulation/Shield/Shield.hh
similarity index 100%
rename from NPSimulation/include/Shield.hh
rename to NPSimulation/Shield/Shield.hh
diff --git a/NPSimulation/src/ShieldClParis.cc b/NPSimulation/Shield/ShieldClParis.cc
similarity index 100%
rename from NPSimulation/src/ShieldClParis.cc
rename to NPSimulation/Shield/ShieldClParis.cc
diff --git a/NPSimulation/include/ShieldClParis.hh b/NPSimulation/Shield/ShieldClParis.hh
similarity index 100%
rename from NPSimulation/include/ShieldClParis.hh
rename to NPSimulation/Shield/ShieldClParis.hh
diff --git a/NPSimulation/src/ShieldModule.cc b/NPSimulation/Shield/ShieldModule.cc
similarity index 100%
rename from NPSimulation/src/ShieldModule.cc
rename to NPSimulation/Shield/ShieldModule.cc
diff --git a/NPSimulation/include/ShieldModule.hh b/NPSimulation/Shield/ShieldModule.hh
similarity index 100%
rename from NPSimulation/include/ShieldModule.hh
rename to NPSimulation/Shield/ShieldModule.hh
diff --git a/NPSimulation/src/ShieldPhParis.cc b/NPSimulation/Shield/ShieldPhParis.cc
similarity index 100%
rename from NPSimulation/src/ShieldPhParis.cc
rename to NPSimulation/Shield/ShieldPhParis.cc
diff --git a/NPSimulation/include/ShieldPhParis.hh b/NPSimulation/Shield/ShieldPhParis.hh
similarity index 100%
rename from NPSimulation/include/ShieldPhParis.hh
rename to NPSimulation/Shield/ShieldPhParis.hh
diff --git a/NPSimulation/src/ShieldScorers.cc b/NPSimulation/Shield/ShieldScorers.cc
similarity index 100%
rename from NPSimulation/src/ShieldScorers.cc
rename to NPSimulation/Shield/ShieldScorers.cc
diff --git a/NPSimulation/include/ShieldScorers.hh b/NPSimulation/Shield/ShieldScorers.hh
similarity index 100%
rename from NPSimulation/include/ShieldScorers.hh
rename to NPSimulation/Shield/ShieldScorers.hh
diff --git a/NPSimulation/src/W1.cc b/NPSimulation/W1/W1.cc
similarity index 100%
rename from NPSimulation/src/W1.cc
rename to NPSimulation/W1/W1.cc
diff --git a/NPSimulation/include/W1.hh b/NPSimulation/W1/W1.hh
similarity index 100%
rename from NPSimulation/include/W1.hh
rename to NPSimulation/W1/W1.hh
diff --git a/NPSimulation/src/W1Scorers.cc b/NPSimulation/W1/W1Scorers.cc
similarity index 100%
rename from NPSimulation/src/W1Scorers.cc
rename to NPSimulation/W1/W1Scorers.cc
diff --git a/NPSimulation/include/W1Scorers.hh b/NPSimulation/W1/W1Scorers.hh
similarity index 100%
rename from NPSimulation/include/W1Scorers.hh
rename to NPSimulation/W1/W1Scorers.hh
diff --git a/NPSimulation/scripts/copyfiles.sh b/NPSimulation/scripts/copyfiles.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9d726bc6063586dee99dffcc7467e88bd12b3816
--- /dev/null
+++ b/NPSimulation/scripts/copyfiles.sh
@@ -0,0 +1,57 @@
+# *****************************************************************************
+# * Copyright (C) 2009 this file is part of the NPTool Project *
+# * *
+# * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
+# * For the list of contributors see $NPTOOL/Licence/Contributors *
+# *****************************************************************************/
+
+# *****************************************************************************
+# * Original Author: N. de Sereville contact address: deserevi@ipno.in2p3.fr *
+# * *
+# * Creation Date : 16/11/10 *
+# * Last update : *
+# *---------------------------------------------------------------------------*
+# * Decription: This script loops on all subdirectories containing a Makefile *
+# * and call it with the argument passed to the script. *
+# * Supported arguments are: *
+# * + no arguments: compile everything *
+# * + clean: remove temporary files but not shared library *
+# * + distclean: remove temporary files and shared library *
+# * *
+# *---------------------------------------------------------------------------*
+# * Comment: *
+# * *
+# * *
+# *****************************************************************************
+
+#! /bin/bash
+
+# read .detector_libs or .core_libs file created by the configure script
+if [ $# = 0 ] ; then
+ file="../NPLib/.detector_libs"
+fi ;
+read -r detectorlibs < "$file"
+
+# loop recursively on Makefile files in sub-directories
+for dir in *
+do
+ # only treat directories
+ if [ -d "$dir" ]; then
+ dir=$(basename "$dir")
+ # file name in lower case
+ ldir=$(echo "$dir" | tr '[A-Z]' '[a-z]')
+ # only copy files associated to defined detector libraries
+ if echo "$detectorlibs" | grep -q "$ldir" ; then
+ # print informations
+ echo "\tCopying files from $ldir directory..."
+ # enter directory
+ cd $dir
+ # copy include files
+ cp *.hh ../include
+ # copy source files
+ cp *.cc ../src
+ # go back to top directory
+ cd ../
+ fi ;
+ fi
+done
diff --git a/NPSimulation/scripts/deletefiles.sh b/NPSimulation/scripts/deletefiles.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8451236a2dc09a2aebc2a4e2e2a9832921aad890
--- /dev/null
+++ b/NPSimulation/scripts/deletefiles.sh
@@ -0,0 +1,69 @@
+# *****************************************************************************
+# * Copyright (C) 2009 this file is part of the NPTool Project *
+# * *
+# * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
+# * For the list of contributors see $NPTOOL/Licence/Contributors *
+# *****************************************************************************/
+
+# *****************************************************************************
+# * Original Author: N. de Sereville contact address: deserevi@ipno.in2p3.fr *
+# * *
+# * Creation Date : 26/06/13 *
+# * Last update : *
+# *---------------------------------------------------------------------------*
+# * Decription: This script is in charge of deleting the headers and source *
+# * files associated with any detector found in the $NPS/include *
+# * and $NPS/src directories. *
+# * *
+# *---------------------------------------------------------------------------*
+# * Comment: *
+# * *
+# * *
+# *****************************************************************************
+
+#! /bin/bash
+
+incsrcdir="include src"
+
+# print informations
+echo " + Cleaning include directory from detectors' header files..."
+
+# loop recursively on include files in sub-directories
+for file in */*.hh
+do
+ header=$(basename "$file")
+ dir=$(dirname "$file")
+ # directory name in lower case
+ ldir=$(echo "$dir" | tr '[A-Z]' '[a-z]')
+ # delete files associated to all detector libraries
+ if ! echo "$incsrcdir" | grep -q "$ldir" ; then
+ # enter directory
+ cd include
+ # delete include files
+ rm -f $header
+ # go back to top directory
+ cd ../
+ fi ;
+done
+
+
+# print informations
+echo " + Cleaning src directory from detectors' source files..."
+
+# loop recursively on include files in sub-directories
+for file in */*.cc
+do
+ src=$(basename "$file")
+ dir=$(dirname "$file")
+ # directory name in lower case
+ ldir=$(echo "$dir" | tr '[A-Z]' '[a-z]')
+ # only delete files associated to defined detector libraries
+ if ! echo "$incsrcdir" | grep -q "$ldir" ; then
+ # enter directory
+ cd src
+ # delete include files
+ rm -f $src
+ # go back to top directory
+ cd ../
+ fi ;
+done
diff --git a/NPSimulation/src/DetectorConstruction.cc b/NPSimulation/src/DetectorConstruction.cc
index 42d212417c1f709a2fa40d68ca345f0e48fa2263..bdfa7a5e5158cc671b361c764f087fb150610a55 100644
--- a/NPSimulation/src/DetectorConstruction.cc
+++ b/NPSimulation/src/DetectorConstruction.cc
@@ -48,23 +48,70 @@
// Detector class
#include "../../NPLib/DetectorList.inc"
-#include "AnnularS1.hh"
#include "Chamber.hh"
+
+#ifdef INC_ANNULARS1
+#include "AnnularS1.hh"
+#endif
+
+#ifdef INC_COMPTONTELESCOPE
#include "ComptonTelescope.hh"
+#endif
+
+#ifdef INC_DUMMYDETECTOR
#include "DummyDetector.hh"
+#endif
+
+#ifdef INC_EUROGAM
#include "Eurogam.hh"
+#endif
+
+#ifdef INC_GASPARD
#include "GaspardTracker.hh"
+#endif
+
+#ifdef INC_HELIOS
#include "Helios.hh"
+#endif
+
+#ifdef INC_HYDE2
#include "Hyde2Tracker.hh"
+#endif
+
+#ifdef INC_MUST2
#include "MUST2Array.hh"
+#endif
+
+#ifdef INC_PARIS
#include "Paris.hh"
+#endif
+
+#ifdef INC_PLASTIC
#include "Plastic.hh"
+#endif
+
#include "Target.hh"
+
+#ifdef INC_SSSD
#include "ThinSi.hh"
+#endif
+
+#ifdef INC_SHARC
#include "Sharc.hh"
+#endif
+
+#ifdef INC_SHIELD
#include "Shield.hh"
+#endif
+
+#ifdef INC_TIGRESS
#include "Tigress.hh"
+#endif
+
+#ifdef INC_W1
#include "W1.hh"
+#endif
+
// STL
#include<cstdlib>
@@ -216,6 +263,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
////////////////////////////////////////////
else if (LineBuffer.compare(0, 16, "TheDUMMYDetector") == 0 && cDummy == false) {
cDummy = true ;
+#ifdef INC_DUMMYDETECTOR
if(VerboseLevel==1) cout << endl << "//////// DUMMY DETECTOR ////////" << endl << endl ;
// Instantiate the new array as a VDetector Object
@@ -228,6 +276,7 @@ void DetectorConstruction::ReadConfigurationFile(string Path){
// Add array to the VDetector Vector
AddDetector(myDetector) ;
+#endif
}
diff --git a/README/VERSION b/README/VERSION
index 7e32cd56983e65ffbfcfeb39146e7ee67e986e10..dc1e644a1014338ad0ca67b5c0bfbd2402e761ee 100644
--- a/README/VERSION
+++ b/README/VERSION
@@ -1 +1 @@
-1.3
+1.6.0