From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 11 Nov 2010 13:16:33 +0000 (+0000)
Subject: Set beam energy in GRP object to energy per charge.
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=4dcef377972fc268285890544783574793359c46

Set beam energy in GRP object to energy per charge.
---

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index d6871656e86..ca5b3a6948c 100644
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -2270,10 +2270,11 @@ void AliSimulation::WriteGRPEntry()
   grpObj->SetBeamEnergyIsSqrtSHalfGeV(); // new format of GRP: store sqrt(s)/2 in GeV
 
   const AliGenerator *gen = gAlice->GetMCApp()->Generator();
+  Int_t a = 0;
+  Int_t z = 0;
+
   if (gen) {
-    grpObj->SetBeamEnergy(gen->GetEnergyCMS()/2);
     TString projectile;
-    Int_t a,z;
     gen->GetProjectile(projectile,a,z);
     TString target;
     gen->GetTarget(target,a,z);
@@ -2281,9 +2282,15 @@ void AliSimulation::WriteGRPEntry()
     beamType.ReplaceAll(" ","");
     if (!beamType.CompareTo("-")) {
       grpObj->SetBeamType("UNKNOWN");
+      grpObj->SetBeamEnergy(gen->GetEnergyCMS()/2);
     }
     else {
       grpObj->SetBeamType(beamType);
+      if (z != 0) {
+	  grpObj->SetBeamEnergy(gen->GetEnergyCMS()/2 * a / z);
+      } else {
+	  grpObj->SetBeamEnergy(gen->GetEnergyCMS()/2 );
+      }
       // Heavy ion run, the event specie is set to kHighMult
       fEventSpecie = AliRecoParam::kHighMult;
       if ((strcmp(beamType,"p-p") == 0) ||