Changeset 1484 for trunk

Timestamp:

08/06/02 08:49:51 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhist/MBinning.cc (modified) (2 diffs)
• mhist/MH.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- 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

trunk/MagicSoft/Mars/mhist/MBinning.cc

@@ -31 +31 @@
 
 #include <fstream.h>
+
+#include <TH1.h>        // InheritsFrom
+
+#include "MLog.h"
+#include "MLogManip.h"
 
 #include "MH.h"
@@ -97 +102 @@
 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);
 }

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -366 +366 @@
 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)