Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.cc
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.cc	(revision 9312)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.cc	(revision 9313)
@@ -52,4 +52,6 @@
 #include "MMcEvtBasic.h"
 
+#include "MString.h"
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -124,4 +126,64 @@
     fTelescopeTheta = fTThet;
 }
+
+TString MMcEvtBasic::GetParticleName(Int_t id)
+{
+    switch (id)
+    {
+    case kUNDEFINED:  return "Undefined";
+    case kGAMMA:      return "Gamma";
+    case kPOSITRON:   return "Positron";
+    case kELECTRON:   return "Electron";
+    case kANTIMUON:   return "Anti-Muon";
+    case kMUON:       return "Muon";
+    case kPI0:        return "Pi-0";
+    case kNEUTRON:    return "Neutron";
+    case kPROTON:     return "Proton";
+    case kHELIUM:     return "Helium";
+    case kOXYGEN:     return "Oxygen";
+    case kIRON:       return "Iron";
+    case kArtificial: return "Artificial";
+    case kNightSky:   return "NightSky";
+    }
+
+    return MString::Format("Id:%d", id);
+}
+
+TString MMcEvtBasic::GetParticleSymbol(Int_t id)
+{
+    switch (id)
+    {
+    case kUNDEFINED:return "N/A";
+    case kGAMMA:    return "\\gamma";
+    case kPOSITRON: return "e^{+}";
+    case kELECTRON: return "e^{-}";
+    case kANTIMUON: return "\\mu^{+}";
+    case kMUON:     return "\\mu^{-}";
+    case kPI0:      return "\\pi^{0}";
+    case kNEUTRON:  return "n";
+    case kPROTON:   return "p";
+    case kHELIUM:   return "He";
+    case kOXYGEN:   return "O";
+    case kIRON:     return "Fe";
+    case kNightSky: return "\\gamma_{NSB}";
+    }
+
+    return MString::Format("Id:%d", id);
+}
+
+TString MMcEvtBasic::GetEnergyStr(Float_t e)
+{
+    if (e>=1000)
+        return MString::Format("%.1fTeV", e/1000);
+
+    if (e>=10)
+        return MString::Format("%dGeV", (Int_t)(e+.5));
+
+    if (e>=1)
+        return MString::Format("%.1fGeV", e);
+
+    return MString::Format("%dMeV", (Int_t)(e*1000+.5));
+}
+
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.h
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.h	(revision 9312)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvtBasic.h	(revision 9313)
@@ -51,62 +51,7 @@
   Float_t GetTelescopeTheta() const { return fTelescopeTheta; }
 
-  static TString GetParticleName(Int_t id)
-  {
-      switch (id)
-      {
-      case kUNDEFINED:  return "Undefined";
-      case kGAMMA:      return "Gamma";
-      case kPOSITRON:   return "Positron";
-      case kELECTRON:   return "Electron";
-      case kANTIMUON:   return "Anti-Muon";
-      case kMUON:       return "Muon";
-      case kPI0:        return "Pi-0";
-      case kNEUTRON:    return "Neutron";
-      case kPROTON:     return "Proton";
-      case kHELIUM:     return "Helium";
-      case kOXYGEN:     return "Oxygen";
-      case kIRON:       return "Iron";
-      case kArtificial: return "Artificial";
-      case kNightSky:   return "NightSky";
-      }
-
-      return Form("Id:%d", id);
-  }
-
-  static TString GetParticleSymbol(Int_t id)
-  {
-      switch (id)
-      {
-      case kUNDEFINED:return "N/A";
-      case kGAMMA:    return "\\gamma";
-      case kPOSITRON: return "e^{+}";
-      case kELECTRON: return "e^{-}";
-      case kANTIMUON: return "\\mu^{+}";
-      case kMUON:     return "\\mu^{-}";
-      case kPI0:      return "\\pi^{0}";
-      case kNEUTRON:  return "n";
-      case kPROTON:   return "p";
-      case kHELIUM:   return "He";
-      case kOXYGEN:   return "O";
-      case kIRON:     return "Fe";
-      case kNightSky: return "\\gamma_{NSB}";
-      }
-
-      return Form("Id:%d", id);
-  }
-
-  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));
-  }
+  static TString GetParticleName(Int_t id);
+  static TString GetParticleSymbol(Int_t id);
+  static TString GetEnergyStr(Float_t e);
 
   TString GetParticleSymbol() const