diff --git a/NPAnalysis/10He_Riken/Analysis.cxx b/NPAnalysis/10He_Riken/Analysis.cxx
index 337854f57e2932e329c8e2ac5f846d3e42656e75..f0216ad778111811dd5291f79e070240e62a6787 100644
--- a/NPAnalysis/10He_Riken/Analysis.cxx
+++ b/NPAnalysis/10He_Riken/Analysis.cxx
@@ -120,12 +120,12 @@ int main(int argc,char** argv)
 			myDetector -> BuildPhysicalEvent()				;
 			////
 			// Target (from initial condition)
-			XTarget = Init->GetICPositionX(0);
-			YTarget = Init->GetICPositionY(0);
-			ZTarget = Init->GetICPositionZ(0);
+			XTarget = Init->GetIncidentPositionX();
+			YTarget = Init->GetIncidentPositionY();
+			ZTarget = Init->GetIncidentPositionZ();
 			//	XTarget = RandomEngine.Gaus(Init->GetICPositionX(0),1);
 			//	YTarget = RandomEngine.Gaus(Init->GetICPositionY(0),1);
-			BeamTheta = Init->GetICIncidentAngleTheta(0)*deg ; BeamPhi = Init->GetICIncidentAnglePhi(0)*deg ; 
+			BeamTheta = Init->GetIncidentEmittanceTheta()*deg ; BeamPhi = Init->GetIncidentEmittancePhi()*deg ; 
 			TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta) , sin(BeamPhi)*sin(BeamTheta) , cos(BeamTheta)) ;
 			//// 
 			
diff --git a/NPAnalysis/Gaspard/Analysis.cxx b/NPAnalysis/Gaspard/Analysis.cxx
index 87c382706c4992f06eadd93b9a4e6d14e4ee8f8d..6df1284b17ea8dd3c2b48fa162efcba9ee771e96 100644
--- a/NPAnalysis/Gaspard/Analysis.cxx
+++ b/NPAnalysis/Gaspard/Analysis.cxx
@@ -121,7 +121,7 @@ int main(int argc,char** argv)
       TVector3 A;
       if (E > -1000) {
          // Get c.m. angle
-         ThetaCM = initCond->GetICEmittedAngleThetaCM(0) * deg;
+         ThetaCM = initCond->GetThetaCM(0) * deg;
 
          // Get exact scattering angle from TInteractionCoordinates object
 //         interCoord->Dump();
@@ -136,10 +136,10 @@ int main(int argc,char** argv)
          A = GPDTrack->GetPositionOfInteraction();
 
          // Get beam interaction coordinates on target (from initial condition)
-         XTarget = initCond->GetICPositionX(0);
-         YTarget = initCond->GetICPositionY(0);
-         BeamTheta = initCond->GetICIncidentAngleTheta(0)*deg;
-         BeamPhi   = initCond->GetICIncidentAnglePhi(0)*deg;
+         XTarget = initCond->GetIncidentPositionX();
+         YTarget = initCond->GetIncidentPositionY();
+         BeamTheta = initCond->GetIncidentEmittanceTheta()*deg;
+         BeamPhi   = initCond->GetIncidentEmittanceTheta()*deg;
          TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta), sin(BeamPhi)*sin(BeamTheta), cos(BeamTheta));
 
          // Hit direction taking into account beam position on target
diff --git a/NPAnalysis/Hyde/Analysis.cxx b/NPAnalysis/Hyde/Analysis.cxx
index 1d37c533271c43fd69d1e0852d528cfa10f16819..da1ba2a8c55973a536973503de7f6cb2d9778da8 100644
--- a/NPAnalysis/Hyde/Analysis.cxx
+++ b/NPAnalysis/Hyde/Analysis.cxx
@@ -120,7 +120,7 @@ int main(int argc,char** argv)
       TVector3 A;
       if (E > -1000) {
          // Get c.m. angle
-         ThetaCM = initCond->GetICEmittedAngleThetaCM(0) * deg;
+         ThetaCM = initCond->GetThetaCM(0) * deg;
 
          // Get exact scattering angle from TInteractionCoordinates object
 //         Theta = interCoord->GetDetectedAngleTheta(0) * deg;
@@ -134,11 +134,11 @@ int main(int argc,char** argv)
          A = HYDTrack->GetPositionOfInteraction();
 
          // Get beam interaction coordinates on target (from initial condition)
-         XTarget = initCond->GetICPositionX(0);
-         YTarget = initCond->GetICPositionY(0);
+         XTarget = initCond->GetIncidentPositionX();
+         YTarget = initCond->GetIncidentPositionY();
 //         cout << XTarget << "  " << YTarget << endl;
-         BeamTheta = initCond->GetICIncidentAngleTheta(0)*deg;
-         BeamPhi   = initCond->GetICIncidentAnglePhi(0)*deg;
+         BeamTheta = initCond->GetIncidentEmittanceTheta()*deg;
+         BeamPhi   = initCond->GetIncidentEmittancePhi()*deg;
          TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta), sin(BeamPhi)*sin(BeamTheta), cos(BeamTheta));
 //         cout << BeamDirection.X() << "  " << BeamDirection.Y() << "  " << BeamDirection.Z() << endl;
 
