Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 1342)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 1353)
@@ -170,14 +170,57 @@
 */
 
-void MMcEvt::Print(Option_t *Option) const {
-  //
-  //  print out the data member on screen
-  //
-  cout << endl;
-  cout << "Monte Carlo output:" << endl;
-  cout << " Particle Id:    " << fPartId; 
-  cout << " Energy:         " << fEnergy << "GeV";
-  cout << " Impactpar.:     " << fImpact/100 << "m";
-  cout << " Photoelectrons: " << fPhotElfromShower; 
-  cout << endl; 
-}
+// --------------------------------------------------------------------------
+//
+// Print the contents of the container.
+//
+//  if you specify an option only the requested data members are printed:
+//  allowed options are:
+//   id, energy, impact
+//
+void MMcEvt::Print(Option_t *opt) const
+{
+    //
+    //  print out the data member on screen
+    //
+    TString str(opt);
+    if (str.IsNull())
+    {
+        cout << endl;
+        cout << "Monte Carlo output:" << endl;
+        cout << " Particle Id:    ";
+        switch(fPartId)
+        {
+        case kGAMMA:
+            cout << "Gamma" << endl;
+            break;
+        case kPROTON:
+            cout << "Proton" << endl;
+            break;
+        case kHELIUM:
+            cout << "Helium" << endl;
+            break;
+        }
+        cout << " Energy:         " << fEnergy << "GeV" << endl;
+        cout << " Impactpar.:     " << fImpact/100 << "m" << endl;
+        cout << " Photoelectrons: " << fPhotElfromShower << endl;
+        cout << endl;
+        return;
+    }
+    if (str.Contains("id", TString::kIgnoreCase))
+        switch(fPartId)
+        {
+        case kGAMMA:
+            cout << "Particle: Gamma" << endl;
+            break;
+        case kPROTON:
+            cout << "Particle: Proton" << endl;
+            break;
+        case kHELIUM:
+            cout << "Particle: Helium" << endl;
+            break;
+        }
+    if (str.Contains("energy", TString::kIgnoreCase))
+        cout << "Energy: " << fEnergy << "GeV" << endl;
+    if (str.Contains("impact", TString::kIgnoreCase))
+        cout << "Impact: " << fImpact << "cm" << endl;
+}