Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.h
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.h	(revision 8066)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.h	(revision 8315)
@@ -91,18 +91,22 @@
   }
 
+  static TString GetEnergyStr(Float_t e)
+  {
+      if (e>=1000)
+          return Form("%.1fTeV", e/1000);
+
+      if (e>=10)
+          return Form("%dGeV", (Int_t)(e+.5));
+
+      if (e>=1)
+          return Form("%.1fGeV", e);
+
+      return Form("%dMeV", (Int_t)(e*1000+.5));
+  }
+
   TString GetEnergyStr() const
   {
-      if (fEnergy>1000)
-          return Form("%.1fTeV", fEnergy/1000);
-
-      if (fEnergy>10)
-          return Form("%dGeV", (Int_t)(fEnergy+.5));
-
-      if (fEnergy>1)
-          return Form("%.1fGeV", fEnergy);
-
-      return Form("%dMeV", (Int_t)(fEnergy*1000+.5));
+      return GetEnergyStr(fEnergy);
   }
-
 
   // Setter