Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 1353)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 1542)
@@ -1,7 +1,6 @@
 #include "MMcEvt.hxx"
 
-#include <iostream.h>
-#include <fstream.h>
-
+#include "MLog.h"
+#include "MLogManip.h"
 
 //==========
@@ -18,31 +17,16 @@
 
 
-MMcEvt::MMcEvt() {
-  //
-  //  default constructor
-  //  set all values to zero
+MMcEvt::MMcEvt()
+{
+    //
+    //  default constructor
+    //  set all values to zero
     fName  = "MMcEvt";
     fTitle = "Event info from Monte Carlo";
 
-  fPartId = 0  ;
-  fEnergy  = 0. ;
-
-  fTheta   = 0. ;
-  fPhi     = 0. ;
-
-  fCoreD   = 0. ;
-  fCoreX   = 0. ;
-  fCoreY   = 0. ;
-  fImpact  = 0. ;
-
-  fPhotIni      = 0 ;
-  fPassPhotAtm  = 0 ;
-  fPassPhotRef  = 0 ;
-  fPassPhotCone = 0 ;
-  fPhotElfromShower = 0 ;
-  fPhotElinCamera = 0 ;
-}
-
-MMcEvt::MMcEvt( UShort_t usPId, 
+    Clear();
+}
+
+MMcEvt::MMcEvt( UShort_t usPId,
 		Float_t  fEner, 
 		Float_t  fThet, 
@@ -99,26 +83,26 @@
 
 
-void MMcEvt::Clear(Option_t *opt) {
-  //
-  //  
-  //  reset all values to zero
-
-  fPartId = 0  ;
-  fEnergy  = 0. ;
-
-  fTheta   = 0. ;
-  fPhi     = 0. ;
-
-  fCoreD   = 0. ;
-  fCoreX   = 0. ;
-  fCoreY   = 0. ;
-  fImpact  = 0. ;
-
-  fPhotIni      = 0 ;
-  fPassPhotAtm  = 0 ;
-  fPassPhotRef  = 0 ;
-  fPassPhotCone = 0 ;
-  fPhotElfromShower = 0 ;
-  fPhotElinCamera   = 0 ;
+void MMcEvt::Clear(Option_t *opt)
+{
+    //
+    //  reset all values to values as nonsense as possible
+    //
+    fPartId = 0;
+    fEnergy = -1;
+
+    fTheta = 0;
+    fPhi   = 0;
+
+    fCoreD  =  0;
+    fCoreX  =  0;
+    fCoreY  =  0;
+    fImpact = -1;
+
+    fPhotIni          = 0;
+    fPassPhotAtm      = 0;
+    fPassPhotRef      = 0;
+    fPassPhotCone     = 0;
+    fPhotElfromShower = 0;
+    fPhotElinCamera   = 0;
 }
 
@@ -186,23 +170,23 @@
     if (str.IsNull())
     {
-        cout << endl;
-        cout << "Monte Carlo output:" << endl;
-        cout << " Particle Id:    ";
+        *fLog << all << endl;
+        *fLog << "Monte Carlo output:" << endl;
+        *fLog << " Particle Id:    ";
         switch(fPartId)
         {
         case kGAMMA:
-            cout << "Gamma" << endl;
+            *fLog << "Gamma" << endl;
             break;
         case kPROTON:
-            cout << "Proton" << endl;
+            *fLog << "Proton" << endl;
             break;
         case kHELIUM:
-            cout << "Helium" << endl;
+            *fLog << "Helium" << endl;
             break;
         }
-        cout << " Energy:         " << fEnergy << "GeV" << endl;
-        cout << " Impactpar.:     " << fImpact/100 << "m" << endl;
-        cout << " Photoelectrons: " << fPhotElfromShower << endl;
-        cout << endl;
+        *fLog << " Energy:         " << fEnergy << "GeV" << endl;
+        *fLog << " Impactpar.:     " << fImpact/100 << "m" << endl;
+        *fLog << " Photoelectrons: " << fPhotElfromShower << endl;
+        *fLog << endl;
         return;
     }
@@ -211,16 +195,16 @@
         {
         case kGAMMA:
-            cout << "Particle: Gamma" << endl;
+            *fLog << "Particle: Gamma" << endl;
             break;
         case kPROTON:
-            cout << "Particle: Proton" << endl;
+            *fLog << "Particle: Proton" << endl;
             break;
         case kHELIUM:
-            cout << "Particle: Helium" << endl;
+            *fLog << "Particle: Helium" << endl;
             break;
         }
     if (str.Contains("energy", TString::kIgnoreCase))
-        cout << "Energy: " << fEnergy << "GeV" << endl;
+        *fLog << "Energy: " << fEnergy << "GeV" << endl;
     if (str.Contains("impact", TString::kIgnoreCase))
-        cout << "Impact: " << fImpact << "cm" << endl;
-}
+        *fLog << "Impact: " << fImpact << "cm" << endl;
+}