diff --git a/Inputs/EventGenerator/40Ca.reaction b/Inputs/EventGenerator/40Ca.reaction
index dc830734f1c8c11e6a841b68e8bcd1b2bcc7cf97..72e69b5adeac17959ef775c623015adbfa48fa31 100644
--- a/Inputs/EventGenerator/40Ca.reaction
+++ b/Inputs/EventGenerator/40Ca.reaction
@@ -1,22 +1,25 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%  Reaction file for 40Ar(40Ca,40Ca)40Ar reaction  %%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%Beam energy given in MeV ; Excitation in MeV ; emmitance in rad
-Transfert
-	Beam= 40Ar
-	Target= 40Ca
-	Light= 40Ar
-	Heavy= 40Ca
-	ExcitationEnergyLight= 0
-	ExcitationEnergyHeavy= 0
-	BeamEnergy= 1387.69
-	BeamEnergySpread= 0
-	SigmaX= 0
-	SigmaY= 0
-	SigmaThetaX= 0 
-	SigmaPhiY= 0
-	CrossSectionPath= flat.txt
-	ShootLight= 1
-	ShootHeavy= 1
+Beam
+  Particle= 40Ar
+  Energy= 1387.69
+  SigmaEnergy= 0
+  SigmaThetaX= 0.00
+  SigmaPhiY= 0.00
+  SigmaX= 0
+  SigmaY= 0
+  MeanThetaX= 0
+  MeanPhiY= 0
+  MeanX= 0
+  MeanY= 0
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+TwoBodyReaction
+  Beam= 40Ar
+  Target= 40Ca
+  Light= 40Ar
+  Heavy= 40Ca
+  ExcitationEnergyLight= 0.0
+  ExcitationEnergyHeavy= 0.0
+  CrossSectionPath= flat.txt   CS10He
+  ShootLight= 1
+  ShootHeavy= 1
diff --git a/NPAnalysis/EXL/Analysis.cxx b/NPAnalysis/EXL/Analysis.cxx
index 6f3bcc162ffdfafcdf333c2e386b02dd67ba8410..f088de78bc4c118057dd2bf4859eefb1a6ce7b3c 100644
--- a/NPAnalysis/EXL/Analysis.cxx
+++ b/NPAnalysis/EXL/Analysis.cxx
@@ -22,6 +22,7 @@ if(myOptionManager->IsDefault("DetectorConfiguration"))
 
 //Get input files from NPOptionManager
 string detectorfileName = myOptionManager->GetDetectorFile();
+string reactionfileName    = myOptionManager->GetReactionFile();
 string calibrationfileName = myOptionManager->GetCalibrationFile();
 string OutputfileName = myOptionManager->GetOutputFile();
    
@@ -40,7 +41,7 @@ InitOutputBranch();
 
 //Instantiate some Reaction
 NPL::Reaction* Reaction_e582 = new Reaction;
-Reaction_e582->ReadConfigurationFile("40Ca.reaction");
+Reaction_e582->ReadConfigurationFile(reactionfileName);
 
 //Get TExlPhysics pointer
 TExlPhysics *Exl = (TExlPhysics*)  myDetector -> GetDetector("EXL")	;
diff --git a/NPAnalysis/Speg/Analysis.cxx b/NPAnalysis/Speg/Analysis.cxx
index 0f24b225ee87b3abef5ca2fc69ab8538dd6d3ba6..46c3537c73ac5e786352e1afefc23f0552712ad0 100644
--- a/NPAnalysis/Speg/Analysis.cxx
+++ b/NPAnalysis/Speg/Analysis.cxx
@@ -22,6 +22,7 @@ if(myOptionManager->IsDefault("DetectorConfiguration"))
 
 //Get input files from NPOptionManager
 string detectorfileName = myOptionManager->GetDetectorFile();
+string reactionfileName    = myOptionManager->GetReactionFile();
 string calibrationfileName = myOptionManager->GetCalibrationFile();
 string OutputfileName = myOptionManager->GetOutputFile();
    
@@ -40,7 +41,7 @@ InitOutputBranch();
 
 //Instantiate some Reaction
 NPL::Reaction* Reaction_e582 = new Reaction;
-Reaction_e582->ReadConfigurationFile("40Ca.reaction");
+Reaction_e582->ReadConfigurationFile(reactionfileName);
 
 //Get TSpegPhysics pointer
 TSpegPhysics *Speg = (TSpegPhysics*)  myDetector -> GetDetector("SPEG")	;
diff --git a/NPLib/Physics/NPFunction.cxx b/NPLib/Physics/NPFunction.cxx
index fa29dde0c624b91bc31550557999385bc3322dcf..dc07ddd2e060aad1dca97c281a46843904f7e3c8 100644
--- a/NPLib/Physics/NPFunction.cxx
+++ b/NPLib/Physics/NPFunction.cxx
@@ -58,8 +58,8 @@ TH1F* Read1DProfile(string filename,string HistName){
     }
 
     // Look for the step size, min and max of the distribution
-    double min ;
-    double max ;
+    double min = 0;
+    double max = 0;
     unsigned int size = x.size();
     
     if(size > 0){
@@ -126,12 +126,12 @@ TH2F* Read2DProfile(string filename,string HistName){
     }
     
     // Look for the step size, min and max of the distribution
-    double xmin ;
-    double xmax ;
+    double xmin = 0;
+    double xmax = 0;
     unsigned int xsize = x.size();
     
-    double ymin ;
-    double ymax ;
+    double ymin = 0;
+    double ymax = 0;
     unsigned int ysize = y.size();
     
     if(xsize > 0){
@@ -231,4 +231,4 @@ void RandomGaussian2D(double MeanX, double MeanY, double SigmaX, double SigmaY,
   }
 }
 
-}
\ No newline at end of file
+}