Index: trunk/MagicSoft/Mars/mhist/MHCompProb.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCompProb.cc	(revision 3324)
+++ trunk/MagicSoft/Mars/mhist/MHCompProb.cc	(revision 3325)
@@ -168,10 +168,10 @@
     {
     case 0:  // First loop : fill the fixed-bin histograms with gammas.
-        if (mcevt.GetPartId() == kGAMMA)
+        if (mcevt.GetPartId() == MMcEvt::kGAMMA)
             Fill(*fHists);
         return kTRUE;
 
     case 1:   //  Second Loop: fill the variable-bin histograms with protons.
-        if (mcevt.GetPartId() != kGAMMA)
+        if (mcevt.GetPartId() != MMcEvt::kGAMMA)
             Fill(*fHistVar);
         return kTRUE;
Index: trunk/MagicSoft/Mars/mhist/MHEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 3324)
+++ trunk/MagicSoft/Mars/mhist/MHEvent.cc	(revision 3325)
@@ -237,20 +237,5 @@
         TString txt("#splitline{");
 
-        switch (fMcEvt->GetPartId())
-        {
-        case kGAMMA:
-            txt += "Gamma: ";
-            break;
-        case kPROTON:
-            txt += "Proton: ";
-            break;
-        case kHELIUM:
-            txt += "Helium: ";
-            break;
-        default:
-            s += "Particle Id#";
-            s += fMcEvt->GetPartId();
-            s += ": ";
-        }
+        txt += fMcEvt->GetParticleName();
 
         s.Insert(0, txt);
@@ -258,14 +243,5 @@
         s += "}{  E=";
 
-        if (fMcEvt->GetEnergy()>1000)
-            s += Form("%.1fTeV", fMcEvt->GetEnergy()/1000);
-        else
-            if (fMcEvt->GetEnergy()>10)
-                s += Form("%dGeV", (Int_t)(fMcEvt->GetEnergy()+.5));
-            else
-                if (fMcEvt->GetEnergy()>1)
-                    s += Form("%.1fGeV", fMcEvt->GetEnergy());
-                else
-                    s += Form("%dMeV", (Int_t)(fMcEvt->GetEnergy()*1000+.5));
+        s+= fMcEvt->GetEnergyStr();
 
         s += " r=";
Index: trunk/MagicSoft/Mars/mhist/MHHadronness.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHHadronness.cc	(revision 3324)
+++ trunk/MagicSoft/Mars/mhist/MHHadronness.cc	(revision 3325)
@@ -216,5 +216,5 @@
     const Int_t particleid = fMatrix ? (Int_t)(*fMatrix)[fMap] : fMcEvt->GetPartId();
 
-    if (particleid==kGAMMA)
+    if (particleid==MMcEvt::kGAMMA)
         fGhness->Fill(h, w);
     else