Changeset 8657 for trunk/MagicSoft/Mars/mhbase

Timestamp:

08/06/07 15:44:16 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MH.cc (modified) (2 diffs)
• MH.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.32 2007-01-10 12:58:25 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MH.cc,v 1.33 2007-08-06 14:44:13 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -619 +619 @@
 }
 
+Bool_t MH::ApplyBinning(const MParList &plist, TString x, TString y, TH2 *h)
+{
+    const MBinning *binsx = (MBinning*)plist.FindObject("Binning"+x);
+    if (!binsx)
+    {
+        gLog << inf << "Object 'Binning" << x << "' [MBinning] not found... no binning applied." << endl;
+        return kFALSE;
+    }
+    const MBinning *binsy = (MBinning*)plist.FindObject("Binning"+y);
+    if (!binsy)
+    {
+        gLog << inf << "Object 'Binning" << y << "' [MBinning] not found... no binning applied." << endl;
+        return kFALSE;
+    }
+
+    if (binsx->IsDefault() && binsy->IsDefault())
+        return kTRUE;
+
+    // -------------------------
+    /*
+     MBinning binsx, binsy, binsz;
+     binsx.SetEdges(fHist, 'x');
+     binsy.SetEdges(fHist, 'y');
+     binsz.SetEdges(fHist, 'z');
+     */
+    // -------------------------
+
+    SetBinning(h, binsx, binsy);
+
+    return kTRUE;
+}
+
+Bool_t MH::ApplyBinning(const MParList &plist, TString x, TString y, TString z, TH3 *h)
+{
+    const MBinning *binsx = (MBinning*)plist.FindObject("Binning"+x);
+    if (!binsx)
+    {
+        gLog << inf << "Object 'Binning" << x << "' [MBinning] not found... no binning applied." << endl;
+        return kFALSE;
+    }
+    const MBinning *binsy = (MBinning*)plist.FindObject("Binning"+y);
+    if (!binsy)
+    {
+        gLog << inf << "Object 'Binning" << y << "' [MBinning] not found... no binning applied." << endl;
+        return kFALSE;
+    }
+    const MBinning *binsz = (MBinning*)plist.FindObject("Binning"+z);
+    if (!binsz)
+    {
+        gLog << inf << "Object 'Binning" << z << "' [MBinning] not found... no binning applied." << endl;
+        return kFALSE;
+    }
+
+    if (binsx->IsDefault() && binsy->IsDefault() && binsz->IsDefault())
+        return kTRUE;
+
+    SetBinning(h, binsx, binsy, binsz);
+    return kTRUE;
+}
+
 void MH::FindGoodLimits(Int_t nbins, Int_t &newbins, Double_t &xmin, Double_t &xmax, Bool_t isInteger)
 {

trunk/MagicSoft/Mars/mhbase/MH.h

@@ -80 +80 @@
     static void RemoveFirstBin(TH1 &h);
 
-    static Bool_t ApplyBinning(const MParList &plist, TString name, TH1 *h);
+    static Bool_t ApplyBinning(const MParList &plist, TString x, TH1 *h);
+    static Bool_t ApplyBinning(const MParList &plist, TString x, TString y, TH2 *h);
+    static Bool_t ApplyBinning(const MParList &plist, TString x, TString y, TString z, TH3 *h);
 
     static void    ScaleArray(TArrayD &bins, Double_t f);