Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2521)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2522)
@@ -19,12 +19,52 @@
      - added
 
+   * merpp.cc, readraw.cc:
+     - added option -?/-h
+     
+   * mona.cc:
+     - added MOnlineDump-class
+     - added port as a commandline option
+     - added commandline options
+     
+   * status.cc:
+     - added option -?/-h
+     - added filter to support MC and DAQ files
+     
+   * mdata/MDataChain.[h,cc]:
+     - added kERound
+
+   * mfilter/FilterLinkDef.h, mfilter/Makefile:
+     - added MFRealTimePeriod
+     
+   * mgeom/MGeomCam.h:
+     - added InitGeometry
+     
+   * mgeom/MGeomCamCT1.cc, mgeom/MGeomCamCT1Daniel.cc,
+     mgeom/MGeomCamECO1000.cc, mgeom/MGeomCamECO1000HG.cc,
+     mgeom/MGeomCamMagic.cc, mgeom/MGeomCamMagic919.cc,
+     mgeom/MGeomCamMagicHG.cc:
+     - replaced Calc* by InitGeometry
+     
+   * mmain/MEventDisplay.cc:
+     - added a filter to support MC and real files
+     
+   * mmain/Makefile:
+     - added mdata and mfilter
+     
+   * mraw/MRawFileRead.cc:
+     - close file in PostProcess
+     
+   * mraw/MRawRunHeader.h:
+     - added a comment
+     
+   * mraw/RawIncl.h:
+     - removed some obsolete includes
+
+   * mhist/MH*:
+     - cleaned up many includes
+
 
 
  2003/11/15: Thomas Bretz, Abelardo Moralejo
-
-   REMARK: These changes are preliminary! I want to implement a
-           more straight forward solution piping fSerialNumber
-           when calling SetupFill(). Don't relay on the current
-           code!
 
    * mhist/MH.h: 
Index: trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.h	(revision 2522)
@@ -7,9 +7,5 @@
 
 #ifndef ROOT_TH3
-#include "TH3.h"
-#endif
-
-#ifndef ROOT_TH2
-#include "TH2.h"
+#include <TH3.h>
 #endif
 
@@ -17,7 +13,5 @@
 class MHillasSrc;
 class MEnergyEst;
-class TH2D;
 class MParList;
-
 
 class MHAlphaEnergyTheta : public MH
@@ -47,7 +41,2 @@
 
 #endif
-
-
-
-
-
Index: trunk/MagicSoft/Mars/mhist/MHCT1Supercuts.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCT1Supercuts.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHCT1Supercuts.h	(revision 2522)
@@ -32,5 +32,4 @@
     void Draw(Option_t *opt=NULL);
 
-
     ClassDef(MHCT1Supercuts, 1) // Container which holds histograms for the supercuts
 };
Index: trunk/MagicSoft/Mars/mhist/MHEffOnTime.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEffOnTime.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHEffOnTime.h	(revision 2522)
@@ -6,5 +6,5 @@
 #endif
 #ifndef ROOT_TH1
-#include "TH1.h"
+#include <TH1.h>
 #endif
 
Index: trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHEffOnTimeTheta.h	(revision 2522)
@@ -6,5 +6,5 @@
 #endif
 #ifndef ROOT_TH1
-#include "TH1.h"
+#include <TH1.h>
 #endif
 
Index: trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHEffOnTimeTime.h	(revision 2522)
@@ -6,5 +6,5 @@
 #endif
 #ifndef ROOT_TH1
-#include "TH1.h"
+#include <TH1.h>
 #endif
 
Index: trunk/MagicSoft/Mars/mhist/MHEnergyTheta.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHEnergyTheta.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHEnergyTheta.h	(revision 2522)
@@ -6,5 +6,5 @@
 #endif
 #ifndef ROOT_TH2
-#include "TH2.h"
+#include <TH2.h>
 #endif
 
Index: trunk/MagicSoft/Mars/mhist/MHFlux.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHFlux.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHFlux.h	(revision 2522)
@@ -11,9 +11,9 @@
 
 #ifndef ROOT_TH1
-#include "TH1.h"
+#include <TH1.h>
 #endif
 
 #ifndef ROOT_TH2
-#include "TH2.h"
+#include <TH2.h>
 #endif
 
Index: trunk/MagicSoft/Mars/mhist/MHHadronness.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHHadronness.cc	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHHadronness.cc	(revision 2522)
@@ -157,7 +157,6 @@
         if (!fMcEvt)
         {
-	    TString str = AddSerialNumber("MMcEvt");
-	    str += " not found... aborting.";
-           *fLog << err << dbginf << str << endl;
+            *fLog << err << dbginf << AddSerialNumber("MMcEvt");
+            *fLog << " not found... aborting." << endl;
             return kFALSE;
         }
