Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 961)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx	(revision 991)
@@ -1,4 +1,5 @@
+#include "MMcEvt.hxx"
+
 #include <iostream.h>
-#include "MMcEvt.hxx"
 
 
@@ -12,5 +13,5 @@
 
 
-ClassImp(MMcEvt)
+ClassImp(MMcEvt);
 
 
@@ -137,13 +138,13 @@
 
   fPartId = usPId  ;
-  fEnergy  = fEner  ;
+  fEnergy = fEner  ;
 
-  fTheta   = fThet ;
-  fPhi     = fPhii ;
+  fTheta  = fThet ;
+  fPhi    = fPhii ;
 
-  fCoreD   = fCorD ;
-  fCoreX   = fCorX ;
-  fCoreY   = fCorY ;
-  fImpact  = fImpa ;
+  fCoreD  = fCorD ;
+  fCoreX  = fCorX ;
+  fCoreY  = fCorY ;
+  fImpact = fImpa ;
 
   fPhotIni      = uiPin ;
@@ -157,13 +158,14 @@
 
 
-void MMcEvt::Print(Option_t *Option) {
+void MMcEvt::Print(Option_t *Option) const {
   //
   //  print out the data member on screen
   //
-  cout <<endl << "Monte Carlo output:" <<endl;
-  cout << " Particle Id    : " << fPartId ; 
-  cout << " Energy (GeV)   : " << fEnergy  ; 
-  cout << " Impactpar. (m) : " << fImpact  ; 
-  cout << " Photoelectrons : " << fPhotElfromShower ; 
-  cout << endl ; 
+  cout << endl;
+  cout << "Monte Carlo output:" << endl;
+  cout << " Particle Id:    " << fPartId; 
+  cout << " Energy (GeV):   " << fEnergy; 
+  cout << " Impactpar. (m): " << fImpact; 
+  cout << " Photoelectrons: " << fPhotElfromShower; 
+  cout << endl; 
 }
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx	(revision 961)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx	(revision 991)
@@ -2,34 +2,29 @@
 #define __MMcEvt__
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>  
+#ifndef MPARCONTAINER_H
+#include "MParContainer.h"
+#endif
 
-#include <iostream.h>
-#include "MParContainer.h"
+class MMcEvt : public MParContainer
+{
+ private:
+  UShort_t fPartId;         // Type of particle
+  Float_t  fEnergy;         // Energy in GeV
 
+  Float_t fTheta;           // Theta angle of event 
+  Float_t fPhi;             // Phi angle of event 
 
-class MMcEvt : public MParContainer{
- private:
-  UShort_t fPartId;     // Type of particle
-  Float_t fEnergy;       // Energy in GeV
+  Float_t fCoreD;           // Core d pos
+  Float_t fCoreX;           // Core x pos
+  Float_t fCoreY;           // Core y pos
+  Float_t fImpact;          // impact parameter
 
-  Float_t fTheta;        // Theta angle of event 
-  Float_t fPhi;          // Phi angle of event 
-
-  Float_t fCoreD;        // Core d pos
-  Float_t fCoreX;        // Core x pos
-  Float_t fCoreY;        // Core y pos
-  Float_t fImpact;       // impact parameter
-
-  UInt_t fPhotIni;      // Initial number of photons
-  UInt_t fPassPhotAtm;  // Passed atmosphere
-  UInt_t fPassPhotRef;  // Passed reflector(reflectivity + effective area)
-  UInt_t fPassPhotCone; // Passed glas
-  UInt_t fPhotElfromShower;   // Passed qe coming from the shower
-  UInt_t fPhotElinCamera;     // usPhotElfromShower + mean of phe
-                               // from NSB
+  UInt_t fPhotIni;          // Initial number of photons
+  UInt_t fPassPhotAtm;      // Passed atmosphere
+  UInt_t fPassPhotRef;      // Passed reflector(reflectivity + effective area)
+  UInt_t fPassPhotCone;     // Passed glas
+  UInt_t fPhotElfromShower; // Passed qe coming from the shower
+  UInt_t fPhotElinCamera;   // usPhotElfromShower + mean of phe
+                            // from NSB
 
  public:
@@ -49,5 +44,5 @@
 
 
-  void Print(Option_t *);
+  void Print(Option_t *opt=NULL) const;
 
   Short_t GetPartId() const { return fPartId; }       //Get Type of particle
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.cxx	(revision 961)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.cxx	(revision 991)
@@ -1,5 +1,5 @@
-#include <iostream.h>
 #include "MMcFadcHeader.hxx"
 
+#include <iostream.h>
 
 //==========
@@ -13,5 +13,5 @@
 
 
-ClassImp(MMcFadcHeader)
+ClassImp(MMcFadcHeader);
 
 
@@ -41,16 +41,16 @@
 
 
-void MMcFadcHeader::Print(Option_t *Option) {
+void MMcFadcHeader::Print(Option_t *Option) const {
   //
   //  print out the data member on screen
   //
-
-  cout <<endl << "Monte Carlo Fadc output:" <<endl;
-  cout << " Shape type of the signal : "<<fFadcShape<<endl;
-  cout << " Amplitude of the trigger in mV : "<<fAmplFadc<<endl;
-  cout << " Width of the signal in nsec : "<<fFwhmFadc<<endl;
-  cout << " Pedestals and ElecNoise in fadc counts : "<<endl;
+  cout << endl;
+  cout << "Monte Carlo Fadc output:" << endl;
+  cout << " Shape type of the signal: "       << fFadcShape << endl;
+  cout << " Amplitude of the trigger in mV: " << fAmplFadc << endl;
+  cout << " Width of the signal in nsec: "    << fFwhmFadc << endl;
+  cout << " Pedestals and ElecNoise in fadc counts: " << endl;
   for (int i=0;i<MFADC_CHANNELS;i++){
-    cout << " Pixel "<<i<<" : "<<fPedesMean[i]<<"  "<<fElecNoise[i]<<endl;
+    cout << " Pixel "<<i<<": "<<fPedesMean[i]<<"  "<<fElecNoise[i]<<endl;
   }
   cout << endl ; 
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx	(revision 961)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcFadcHeader.hxx	(revision 991)
@@ -2,14 +2,8 @@
 #define __MMcFadcHeader__
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>  
+#ifndef MPARCONTAINER_H
+#include "MParContainer.h"
+#endif
 
-#include <iostream.h>
-#include "MParContainer.h"
-
-#include "MTriggerDefine.h"
 #include "MFadcDefine.h"
 
@@ -33,5 +27,5 @@
   ~MMcFadcHeader(); 
 
-  void Print(Option_t *);
+  void Print(Option_t *opt=NULL) const;
   
   void SetShape(Float_t shape){
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx	(revision 961)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.cxx	(revision 991)
@@ -1,4 +1,5 @@
+#include "MMcTrig.hxx"
+
 #include <iostream.h>
-#include "MMcTrig.hxx"
 
 
@@ -12,5 +13,5 @@
 
 
-ClassImp(MMcTrig)
+ClassImp(MMcTrig);
 
 
@@ -49,4 +50,15 @@
 }
 
+inline void MMcTrig::SetTime(Float_t t, Int_t i)
+{
+    if (i>TOTAL_TRIGGER_TIME/LEVEL1_DEAD_TIME+1  || i<1)
+    {
+        cout << "fNumFirstLevel out of range. Time will be -99" << endl;
+        return;
+    }
+
+    fTimeFirst[i-1]=t;
+}
+
 void MMcTrig::Clear(Option_t *opt) {
   //
@@ -71,5 +83,5 @@
 }
 
-void MMcTrig::Print(Option_t *Option) {
+void MMcTrig::Print(Option_t *Option) const {
   //
   //  print out the data member on screen
@@ -78,6 +90,6 @@
 
   cout <<endl << "Monte Carlo Trigger output:" <<endl;
-  cout << " First  Level Trigger in this Event : "<<fNumFirstLevel<<endl; 
-  cout << " Times of first  Level Trigger in this Event : ";
+  cout << " First  Level Trigger in this Event: "<<fNumFirstLevel<<endl; 
+  cout << " Times of first  Level Trigger in this Event: ";
   for (i=0;i<fNumFirstLevel;i++){
     cout<< fTimeFirst[i]<<"-";
@@ -91,5 +103,5 @@
   }
   cout<<endl;
-  cout << " Second Level Trigger in this Event : " << fNumSecondLevel << endl; 
+  cout << " Second Level Trigger in this Event: " << fNumSecondLevel << endl; 
   cout << endl ; 
 }
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx	(revision 961)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx	(revision 991)
@@ -2,12 +2,7 @@
 #define __MMcTrig__
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>  
-
-#include <iostream.h>
+#ifndef MPARCONTAINER_H
 #include "MParContainer.h"
+#endif
 
 #include "MTriggerDefine.h"
@@ -32,5 +27,5 @@
   void Clear(Option_t *opt=NULL);
   
-  void Print(Option_t *);
+  void Print(Option_t *opt=NULL) const;
 
   void SetFirstLevel  ( Short_t nTr ) {
@@ -41,12 +36,5 @@
   } 
 
-  void SetTime( Float_t t, Int_t i){
-    if (i>TOTAL_TRIGGER_TIME/LEVEL1_DEAD_TIME+1  || i<1){
-      cout<<"fNumFirstLevel out of range. Time will be -99"<<endl;
-    }
-    else{
-      fTimeFirst[i-1]=t;
-    }
-  }
+  void SetTime( Float_t t, Int_t i);
 
   void SetMapPixels(Byte_t *map,Int_t nfirst){
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.cxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.cxx	(revision 961)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.cxx	(revision 991)
@@ -1,4 +1,5 @@
+#include "MMcTrigHeader.hxx"
+
 #include <iostream.h>
-#include "MMcTrigHeader.hxx"
 
 
@@ -13,5 +14,5 @@
 
 
-ClassImp(MMcTrigHeader)
+ClassImp(MMcTrigHeader);
 
 
@@ -47,14 +48,14 @@
 
 
-void MMcTrigHeader::Print(Option_t *Option) {
+void MMcTrigHeader::Print(Option_t *opt) const {
   //
   //  print out the data member on screen
   //
-
-  cout <<endl << "Monte Carlo Trigger output:" <<endl;
-  cout << " XSTopology Trigger in this run : "<<fTopology<<endl;
-  cout << " Multiplicity Trigger in this run : "<<fMultiplicity<<endl;
-  cout << " Trigger Pattern in this run : "<<fTrigPattern[0]<<
-    fTrigPattern[1]<<endl;
-  cout << endl ; 
+  cout << endl;
+  cout << "Monte Carlo Trigger output:" << endl;
+  cout << " XSTopology Trigger in this run: "   << fTopology << endl;
+  cout << " Multiplicity Trigger in this run: " << fMultiplicity << endl;
+  cout << " Trigger Pattern in this run: ";
+  cout << fTrigPattern[0] << ", " << fTrigPattern[1] << endl;
+  cout << endl; 
 }
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.hxx
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.hxx	(revision 961)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.hxx	(revision 991)
@@ -2,12 +2,7 @@
 #define __MMcTrigHeader__
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>  
-
-#include <iostream.h>
+#ifndef MPARCONTAINER_H
 #include "MParContainer.h"
+#endif
 
 #include "MTriggerDefine.h"
@@ -37,5 +32,5 @@
   ~MMcTrigHeader(); 
 
-  void Print(Option_t *);
+  void Print(Option_t *opt=NULL) const;
   
   void SetTopology(Short_t nTop) {