Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 1209)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 1210)
@@ -15,4 +15,14 @@
    * mmain/MAnalysis.cc, macros/MagicHillas.C:
      - changed to new stylish MHillas parameter containers
+
+   * meventdisp/MGEvtDisplay.cc, mgui/MCamDisplay.cc,
+     mmain/MDataCheck.[h,cc]:
+     - fixed a warning in red hat linux
+  
+   * mfilter/FilterLinkDef.h, mfilter/Makefile:
+     - added MFAlpha
+  
+   * mhist/MHHillas.[h,cc], mhist/MHHillasSrc.[h,cc]:
+     - added SetupFill and usage of MBinning objects
 
 
Index: /trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 1209)
+++ /trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 1210)
@@ -28,4 +28,7 @@
 #pragma link C++ class MHillasCalc+;
 
+#pragma link C++ class MEnergyEst+;
+#pragma link C++ class MEnergyEstimate+;
+
 #pragma link C++ class MPedCalcPedRun+;
 
Index: /trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc
===================================================================
--- /trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc	(revision 1209)
+++ /trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc	(revision 1210)
@@ -469,5 +469,5 @@
     TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo
 
-    fi.fFileTypes = gSaveAsTypes;
+    fi.fFileTypes = (const char**)gSaveAsTypes;
     fi.fIniDir    = StrDup(dir);
 
Index: /trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h
===================================================================
--- /trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h	(revision 1209)
+++ /trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h	(revision 1210)
@@ -5,4 +5,5 @@
 #pragma link off all functions;
 
+#pragma link C++ class MFAlpha+;
 #pragma link C++ class MFTriggerLvl1+;
 
Index: /trunk/MagicSoft/Mars/mfilter/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mfilter/Makefile	(revision 1209)
+++ /trunk/MagicSoft/Mars/mfilter/Makefile	(revision 1210)
@@ -20,5 +20,5 @@
 # @endcode 
 
-INCLUDES = -I. -I../mbase -I../mmc
+INCLUDES = -I. -I../mbase -I../mmc -I../manalysis
 
 # @code 
@@ -31,5 +31,6 @@
 .SUFFIXES: .c .cc .cxx .h .hxx .o 
 
-SRCFILES = MFTriggerLvl1.cc 
+SRCFILES = MFTriggerLvl1.cc \
+	   MFAlpha.cc
 
 SRCS    = $(SRCFILES)
Index: /trunk/MagicSoft/Mars/mgui/MCamDisplay.cc
===================================================================
--- /trunk/MagicSoft/Mars/mgui/MCamDisplay.cc	(revision 1209)
+++ /trunk/MagicSoft/Mars/mgui/MCamDisplay.cc	(revision 1210)
@@ -291,5 +291,5 @@
     //   first treat the over- and under-flows
     //
-    const Float_t maxcolidx = 49.0;
+    const Int_t maxcolidx = 49;
 
     if (val >= fMaxPhe)
@@ -303,5 +303,5 @@
     //
     const Float_t ratio  = (val-fMinPhe) / (fMaxPhe-fMinPhe);
-    const Int_t   colidx = (Int_t)(maxcolidx*ratio + .5);
+    const Int_t   colidx = (Int_t)(ratio*maxcolidx + .5);
 
     return gStyle->GetColorPalette(colidx);
Index: /trunk/MagicSoft/Mars/mhist/HistLinkDef.h
===================================================================
--- /trunk/MagicSoft/Mars/mhist/HistLinkDef.h	(revision 1209)
+++ /trunk/MagicSoft/Mars/mhist/HistLinkDef.h	(revision 1210)
@@ -8,5 +8,4 @@
 
 #pragma link C++ class MH+;
-#pragma link C++ class MBinning+;
 #pragma link C++ class MHFadcCam+;
 #pragma link C++ class MHFadcPix+;
@@ -14,6 +13,16 @@
 #pragma link C++ class MHHillasSrc+;
 #pragma link C++ class MHStarMap+;
+#pragma link C++ class MHEnergyTime+;
+#pragma link C++ class MHEnergyTheta+;
 #pragma link C++ class MHMcEnergy+;
 #pragma link C++ class MHMcCollectionArea+;
+#pragma link C++ class MHAlphaEnergyTime;
+#pragma link C++ class MHAlphaEnergyTheta;
+#pragma link C++ class MHEffOnTimeTime+;
+#pragma link C++ class MHEffOnTimeTheta+;
+#pragma link C++ class MHDiffTimeTime+;
+#pragma link C++ class MHDiffTimeTheta+;
+
+#pragma link C++ class MBinning+;
 
 #pragma link C++ class MHMcRate+;
Index: /trunk/MagicSoft/Mars/mhist/MFillH.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MFillH.cc	(revision 1209)
+++ /trunk/MagicSoft/Mars/mhist/MFillH.cc	(revision 1210)
@@ -87,6 +87,6 @@
     fTitle = title ? title : "Task to fill Mars histograms";
 
-    fH            = NULL;
-    fParContainer = NULL;
+    fH                = NULL;
+    fParContainer     = NULL;
 }
 
