diff --git a/Inputs/DetectorConfiguration/e530.detector b/Inputs/DetectorConfiguration/e530.detector
index eee18b077898a61d6b3b0b211567cba73b7083e9..1f3220e4f908b635ee6083d00bb90e44b9c4bbd4 100644
--- a/Inputs/DetectorConfiguration/e530.detector
+++ b/Inputs/DetectorConfiguration/e530.detector
@@ -19,8 +19,8 @@
 GeneralTarget
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1
 Target
-	THICKNESS= 0
-	RADIUS= 0.1
+	THICKNESS= 4
+	RADIUS= 4
 	MATERIAL= CD2
 	ANGLE= 0
 	X= 0
diff --git a/NPSimulation/AnnularS1/AnnularS1.cc b/NPSimulation/AnnularS1/AnnularS1.cc
index 69c565a5b9928db8050bf76a2897afc7bb39c75c..3020106feab08dcd42cdc226d947e4ee68f46787 100644
--- a/NPSimulation/AnnularS1/AnnularS1.cc
+++ b/NPSimulation/AnnularS1/AnnularS1.cc
@@ -63,24 +63,21 @@ using namespace S1SCORERS;
 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-AnnularS1::AnnularS1()
-{
+AnnularS1::AnnularS1(){
    m_Event = new TS1Data();
 }
 
 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-AnnularS1::~AnnularS1()
-{
+AnnularS1::~AnnularS1(){
    delete m_Event;
 }
 
 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-void AnnularS1::AddModule(G4double PosZ)
-{
+void AnnularS1::AddModule(G4double PosZ){
    m_PosZ.push_back(PosZ);
 }
 
@@ -127,42 +124,15 @@ void AnnularS1::VolumeMaker(G4int             DetecNumber,
    G4Material* Silicon = new G4Material("Si", z = 14., a, density);
 
    // Al
-//   density = 2.702 * g / cm3;
-//   a = 26.98 * g / mole;
-//   G4Material* Aluminium = new G4Material("Aluminium", z = 13., a, density);
-
-   // Iron
-//   density = 7.874 * g / cm3;
-//   a = 55.847 * g / mole;
-//   G4Material* Iron = new G4Material("Iron", z = 26., a, density);
-
-   // CsI
-   density = 4.51 * g / cm3;
-   G4Material* CsI = new G4Material("CsI", density, ncomponents = 2);
-   CsI->AddElement(Cs , natoms = 1);
-   CsI->AddElement(I  , natoms = 1);
+   density = 2.702 * g / cm3;
+   a = 26.98 * g / mole;
+   G4Material* Aluminium = new G4Material("Aluminium", z = 13., a, density);
 
    //  Vacuum
    density = 0.000000001 * mg / cm3;
    G4Material* Vacuum = new G4Material("Vacuum", density, ncomponents = 2);
    Vacuum->AddElement(N, .7);
    Vacuum->AddElement(O, .3);
-
-   //  Mylar
-   density = 1.397 * g / cm3;
-   G4Material* Myl = new G4Material("Mylar", density, ncomponents = 3);
-   Myl->AddElement(C, natoms = 10);
-   Myl->AddElement(H, natoms = 8);
-   Myl->AddElement(O, natoms = 4);
-
-   // Havar
-   G4Material* Harvar = new G4Material("Havar", 8.3*g / cm3, 5);
-   Harvar->AddElement(Co , 42);
-   Harvar->AddElement(Cr , 20);
-   Harvar->AddElement(Ni , 13);
-   Harvar->AddElement(Fe , 19);
-   Harvar->AddElement(W  ,  1);
-
    ////////////////////////////////////////////////////////////////
    ////////////// Starting Volume Definition //////////////////////
    ////////////////////////////////////////////////////////////////
@@ -177,7 +147,6 @@ void AnnularS1::VolumeMaker(G4int             DetecNumber,
                                 0*deg, 
                                 360*deg);
 
-//   G4LogicalVolume* logicAnnularS1 = new G4LogicalVolume(solidAnnularS1, Iron, Name, 0, 0, 0);
    G4LogicalVolume* logicAnnularS1 = new G4LogicalVolume(solidAnnularS1, Vacuum, Name, 0, 0, 0);
 
    new G4PVPlacement(G4Transform3D(*rotation, position),
@@ -188,7 +157,6 @@ void AnnularS1::VolumeMaker(G4int             DetecNumber,
                                      0);
 
    logicAnnularS1->SetVisAttributes(G4VisAttributes::Invisible);
-   if (m_non_sensitive_part_visiualisation) logicAnnularS1->SetVisAttributes(G4VisAttributes(G4Colour(0.90, 0.90, 0.90)));
 
 
    // Aluminium dead layers
@@ -202,8 +170,7 @@ void AnnularS1::VolumeMaker(G4int             DetecNumber,
                                       0*deg, 
                                       360*deg); 
 
-//   G4LogicalVolume* logicAluStrip = new G4LogicalVolume(solidAluStrip, Aluminium, "logicAluStrip", 0, 0, 0);
-   G4LogicalVolume* logicAluStrip = new G4LogicalVolume(solidAluStrip, Vacuum, "logicAluStrip", 0, 0, 0);
+   G4LogicalVolume* logicAluStrip = new G4LogicalVolume(solidAluStrip, Aluminium, "logicAluStrip", 0, 0, 0);
 
    new G4PVPlacement(0, positionAluStripFront, logicAluStrip, Name + "_AluStripFront", logicAnnularS1, false, 0);
    new G4PVPlacement(0, positionAluStripBack,  logicAluStrip, Name + "_AluStripBack",  logicAnnularS1, false, 0);
@@ -229,7 +196,7 @@ void AnnularS1::VolumeMaker(G4int             DetecNumber,
 
    ///Visualisation of Silicon Strip
 //   G4VisAttributes* SiliconVisAtt = new G4VisAttributes(G4Colour(0.5, 0.5, 0.5));
-   G4VisAttributes* SiliconVisAtt = new G4VisAttributes(G4Colour(0.0, 0.0, 0.9));
+   G4VisAttributes* SiliconVisAtt = new G4VisAttributes(G4Colour(0.3, 0.3, 0.3));
    logicSilicon->SetVisAttributes(SiliconVisAtt);
 }
 
@@ -242,8 +209,7 @@ void AnnularS1::VolumeMaker(G4int             DetecNumber,
 
 // Read stream at Configfile to pick-up parameters of detector (Position,...)
 // Called in DetecorConstruction::ReadDetextorConfiguration Method
-void AnnularS1::ReadConfiguration(string Path)
-{
+void AnnularS1::ReadConfiguration(string Path){
    ifstream ConfigFile;
    ConfigFile.open(Path.c_str());
    string LineBuffer, DataBuffer;
diff --git a/NPSimulation/AnnularS1/AnnularS1.hh b/NPSimulation/AnnularS1/AnnularS1.hh
index d21ca62a615d48983c1b65be9a7da38369916411..61aa963b3187eb5dce4f52f29c9cc2076554c1f5 100644
--- a/NPSimulation/AnnularS1/AnnularS1.hh
+++ b/NPSimulation/AnnularS1/AnnularS1.hh
@@ -25,6 +25,7 @@
 // C++ headers
 #include <vector>
 using namespace std;
+
using namespace CLHEP;
 
 // NPTool header
 #include "VDetector.hh"
@@ -114,20 +115,16 @@ namespace ANNULARS1
 {
    // Energy/Time resolutions for the different layers
    const G4double ResoFirstStage  = 0              ;// = 52keV of Resolution   //   Unit is MeV/2.35
-//   const G4double ResoFirstStage  = 0.022          ;// = 52keV of Resolution   //   Unit is MeV/2.35
    const G4double ResoSecondStage = 0.055          ;// = 130 keV of resolution //   Unit is MeV/2.35
    const G4double ResoThirdStage  = 0              ;// = 100 keV of resolution //   Unit is MeV/2.35
-//   const G4double ResoThirdStage  = 0.043          ;// = 100 kev of resolution //   Unit is MeV/2.35
    const G4double ResoTimeGpd     = 0.212765957    ;// = 500ps                 //   Unit is  ns/2.35
    const G4double ResoTimePPAC    = 0.106382979    ;// = 250ps                 //   Unit is  ns/2.35
 
    // Geometry
    const G4double Rmin   =  46/2*mm;
    const G4double Rmax   = 100/2*mm;
-   const G4double Length = 10*mm;
-
+   
    // First stage
-//   const G4double AluStripThickness = 0.00000001*micrometer;
    const G4double AluStripThickness   = 0.4*micrometer;
    const G4double FirstStageThickness = 500*micrometer;
    const G4double FirstStageRmin      = 48/2*mm;
@@ -138,6 +135,8 @@ namespace ANNULARS1
    const G4int NbThetaStrips   = 16;
    const G4int NbThetaQuadrant = 4;
 
+   const G4double Length = AluStripThickness*2+FirstStageThickness;
+
    // Starting at the front and going in direction of third stage
    const G4double AluStripFront_PosZ = Length* -0.5       + 0.5*AluStripThickness;
    const G4double Silicon_PosZ       = AluStripFront_PosZ + 0.5*AluStripThickness   + 0.5*FirstStageThickness;
diff --git a/NPSimulation/AnnularS1/AnnularS1Scorers.cc b/NPSimulation/AnnularS1/AnnularS1Scorers.cc
index 04ef13933a13fdda80d4cb00fd5ad2915e233a6e..1ca06959870e0ae86c6efdf00afb8e5ae8ef5949 100644
--- a/NPSimulation/AnnularS1/AnnularS1Scorers.cc
+++ b/NPSimulation/AnnularS1/AnnularS1Scorers.cc
@@ -23,7 +23,6 @@
 #include "AnnularS1Scorers.hh"
 #include "G4UnitsTable.hh"
 #include "AnnularS1.hh"
-
 using namespace ANNULARS1;
 using namespace S1SCORERS;
 
diff --git a/NPSimulation/AnnularS1/AnnularS1Scorers.hh b/NPSimulation/AnnularS1/AnnularS1Scorers.hh
index 8703693a7639318bfa2336b7890bcd6ec96676e8..98f5fe16131c6ed658d2be96ef4ddcebd1d7a7bf 100644
--- a/NPSimulation/AnnularS1/AnnularS1Scorers.hh
+++ b/NPSimulation/AnnularS1/AnnularS1Scorers.hh
@@ -23,7 +23,7 @@
 
 #include "G4VPrimitiveScorer.hh"
 #include "G4THitsMap.hh"
-
+using namespace CLHEP;
 namespace S1SCORERS
 {
    // This Threshold is used in all scorers
diff --git a/NPSimulation/ComptonTelescope/ComptonTelescope.hh b/NPSimulation/ComptonTelescope/ComptonTelescope.hh
index f0a931c4b1fbaf45ad9e84a50b8959d51131e5d1..f01b5bee439ec8a5bf707adb272c39aee82c8ce9 100644
--- a/NPSimulation/ComptonTelescope/ComptonTelescope.hh
+++ b/NPSimulation/ComptonTelescope/ComptonTelescope.hh
@@ -36,6 +36,7 @@
 // C++ headers
 #include <vector>
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/DummyDetector/DummyDetector.hh b/NPSimulation/DummyDetector/DummyDetector.hh
index 74b66c39e942010de75af65adb6a95ed51028f18..d99d1f50117d5d83d1904ed80561dbd4f6335fa3 100644
--- a/NPSimulation/DummyDetector/DummyDetector.hh
+++ b/NPSimulation/DummyDetector/DummyDetector.hh
@@ -43,6 +43,7 @@
 #include "TDUMMYDetectorData.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 class DUMMYDetector : public VDetector
 {
diff --git a/NPSimulation/Eurogam/Eurogam.hh b/NPSimulation/Eurogam/Eurogam.hh
index 714c663d5f9fc6284e12fb9c7eba33671a8a2886..b173135673fd3a5eeceea0964f2bd2b4c2e5f066 100644
--- a/NPSimulation/Eurogam/Eurogam.hh
+++ b/NPSimulation/Eurogam/Eurogam.hh
@@ -40,6 +40,7 @@
 #include "TEurogamData.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 class Eurogam : public VDetector
 {
diff --git a/NPSimulation/GASPARD/GaspardTracker.hh b/NPSimulation/GASPARD/GaspardTracker.hh
index 69175a7d5bb8ed5dbe881e725fa975abf90f2e6d..ff730db15eb2af6b907187c33f71a125a373e0bd 100644
--- a/NPSimulation/GASPARD/GaspardTracker.hh
+++ b/NPSimulation/GASPARD/GaspardTracker.hh
@@ -30,6 +30,8 @@
 #include "GaspardTrackerModule.hh"
 
 using namespace std;
+
using namespace CLHEP;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/GASPARD/GaspardTrackerAnnular.hh b/NPSimulation/GASPARD/GaspardTrackerAnnular.hh
index e5c2882ca2101baf780e47335d2ce045a70706bc..bffb43bded193e6e52c0bfbaa27acd359f6ca802 100644
--- a/NPSimulation/GASPARD/GaspardTrackerAnnular.hh
+++ b/NPSimulation/GASPARD/GaspardTrackerAnnular.hh
@@ -30,6 +30,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/GASPARD/GaspardTrackerDummyShape.hh b/NPSimulation/GASPARD/GaspardTrackerDummyShape.hh
index 2295cba7018c3d11d74cc89fe195b00eaaa2a34d..65b76dc28f7f20bbeac1778824f7ede7cf3caa0d 100644
--- a/NPSimulation/GASPARD/GaspardTrackerDummyShape.hh
+++ b/NPSimulation/GASPARD/GaspardTrackerDummyShape.hh
@@ -33,6 +33,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/GASPARD/GaspardTrackerModule.hh b/NPSimulation/GASPARD/GaspardTrackerModule.hh
index efd99b36baa2c88aefbd94df4ac84c9f3c81febd..72ee7ddd90900afee4e058427e9056717ca7ec2e 100644
--- a/NPSimulation/GASPARD/GaspardTrackerModule.hh
+++ b/NPSimulation/GASPARD/GaspardTrackerModule.hh
@@ -37,6 +37,7 @@
 #include "TGaspardTrackerData.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/GASPARD/GaspardTrackerSquare.hh b/NPSimulation/GASPARD/GaspardTrackerSquare.hh
index f10b9cb9d417ef0688a2c0218a8eac7dec9c4a81..03651afcf1e46ac5fd80136ab3d09c916c5fb966 100644
--- a/NPSimulation/GASPARD/GaspardTrackerSquare.hh
+++ b/NPSimulation/GASPARD/GaspardTrackerSquare.hh
@@ -29,6 +29,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/GASPARD/GaspardTrackerTrapezoid.hh b/NPSimulation/GASPARD/GaspardTrackerTrapezoid.hh
index 9834babc3c4921e179ca6c4e29e3834605db47c3..01756747e0e76d84f295427da22897deb5695fc6 100644
--- a/NPSimulation/GASPARD/GaspardTrackerTrapezoid.hh
+++ b/NPSimulation/GASPARD/GaspardTrackerTrapezoid.hh
@@ -31,6 +31,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Helios/Helios.hh b/NPSimulation/Helios/Helios.hh
index 5272bbb87dff697e326e46e24beac6399cf181e2..3ade31aac36a64887786656e71b4260f13ddc71e 100644
--- a/NPSimulation/Helios/Helios.hh
+++ b/NPSimulation/Helios/Helios.hh
@@ -31,6 +31,7 @@
 #include "HeliosModule.hh"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Helios/HeliosDetDummyShape.hh b/NPSimulation/Helios/HeliosDetDummyShape.hh
index 08564b61de664ae7908aaece2fe6563c0db896a3..7afa65fec4ab77a58dfcbbcdb3f84aaa8cc1d064 100644
--- a/NPSimulation/Helios/HeliosDetDummyShape.hh
+++ b/NPSimulation/Helios/HeliosDetDummyShape.hh
@@ -32,6 +32,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Helios/HeliosModule.hh b/NPSimulation/Helios/HeliosModule.hh
index b3a0b89f50846d97d025b62c299f1775359c9ad2..1717514d5a91a508c0eb6571fb3715dd5bb19ff6 100644
--- a/NPSimulation/Helios/HeliosModule.hh
+++ b/NPSimulation/Helios/HeliosModule.hh
@@ -36,6 +36,7 @@
 #include "THeliosData.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Hyde2/Hyde2Tracker.hh b/NPSimulation/Hyde2/Hyde2Tracker.hh
index 00c26ff5acb3a0a2de1a5d73160a9dfed4f8d884..98d9573c0232f15e1fd231829df3ca410e2755ef 100644
--- a/NPSimulation/Hyde2/Hyde2Tracker.hh
+++ b/NPSimulation/Hyde2/Hyde2Tracker.hh
@@ -31,6 +31,7 @@
 #include "Hyde2TrackerModule.hh"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Hyde2/Hyde2TrackerModule.hh b/NPSimulation/Hyde2/Hyde2TrackerModule.hh
index 4ea863639451788496f209f4c99871c14c2bf9dd..0d6966c048bab746091dd94cf8e80fa3bce24e63 100644
--- a/NPSimulation/Hyde2/Hyde2TrackerModule.hh
+++ b/NPSimulation/Hyde2/Hyde2TrackerModule.hh
@@ -36,6 +36,7 @@
 #include "THyde2TrackerData.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Hyde2/Hyde2TrackerSquare1.hh b/NPSimulation/Hyde2/Hyde2TrackerSquare1.hh
index ab6f53da6a40aacff4be829964197a733fbf2d04..8fbb4f9ee0d69a6c35416006a0aef695fe5477a4 100644
--- a/NPSimulation/Hyde2/Hyde2TrackerSquare1.hh
+++ b/NPSimulation/Hyde2/Hyde2TrackerSquare1.hh
@@ -30,6 +30,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Hyde2/Hyde2TrackerTrapezoid1.hh b/NPSimulation/Hyde2/Hyde2TrackerTrapezoid1.hh
index 595b9b115434e749132a0018353b428abf51a0aa..0a2fe0cab3cd373dd017ee94c096e0de45436ee7 100644
--- a/NPSimulation/Hyde2/Hyde2TrackerTrapezoid1.hh
+++ b/NPSimulation/Hyde2/Hyde2TrackerTrapezoid1.hh
@@ -30,6 +30,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Hyde2/Hyde2TrackerTrapezoid2.hh b/NPSimulation/Hyde2/Hyde2TrackerTrapezoid2.hh
index 3f9559e2e911be217d62a84eb5f091cb59aaecb1..bb8ce7ca64394822eed40050212885fb2e1c8e33 100644
--- a/NPSimulation/Hyde2/Hyde2TrackerTrapezoid2.hh
+++ b/NPSimulation/Hyde2/Hyde2TrackerTrapezoid2.hh
@@ -30,6 +30,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/MUST2/MUST2Scorers.hh b/NPSimulation/MUST2/MUST2Scorers.hh
index 46fb11198c0d49e149e1926609424aeeb4de1e8a..58ba7d8342711bc394191bd3d3251f56690ef0a1 100644
--- a/NPSimulation/MUST2/MUST2Scorers.hh
+++ b/NPSimulation/MUST2/MUST2Scorers.hh
@@ -26,6 +26,8 @@
  *****************************************************************************/
 #include "G4VPrimitiveScorer.hh"
 #include "G4THitsMap.hh"
+using namespace CLHEP;
+
 namespace MUST2 {
    //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    //   This Threshold is used in the above scorer. Any energy deposit under this threshold will not create an entry.
diff --git a/NPSimulation/Paris/Paris.hh b/NPSimulation/Paris/Paris.hh
index 956f47ccadbf3cd8e1f3e0f1e36631ee600c59ad..3ee1aa4f5bb496d7fecb006d90435f1223b42523 100644
--- a/NPSimulation/Paris/Paris.hh
+++ b/NPSimulation/Paris/Paris.hh
@@ -30,9 +30,9 @@
 // NPTool header
 #include "VDetector.hh"
 #include "ParisModule.hh"
-
 using namespace std;
-
+#include "CLHEP/Units/SystemOfUnits.h"
+using namespace CLHEP;
 
 
 class Paris : public VDetector
diff --git a/NPSimulation/Paris/ParisCluster.hh b/NPSimulation/Paris/ParisCluster.hh
index e5c9f8797e4d6107178d9e0a3a7e07335677a7f9..6dcb2bddfec047b277d6309e0d1362fdd7e2e017 100644
--- a/NPSimulation/Paris/ParisCluster.hh
+++ b/NPSimulation/Paris/ParisCluster.hh
@@ -31,6 +31,8 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+#include "CLHEP/Units/SystemOfUnits.h"
+using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Paris/ParisModule.hh b/NPSimulation/Paris/ParisModule.hh
index 3cf779b4c3feaa8008c6636a834bd9b64b1fc939..89524b99985079f886687a9208777b2117b33f30 100644
--- a/NPSimulation/Paris/ParisModule.hh
+++ b/NPSimulation/Paris/ParisModule.hh
@@ -37,6 +37,8 @@
 #include "TParisData.h"
 
 using namespace std;
+#include"CLHEP/Units/SystemOfUnits.h"
+using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Paris/ParisPhoswich.hh b/NPSimulation/Paris/ParisPhoswich.hh
index 36da6f1d385ff9adb2f09df78952b81ce9d6fa00..1d6008141dc3b671412a35fcacd1ae47e6e4ba46 100644
--- a/NPSimulation/Paris/ParisPhoswich.hh
+++ b/NPSimulation/Paris/ParisPhoswich.hh
@@ -31,6 +31,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Plastic/Plastic.hh b/NPSimulation/Plastic/Plastic.hh
index c2c96a6483240054afc9878ce624a8b8a2d93725..eb1231ceadb59c262062299fd0d69dfb314b6e07 100644
--- a/NPSimulation/Plastic/Plastic.hh
+++ b/NPSimulation/Plastic/Plastic.hh
@@ -41,6 +41,7 @@
 #include "TPlasticData.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 class Plastic : public VDetector
 {
diff --git a/NPSimulation/SSSD/ThinSi.hh b/NPSimulation/SSSD/ThinSi.hh
index df28fda410ef3e342c2e35f65f252b8fa9740ecd..df8bcc5efe2d3426b2b57a8f5e034a3ea702ec10 100644
--- a/NPSimulation/SSSD/ThinSi.hh
+++ b/NPSimulation/SSSD/ThinSi.hh
@@ -38,6 +38,7 @@
 // NPLib 
 #include "TSSSDData.h"
 using namespace std;
+
using namespace CLHEP;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 namespace THINSI
diff --git a/NPSimulation/SSSD/ThinSiScorers.hh b/NPSimulation/SSSD/ThinSiScorers.hh
index 61e348a19315f2973fac2dbb971e3ef353f32eb7..afb115bfd3d38610fd729c2cf410c2a2d17cb18a 100644
--- a/NPSimulation/SSSD/ThinSiScorers.hh
+++ b/NPSimulation/SSSD/ThinSiScorers.hh
@@ -26,7 +26,8 @@
  *****************************************************************************/
 #include "G4VPrimitiveScorer.hh"
 #include "G4THitsMap.hh"
-
+#include "CLHEP/Units/SystemOfUnits.h"
+using namespace CLHEP;
 namespace THINSI {
    //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    //   This Threshold is used in the above scorer. Any energy deposit under this threshold will not create an entry.
diff --git a/NPSimulation/Sharc/Sharc.hh b/NPSimulation/Sharc/Sharc.hh
index 5249029eada050e8a20a90ecef5c180b08f61161..6f6ad269d3550123e687e6aae1c66413708f5b5b 100644
--- a/NPSimulation/Sharc/Sharc.hh
+++ b/NPSimulation/Sharc/Sharc.hh
@@ -40,6 +40,7 @@
 // NPLib
 #include "TSharcData.h"
 using namespace std;
+
using namespace CLHEP;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 namespace SHARC
diff --git a/NPSimulation/Sharc/SharcScorers.hh b/NPSimulation/Sharc/SharcScorers.hh
index 08c59c9e9729e921364182517eb94e5f3508d53d..54f0fee13ae38ce6141255ec6d5f772f5b9cb20a 100644
--- a/NPSimulation/Sharc/SharcScorers.hh
+++ b/NPSimulation/Sharc/SharcScorers.hh
@@ -29,6 +29,7 @@
 
 #include <map>
 using namespace std;
+
using namespace CLHEP;
 
 namespace SHARC {
   //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/NPSimulation/Shield/Shield.hh b/NPSimulation/Shield/Shield.hh
index b60a2757868a1971c88e1bde92c800523be80bc3..5eac901e6d24ca90a99967e9b0803a962dd8c064 100644
--- a/NPSimulation/Shield/Shield.hh
+++ b/NPSimulation/Shield/Shield.hh
@@ -32,6 +32,7 @@
 #include "ShieldModule.hh"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Shield/ShieldClParis.hh b/NPSimulation/Shield/ShieldClParis.hh
index c0260d423720100f6f0ad68501f1f5a4c5b0fc81..fe3ab4cf0879a7db0c6c1cdb867542a354ea30d4 100644
--- a/NPSimulation/Shield/ShieldClParis.hh
+++ b/NPSimulation/Shield/ShieldClParis.hh
@@ -33,6 +33,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Shield/ShieldModule.hh b/NPSimulation/Shield/ShieldModule.hh
index 1499880cd8035513a25b3e42005ad1655b53e34b..d739c61c0d366f014e79b7731391a67334821e03 100644
--- a/NPSimulation/Shield/ShieldModule.hh
+++ b/NPSimulation/Shield/ShieldModule.hh
@@ -37,6 +37,7 @@
 #include "TShieldData.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Shield/ShieldPhParis.hh b/NPSimulation/Shield/ShieldPhParis.hh
index b791dce8906794148f0fca41e240a9dae53b3973..9a45e0f228f39645da658d9f812d788348d246cb 100644
--- a/NPSimulation/Shield/ShieldPhParis.hh
+++ b/NPSimulation/Shield/ShieldPhParis.hh
@@ -32,6 +32,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/Tiara/Tiara.hh b/NPSimulation/Tiara/Tiara.hh
index 55ebdad918d7a1c22e2654eb2abdacb5a17fbf7d..6afb431cc2756596626cd58d6713e035369702ca 100644
--- a/NPSimulation/Tiara/Tiara.hh
+++ b/NPSimulation/Tiara/Tiara.hh
@@ -42,6 +42,7 @@
 #include "TTiaraHyballData.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 namespace TIARA
diff --git a/NPSimulation/Tigress/Tigress.hh b/NPSimulation/Tigress/Tigress.hh
index 7a36d20193a2c0633c51ede95bae1419312cf4f8..1baf166b978ec9efbd5daa999842976e94a65cd5 100644
--- a/NPSimulation/Tigress/Tigress.hh
+++ b/NPSimulation/Tigress/Tigress.hh
@@ -40,6 +40,7 @@
 // NPLib
 #include "TTigressData.h"
 using namespace std;
+
using namespace CLHEP;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 namespace TIGRESS
diff --git a/NPSimulation/W1/W1.hh b/NPSimulation/W1/W1.hh
index 483f3cbcd4136b2d8df8d8dacc7cde07f34e6497..eb6c20057b84e8bb5fc0c115632db06ddf2019c3 100644
--- a/NPSimulation/W1/W1.hh
+++ b/NPSimulation/W1/W1.hh
@@ -36,6 +36,7 @@
 #include "TW1Data.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/include/Chamber.hh b/NPSimulation/include/Chamber.hh
index e12941cf1c57d64e634c8f209921bb4f57f7053f..4d61de321c37cd351a2ffe4c7f7f952665ef2031 100644
--- a/NPSimulation/include/Chamber.hh
+++ b/NPSimulation/include/Chamber.hh
@@ -37,6 +37,7 @@
 #include "VDetector.hh"
 
 using namespace std;
+
using namespace CLHEP;
 
 class Chamber : public VDetector
 {
diff --git a/NPSimulation/include/EventGeneratorGammaDecay.hh b/NPSimulation/include/EventGeneratorGammaDecay.hh
index 3cfd1d2e056be2114e416024ed1e96a6c96fd59e..42b50178ebfde8257b731eafef8830d6c46c439c 100644
--- a/NPSimulation/include/EventGeneratorGammaDecay.hh
+++ b/NPSimulation/include/EventGeneratorGammaDecay.hh
@@ -33,7 +33,6 @@
 #include <string>
 #include <iostream>
 using namespace std;
-
 // NPSimulation
 #include "VEventGenerator.hh"
 #include "Target.hh"
@@ -76,4 +75,4 @@ public: // Managing the different cascade
   // Read all the added cscade en instentiate every thing that is needed
   void PrepareCascade();
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/NPSimulation/include/EventGeneratorIsotropic.hh b/NPSimulation/include/EventGeneratorIsotropic.hh
index c2d7c8dd21bc9edb0b160db91fa1fb5b6da4af94..6a7b2ab02e186edd064e1dc55b26adfd8c998181 100644
--- a/NPSimulation/include/EventGeneratorIsotropic.hh
+++ b/NPSimulation/include/EventGeneratorIsotropic.hh
@@ -24,6 +24,7 @@
 // C++ header
 #include <string>
 using namespace std;
+
using namespace CLHEP;
 
 // G4 headers
 #include "G4Event.hh"
diff --git a/NPSimulation/include/EventGeneratorParticleDecay.hh b/NPSimulation/include/EventGeneratorParticleDecay.hh
index c38bf69b4d9fdee374eac7c93543054abdca42ca..22ec3b032c60caaf5c4e9533f9fcf0b7345c8ffb 100644
--- a/NPSimulation/include/EventGeneratorParticleDecay.hh
+++ b/NPSimulation/include/EventGeneratorParticleDecay.hh
@@ -84,4 +84,4 @@ public: // Managing the decay
         // Set everything for the decay
   void SetDecay(vector<string> DaughterName, vector<bool> shoot, vector<double> ExcitationEnergy, string CSPath , string CSName);
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/NPSimulation/include/EventGeneratorTwoBodyReaction.hh b/NPSimulation/include/EventGeneratorTwoBodyReaction.hh
index 467bd71166c673f78f74bc362737bb830d81f766..a430066661e1efd117e65039d2fca6f91c7ca79f 100644
--- a/NPSimulation/include/EventGeneratorTwoBodyReaction.hh
+++ b/NPSimulation/include/EventGeneratorTwoBodyReaction.hh
@@ -40,6 +40,7 @@
 #include "NPReaction.h"
 
 using namespace std;
+
using namespace CLHEP;
 using namespace NPL ;
 
 
diff --git a/NPSimulation/include/GeneralScorers.hh b/NPSimulation/include/GeneralScorers.hh
index 7371587438750b6cdf524601b5bcb59607f48890..437f5f43a22f1e3bc74554b2c6a722636644093f 100644
--- a/NPSimulation/include/GeneralScorers.hh
+++ b/NPSimulation/include/GeneralScorers.hh
@@ -26,7 +26,7 @@
  *****************************************************************************/
 #include "G4VPrimitiveScorer.hh"
 #include "G4THitsMap.hh"
-
+using namespace CLHEP;
 namespace GENERALSCORERS
    {
          //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/NPSimulation/include/MyMagneticField.hh b/NPSimulation/include/MyMagneticField.hh
index 252d61951fe748494ef4f58931bde83c05781b6a..58f0cf8867bcc8dc2c220e6fbb178601de931037 100644
--- a/NPSimulation/include/MyMagneticField.hh
+++ b/NPSimulation/include/MyMagneticField.hh
@@ -26,6 +26,8 @@
 #include "globals.hh"
 #include "G4MagneticField.hh"
 #include "G4ThreeVector.hh"
+#include "CLHEP/Units/SystemOfUnits.h"
+using namespace CLHEP;
 
 class MyMagneticField : public G4MagneticField
 {
diff --git a/NPSimulation/include/Particle.hh b/NPSimulation/include/Particle.hh
index 1fdb3c45f016b3d8534f065ac674397182cee415..ece5946ed26f87940f09f42889ef1436302f01b3 100644
--- a/NPSimulation/include/Particle.hh
+++ b/NPSimulation/include/Particle.hh
@@ -26,7 +26,8 @@
 // G4
 #include"G4ParticleDefinition.hh"
 #include"G4ThreeVector.hh"
-
+#include"CLHEP/Units/SystemOfUnits.h"
+using namespace CLHEP;
 class Particle{
   
 public: // Constructor and Destructor
@@ -60,4 +61,4 @@ public: // Setter and Getter
   void SetParticleMomentumDirection(G4ThreeVector);
   void SetShootStatus(bool);
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/NPSimulation/include/ParticleStack.hh b/NPSimulation/include/ParticleStack.hh
index 92abb3d86ed343adab93cb774554c11f317a8567..d9375bd575de80e5daa8aff6f8e3948d7fb9ea91 100644
--- a/NPSimulation/include/ParticleStack.hh
+++ b/NPSimulation/include/ParticleStack.hh
@@ -32,6 +32,7 @@
 #include <vector>
 #include <string>
 using namespace std;
+
using namespace CLHEP;
 
 // G4
 #include "G4ParticleGun.hh"
@@ -97,4 +98,4 @@ public: // Particle management and shooting method
     // Shoot everything in the stack at the end of the event
     void ShootAllParticle(G4Event* anEvent);
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/NPSimulation/include/PhysicsList.hh b/NPSimulation/include/PhysicsList.hh
index 47f37522f40de3e5439fee8d0f863b1ab1086aa4..23c9cb275908f3d08d8578d023379ec4b14b2057 100644
--- a/NPSimulation/include/PhysicsList.hh
+++ b/NPSimulation/include/PhysicsList.hh
@@ -24,7 +24,8 @@
  *****************************************************************************/
 #include "G4VUserPhysicsList.hh"
 #include "globals.hh"
-
+#include "CLHEP/Units/SystemOfUnits.h"
+using namespace CLHEP;
 class PhysicsList: public G4VUserPhysicsList
 {
 public:
diff --git a/NPSimulation/include/PrimaryGeneratorAction.hh b/NPSimulation/include/PrimaryGeneratorAction.hh
index 478d60ef98d117d5eb12d844f78cc92017c5b113..fe37ad5a623778f06090663461ef11a9a08cb1f2 100644
--- a/NPSimulation/include/PrimaryGeneratorAction.hh
+++ b/NPSimulation/include/PrimaryGeneratorAction.hh
@@ -34,6 +34,7 @@
 #include "DetectorConstruction.hh"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/include/ResistiveStripScorers.hh b/NPSimulation/include/ResistiveStripScorers.hh
index 55f75cba749cb152114eb7c93fc8deedf7c8eb85..dcb2ee59b5ab186a0053b943dac266ab87fa2750 100644
--- a/NPSimulation/include/ResistiveStripScorers.hh
+++ b/NPSimulation/include/ResistiveStripScorers.hh
@@ -29,6 +29,7 @@
 
 #include <map>
 using namespace std;
+
using namespace CLHEP;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
diff --git a/NPSimulation/include/Target.hh b/NPSimulation/include/Target.hh
index 0348a77ec23a9956c4f4760af22a174af33dd5d4..c2fdf24052176cc67e8d4ad7a4ed9595844fb063 100644
--- a/NPSimulation/include/Target.hh
+++ b/NPSimulation/include/Target.hh
@@ -42,6 +42,7 @@
 #include "VDetector.hh"
 
 using namespace std;
+
using namespace CLHEP;
 
 class Target : public VDetector{
 public:
diff --git a/NPSimulation/include/VDetector.hh b/NPSimulation/include/VDetector.hh
index a5ff1c7e19e81149b5e566eb94ac6ba5ba4c828e..befe1d4624f9447c96cecdd74c61101f9bc1fd64 100644
--- a/NPSimulation/include/VDetector.hh
+++ b/NPSimulation/include/VDetector.hh
@@ -50,6 +50,7 @@
 #include "TInteractionCoordinates.h"
 
 using namespace std;
+
using namespace CLHEP;
 
 
 class VDetector
diff --git a/NPSimulation/include/VEventGenerator.hh b/NPSimulation/include/VEventGenerator.hh
index 8a46fab7ec650a3af85c7ae752939341d4ccb9f5..b2a9dd718da334ad52c53cd479ce356760532b21 100644
--- a/NPSimulation/include/VEventGenerator.hh
+++ b/NPSimulation/include/VEventGenerator.hh
@@ -43,6 +43,7 @@
 
 using namespace CLHEP;
 using namespace std;
+
using namespace CLHEP;
 
 
 
diff --git a/NPSimulation/src/GeneralScorers.cc b/NPSimulation/src/GeneralScorers.cc
index 2c8b404214b1ce639a7891237b02aacd8dbb722a..796883071f215a424282d829804dc1b0e623870e 100644
--- a/NPSimulation/src/GeneralScorers.cc
+++ b/NPSimulation/src/GeneralScorers.cc
@@ -25,7 +25,7 @@
 #include "GeneralScorers.hh"
 #include "G4UnitsTable.hh"
 using namespace GENERALSCORERS ;
-
+using namespace CLHEP;
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 //   The following function is used in many scorer. following the Detector Volume Nomenclature