Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 1483)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 1484)
@@ -1,3 +1,13 @@
                                                                   -*-*- END -*-*-
+
+ 2002/08/06: Thomas Bretz
+
+   * mhist/MHHillas.cc:
+     - fixed setting of binning for fCamera
+
+   * mhist/MH.cc, mhist/MBinning.cc:
+     - added sanity check in ApplyBinning and Apply
+
+
 
  2002/08/05: Thomas Bretz
Index: /trunk/MagicSoft/Mars/mhist/MBinning.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MBinning.cc	(revision 1483)
+++ /trunk/MagicSoft/Mars/mhist/MBinning.cc	(revision 1484)
@@ -31,4 +31,9 @@
 
 #include <fstream.h>
+
+#include <TH1.h>        // InheritsFrom
+
+#include "MLog.h"
+#include "MLogManip.h"
 
 #include "MH.h"
@@ -97,4 +102,10 @@
 void MBinning::Apply(TH1 &h)
 {
+    if (h.InheritsFrom("TH2") || h.InheritsFrom("TH3"))
+    {
+        *fLog << warn << "MBinning::Apply: '" << h.GetName() << "' is not a basic TH1 object... no binning applied." << endl;
+        return;
+    }
+
     MH::SetBinning(&h, this);
 }
Index: /trunk/MagicSoft/Mars/mhist/MH.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MH.cc	(revision 1483)
+++ /trunk/MagicSoft/Mars/mhist/MH.cc	(revision 1484)
@@ -366,4 +366,10 @@
 Bool_t MH::ApplyBinning(const MParList &plist, TString name, TH1 *h)
 {
+    if (h->InheritsFrom(TH2::Class()) || h->InheritsFrom(TH3::Class()))
+    {
+        gLog << warn << "MH::ApplyBinning: '" << h->GetName() << "' is not a basic TH1 object... no binning applied." << endl;
+        return kFALSE;
+    }
+
     const MBinning *bins = (MBinning*)plist.FindObject("Binning"+name);
     if (!bins)