diff --git a/NPAnalysis/Paris/Analysis.cxx b/NPAnalysis/Paris/Analysis.cxx
index 9b10c2a0c0def345feb55b883606dbdd34c11e62..b324bec6403d6888ab8c61a73ebea55ec5df7955 100644
--- a/NPAnalysis/Paris/Analysis.cxx
+++ b/NPAnalysis/Paris/Analysis.cxx
@@ -103,7 +103,7 @@ int main(int argc,char** argv)
 
 
      
-      double Einit= initCond->GetICEmittedEnergy(0);
+      double Einit= initCond->GetKineticEnergy(0);
 
       Ein->Fill(Einit);
 
diff --git a/NPAnalysis/W1/Analysis.cxx b/NPAnalysis/W1/Analysis.cxx
index 558d068b28f3c26757a5f1dcd620292ed56e5e5c..10b317aa0a8dc55d9ba7f976d90c4fdc497d3bc3 100644
--- a/NPAnalysis/W1/Analysis.cxx
+++ b/NPAnalysis/W1/Analysis.cxx
@@ -115,16 +115,16 @@ int main(int argc,char** argv)
       myDetector->BuildPhysicalEvent();
 
       // Get Target information from TInitialConditions
-      XTarget = initCond->GetICPositionX(0);
-      YTarget = initCond->GetICPositionY(0);
-      BeamTheta = initCond->GetICIncidentAngleTheta(0)*deg;
-      BeamPhi   = initCond->GetICIncidentAnglePhi(0)*deg;
+      XTarget = initCond->GetIncidentPositionX();
+      YTarget = initCond->GetIncidentPositionY();
+      BeamTheta = initCond->GetIncidentEmittanceTheta()*deg;
+      BeamPhi   = initCond->GetIncidentEmittancePhi()*deg;
       TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta), sin(BeamPhi)*sin(BeamTheta), cos(BeamTheta));
 
       // loop on multiplicity event
       for (int hit = 0; hit < W1->GetEventMultiplicity(); hit++) {
          // Get c.m. angle
-         double ThetaCM = initCond->GetICEmittedAngleThetaCM(0) * deg;
+         double ThetaCM = initCond->GetThetaCM(0) * deg;
 
          // Get exact scattering angle from TInteractionCoordinates object
          double DetecX = interCoord->GetDetectedPositionX(hit);
diff --git a/NPAnalysis/must2/Analysis.cxx b/NPAnalysis/must2/Analysis.cxx
index 7c69e2d4e4c3b6cb5eb54d499d1724d24799dd17..d0f0260f29679dfcbebaf3650f11313abaec29b9 100644
--- a/NPAnalysis/must2/Analysis.cxx
+++ b/NPAnalysis/must2/Analysis.cxx
@@ -118,12 +118,12 @@ int main(int argc,char** argv)
       myDetector->BuildPhysicalEvent();
 	  
       //	Get target interaction position from initial conditions
-      double XTarget = initCond->GetICPositionX(0);
-      double YTarget = initCond->GetICPositionY(0);
-      double ZTarget = initCond->GetICPositionZ(0);
+      double XTarget = initCond->GetIncidentPositionX();
+      double YTarget = initCond->GetIncidentPositionY();
+      double ZTarget = initCond->GetIncidentPositionZ();
 		  
       // Calculate beam direction
-      double BeamTheta = initCond->GetICIncidentAngleTheta(0)*deg; double BeamPhi = initCond->GetICIncidentAnglePhi(0)*deg;
+      double BeamTheta = initCond->GetIncidentEmittanceTheta()*deg; double BeamPhi = initCond->GetIncidentEmittancePhi()*deg;
       TVector3 BeamDirection = TVector3(cos(BeamPhi)*sin(BeamTheta) , sin(BeamPhi)*sin(BeamTheta) , cos(BeamTheta));
 		  
       for (int hit = 0; hit < M2->Si_E.size(); hit++) {