@@ -576,3 +575,2 @@
     fMatrix = NULL; 
 }
-
Index: trunk/MagicSoft/Mars/mhist/MHOnSubtraction.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHOnSubtraction.cc	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHOnSubtraction.cc	(revision 2522)
@@ -44,9 +44,11 @@
 #include "MHOnSubtraction.h"
 
+#include <TPaveText.h>
+#include <TPaveLabel.h>
+#include <TF1.h>
+#include <TLegend.h>
 #include <TCanvas.h>
-#include <TF1.h>
-#include <TPaveText.h>
-#include <TLegend.h>
 #include <TStyle.h>
+#include <TGraph.h>
 
 #include "MBinning.h"
@@ -1702,39 +1704,4 @@
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// -------------------------------------------------------------------------
-//
-// Set the binnings and prepare the filling of the histograms
-//
-Bool_t MHOnSubtraction::SetupFill(const MParList *pliston)
-{
-  return kTRUE;
-}
-
-// -------------------------------------------------------------------------
-//
-// Dummy Fill
-//
-Bool_t MHOnSubtraction::Fill(const MParContainer *pcont, const Stat_t w)
-{
-  return kTRUE;
-}
-
 // -------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mhist/MHOnSubtraction.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHOnSubtraction.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHOnSubtraction.h	(revision 2522)
@@ -5,29 +5,12 @@
 #include "MH.h"
 #endif
-#ifndef ROOT_TH1
-#include "TH1.h"
-#endif
-#ifndef ROOT_TH3
-#include "TH3.h"
-#endif
-#ifndef ROOT_TGraph
-#include "TGraph.h"
-#endif
-#ifndef ROOT_TPaveLabel
-#include "TPaveLabel.h"
-#endif
-#ifndef ROOT_TFile
-#include "TFile.h"
-#endif
 
+class TH1D;
+class TH3D;
+class TPad;
+class TGraph;
+class TLegend;
+class TPaveLabel;
 
-
-
-class TH2D;
-class TPad;
-class TLegend;
-class TString;
-
-class MParList;
 class MHArray;
 
@@ -70,10 +53,4 @@
   ~MHOnSubtraction();
 
-  virtual Bool_t SetupFill(const MParList *pliston);
-  virtual Bool_t Fill(const MParContainer *pcont, const Stat_t w);
-
-/*   const TH3D *GetHist() { return fH; } */
-/*   const TH3D *GetHist() const { return fH; } */
-
   Double_t CalcSignificance(Double_t nOn, Double_t nOff, Double_t theta);
   Double_t GetSignificance()  { return fSignificance; };
Index: trunk/MagicSoft/Mars/mhist/MHSigmaPixel.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHSigmaPixel.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHSigmaPixel.h	(revision 2522)
@@ -7,12 +7,12 @@
 
 #ifndef ROOT_TH2
-#include "TH2.h"
+#include <TH2.h>
 #endif
 
+class TH2D;
+
 class MMcEvt;
+class MParList;
 class MPedestalCam;
-class TH2D;
-class MParList;
-
 
 class MHSigmaPixel : public MH
Index: trunk/MagicSoft/Mars/mhist/MHSigmaTheta.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHSigmaTheta.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHSigmaTheta.h	(revision 2522)
@@ -7,9 +7,9 @@
 
 #ifndef ROOT_TH2
-#include "TH2.h"
+#include <TH2.h>
 #endif
 
 #ifndef ROOT_TH3
-#include "TH3.h"
+#include <TH3.h>
 #endif
 
Index: trunk/MagicSoft/Mars/mhist/MHSigmabarTheta.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHSigmabarTheta.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHSigmabarTheta.h	(revision 2522)
@@ -7,5 +7,5 @@
 
 #ifndef ROOT_TH2
-#include "TH2.h"
+#include <TH2.h>
 #endif
 
Index: trunk/MagicSoft/Mars/mhist/MHThetabarTheta.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHThetabarTheta.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHThetabarTheta.h	(revision 2522)
@@ -6,5 +6,5 @@
 #endif
 #ifndef ROOT_TProfile
-#include "TProfile.h"
+#include <TProfile.h>
 #endif
 
Index: trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHTimeDiffTheta.h	(revision 2522)
@@ -6,5 +6,5 @@
 #endif
 #ifndef ROOT_TH2
-#include "TH2.h"
+#include <TH2.h>
 #endif
 
Index: trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.h
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.h	(revision 2521)
+++ trunk/MagicSoft/Mars/mhist/MHTimeDiffTime.h	(revision 2522)
@@ -6,5 +6,5 @@
 #endif
 #ifndef ROOT_TH2
-#include "TH2.h"
+#include <TH2.h>
 #endif