diff --git a/NPSimulation/Core/NPIonIonInelasticPhysic.cc b/NPSimulation/Core/NPIonIonInelasticPhysic.cc
index de22cc9f9baac380d9485d7faa9db55c39d4f77d..6044dab391228f5a0b1963766ebe0febf041c11a 100755
--- a/NPSimulation/Core/NPIonIonInelasticPhysic.cc
+++ b/NPSimulation/Core/NPIonIonInelasticPhysic.cc
@@ -65,6 +65,7 @@
 #include "G4IonInelasticProcess.hh"
 #include "G4GeneralSpaceNNCrossSection.hh"
 
+using namespace std;
 /////////////////////////////////////////////////////////////////////////////
 NPIonIonInelasticPhysic::NPIonIonInelasticPhysic(const G4String& name):
 G4VPhysicsConstructor(name)
@@ -100,8 +101,12 @@ void NPIonIonInelasticPhysic::ConstructProcess()
     G4TripathiLightCrossSection* TripathiLightCrossSections = new G4TripathiLightCrossSection;
     G4IonsShenCrossSection* ShenCrossSections = new G4IonsShenCrossSection;
     
+<<<<<<< HEAD
     G4ComponentGGHadronNucleusXsc* GlauberGribovCrossSection = new G4ComponentGGHadronNucleusXsc;
     G4CrossSectionInelastic* GlauberGribovDataSet = new G4CrossSectionInelastic(GlauberGribovCrossSection);
+=======
+    //G4CrossSectionInelastic* GlauberGribovDataSet = new G4CrossSectionInelastic(GlauberGribovCrossSection);
+>>>>>>> 022122b8890389e03443cc495d6b580ce752d060
     
     // ******************
     // **** Elastic ****