Index: /trunk/MagicSoft/Mars/mhist/MHHillas.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHHillas.cc	(revision 1209)
+++ /trunk/MagicSoft/Mars/mhist/MHHillas.cc	(revision 1210)
@@ -40,4 +40,5 @@
 
 #include "MHillas.h"
+#include "MParList.h"
 
 ClassImp(MHHillas);
@@ -47,11 +48,11 @@
 // Setup four histograms for Width, Length
 //
-MHHillas::MHHillas (const char *name, const char *title)
+MHHillas::MHHillas(const char *name, const char *title)
 {
     //
     //   set the name and title of this object
     //
-    fName  = name  ? name  : "MHHillas" ;
-    fTitle = title ? title : "Container for Hillas histograms" ;
+    fName  = name  ? name  : "MHHillas";
+    fTitle = title ? title : "Container for Hillas histograms";
 
     //
@@ -81,4 +82,24 @@
     delete fWidth;
     delete fLength;
+}
+
+// --------------------------------------------------------------------------
+//
+// Setup the Binning for the histograms automatically if the correct
+// instances of MBinning (with the names 'BinningWidth' and 'BinningLength')
+// are found in the parameter list
+//
+Bool_t MHHillas::SetupFill(const MParList *plist)
+{
+    const MBinning* binsw = (MBinning*)plist->FindObject("BinningWidth");
+    const MBinning* binsl = (MBinning*)plist->FindObject("BinningLength");
+
+    if (binsw)
+        SetBinning(fWidth, binsw);
+
+    if (binsl)
+        SetBinning(fLength, binsl);
+
+    return kTRUE;
 }
 
Index: /trunk/MagicSoft/Mars/mhist/MHHillas.h
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHHillas.h	(revision 1209)
+++ /trunk/MagicSoft/Mars/mhist/MHHillas.h	(revision 1210)
@@ -19,4 +19,5 @@
     ~MHHillas();
 
+    Bool_t SetupFill(const MParList *pList);
     Bool_t Fill(const MParContainer *par);
 
Index: /trunk/MagicSoft/Mars/mhist/MHHillasSrc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHHillasSrc.cc	(revision 1209)
+++ /trunk/MagicSoft/Mars/mhist/MHHillasSrc.cc	(revision 1210)
@@ -38,4 +38,6 @@
 #include <TCanvas.h>
 
+#include "MParList.h"
+
 #include "MHillas.h"
 #include "MHillasSrc.h"
@@ -52,6 +54,6 @@
     //   set the name and title of this object
     //
-    fName  = name  ? name  : "MHHillasSrc" ;
-    fTitle = title ? title : "Container for Hillas histograms" ;
+    fName  = name  ? name  : "MHHillasSrc";
+    fTitle = title ? title : "Container for Hillas histograms";
 
     //
@@ -81,4 +83,24 @@
     delete fAlpha;
     delete fDist;
+}
+
+// --------------------------------------------------------------------------
+//
+// Setup the Binning for the histograms automatically if the correct
+// instances of MBinning (with the names 'BinningAlpha' and 'BinningDist')
+// are found in the parameter list
+//
+Bool_t MHHillasSrc::SetupFill(const MParList *plist)
+{
+    const MBinning* binsa = (MBinning*)plist->FindObject("BinningAlpha");
+    const MBinning* binsd = (MBinning*)plist->FindObject("BinningDist");
+
+    if (binsa)
+        SetBinning(fAlpha, binsa);
+
+    if (binsd)
+        SetBinning(fDist, binsd);
+
+    return kTRUE;
 }
 
Index: /trunk/MagicSoft/Mars/mhist/MHHillasSrc.h
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHHillasSrc.h	(revision 1209)
+++ /trunk/MagicSoft/Mars/mhist/MHHillasSrc.h	(revision 1210)
@@ -19,4 +19,5 @@
     ~MHHillasSrc();
 
+    Bool_t SetupFill(const MParList *pList);
     Bool_t Fill(const MParContainer *par);
 
Index: /trunk/MagicSoft/Mars/mmain/MDataCheck.cc
===================================================================
--- /trunk/MagicSoft/Mars/mmain/MDataCheck.cc	(revision 1209)
+++ /trunk/MagicSoft/Mars/mmain/MDataCheck.cc	(revision 1210)
@@ -97,5 +97,5 @@
 //  histograms.
 //
-void MDataCheck::ViewAdcSpectra(const Char_t *inputfile, const Char_t *treeName)
+void MDataCheck::ViewAdcSpectra(const char *inputfile, const char *treeName)
 {
     //
Index: /trunk/MagicSoft/Mars/mmain/MDataCheck.h
===================================================================
--- /trunk/MagicSoft/Mars/mmain/MDataCheck.h	(revision 1209)
+++ /trunk/MagicSoft/Mars/mmain/MDataCheck.h	(revision 1210)
@@ -9,9 +9,9 @@
 {
 private:
-    void ViewAdcSpectra(const Char_t *inputfile, const Char_t *treeName);
+    void ViewAdcSpectra(const char *inputfile, const char *treeName);
 
 public:
     MDataCheck(const TGWindow *main=NULL, const TGWindow *p=NULL,
-                    const UInt_t w=500, const UInt_t h=500) ;
+               const UInt_t w=500, const UInt_t h=500) ;
 
     Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);