diff --git a/NPSimulation/Detectors/NeutronWall/NeutronWall.cc b/NPSimulation/Detectors/NeutronWall/NeutronWall.cc
index 7c770cabc05616760a8a8ac139f319a83a1c1a8e..aab029a161b1d281fde81e732fb8a13a8fbf4052 100644
--- a/NPSimulation/Detectors/NeutronWall/NeutronWall.cc
+++ b/NPSimulation/Detectors/NeutronWall/NeutronWall.cc
@@ -60,9 +60,9 @@ using namespace CLHEP;
 namespace NeutronWall_NS{
     // Energy and time Resolution
     const double EnergyThreshold = 0.1*MeV;
-    const double ResoTime = 0*ns ;
-    const double ResoEnergy = 0*MeV ;
-    const double ResoPosition = 0*cm;
+    //const double ResoTime = 0*ns ;
+    //const double ResoEnergy = 0*MeV ;
+    //const double ResoPosition = 0*cm;
     //The size of NS should depend on the distance between NeutronWall and plastic Bar right now
     double NS_X = 2020.0*mm;
     double NS_Y = 2020.0*mm;
diff --git a/NPSimulation/Detectors/Tiara/Tiara.cc b/NPSimulation/Detectors/Tiara/Tiara.cc
index 813fe4a2ebf5d7260621e5ad1c9265fc813ecb4d..89dd7a7c04b11ae13460bfa0e474dc470c7de923 100644
--- a/NPSimulation/Detectors/Tiara/Tiara.cc
+++ b/NPSimulation/Detectors/Tiara/Tiara.cc
@@ -283,7 +283,7 @@ void Tiara::ReadSensitive(const G4Event* event){
     double EF = RandGauss::shoot(Info[0],ResoEnergyHyball);
     if(EF>EnergyThreshold){
       int RingNumber=Info[8];
-      RingNumber=abs(RingNumber-17);                                                                                 //
+      RingNumber=abs(RingNumber-17);    
       Info[8]=RingNumber; 
       m_EventHyball->SetRingE(Info[7],Info[8],EF);
       m_EventHyball->SetRingT(Info[7],Info[8],Info[1]); 
diff --git a/NPSimulation/Detectors/Tiara/Tiara.hh b/NPSimulation/Detectors/Tiara/Tiara.hh
index 58b838ac0429f4a63c337460d4765ef3c51fb4c0..d24a277030a10b5368cfa9e9243feaa93b0f99f3 100644
--- a/NPSimulation/Detectors/Tiara/Tiara.hh
+++ b/NPSimulation/Detectors/Tiara/Tiara.hh
@@ -48,9 +48,9 @@ using namespace CLHEP;
 namespace TIARA{
   // Energy and time Resolution
   const G4double ResoTime    = 0      ;
-  const G4double ResoEnergyInnerBarrel  = 0.058*MeV ;// = 136keV of Resolution   //   Unit is MeV/2.35
-  const G4double ResoEnergyOuterBarrel  = 0.058*MeV ;// = 136keV of Resolution   //   Unit is MeV/2.35
-  const G4double ResoEnergyHyball       = 0.029*MeV ;// =  70keV of Resolution   //   Unit is MeV/2.35
+  const G4double ResoEnergyInnerBarrel  = 0.058*MeV ;// = 136keV FWHM 
+  const G4double ResoEnergyOuterBarrel  = 0.058*MeV ;// = 136keV FWHM
+  const G4double ResoEnergyHyball       = 0.029*MeV ;// =  70keV FWHM
 
   const G4double EnergyThreshold = 200*keV;
 
diff --git a/Projects/T40/22Nadp.reaction b/Projects/T40/22Nadp.reaction
deleted file mode 100644
index 09c0acb3555ba507d3cebba4852ecd849fa5f0d3..0000000000000000000000000000000000000000
--- a/Projects/T40/22Nadp.reaction
+++ /dev/null
@@ -1,41 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%% S1107 at Triumf %%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Beam
-  Particle= 22Na
-  ExcitationEnergy= 0
-  Energy= 220
-  SigmaEnergy= 1
-  SigmaThetaX= 0.01 
-  SigmaPhiY= 0.01
-  SigmaX= 0.5
-  SigmaY= 0.5
-  MeanThetaX= 0
-  MeanPhiY= 0
-  MeanX= 0
-  MeanY= 0
-  %EnergyProfilePath=
-  %XThetaXProfilePath=
-  %YPhiYProfilePath=
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-TwoBodyReaction
-	Beam= 22Na
-	Target= 2H
-	Light= 1H
-	Heavy= 23Na
-	ExcitationEnergyLight= 0.0
-	ExcitationEnergyHeavy= 0.0
-  CrossSectionPath= flat.txt	CSR
-	ShootLight= 1
-	ShootHeavy= 1
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%GammaDecay 26Mg
-Cascade
-  BranchingRatio= 70
-  Energies= 2.2
-  DifferentialCrossSection= 11Li(d,3He)10He.txt	Gamma25Na
-Cascade
-  BranchingRatio= 30
-  Energies= 1.0 1.2
-
-
diff --git a/Projects/T40/Analysis.cxx b/Projects/T40/Analysis.cxx
index 9245f7e61968ae86ce6fa027f0a821ae0594628a..e412f92306bc6069d57f491f69588dfaf80d8866 100644
--- a/Projects/T40/Analysis.cxx
+++ b/Projects/T40/Analysis.cxx
@@ -119,7 +119,8 @@ void Analysis::TreatEvent(){
     Energy = Si_E_TH;
 
     // Evaluate energy using the thickness 
-    ELab = LightAl.EvaluateInitialEnergy( Energy ,0.4*micrometer , ThetaTHSurface); 
+//    ELab = LightAl.EvaluateInitialEnergy( Energy ,0.4*micrometer , ThetaTHSurface); 
+    ELab = Energy;
     // Target Correction
     ELab = LightTarget.EvaluateInitialEnergy( ELab ,TargetThickness/2., ThetaNormalTarget); 
 
diff --git a/Projects/T40/run.mac b/Projects/T40/run.mac
new file mode 100644
index 0000000000000000000000000000000000000000..506556ed2882f22f4f6013ba592297aba63dec25
--- /dev/null
+++ b/Projects/T40/run.mac
@@ -0,0 +1 @@
+/run/beamOn 100000