Changeset 1463 for trunk/MagicSoft/Mars/mhist/MH.cc

Timestamp:

07/31/02 18:03:51 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MH.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -56 +56 @@
 
 #include "MLog.h"
+#include "MLogManip.h"
+
+#include "MParList.h"
+#include "MParContainer.h"
 
 #include "MBinning.h"
@@ -228 +232 @@
 }
 
-void MH::SetBinning(TH1 *h, const TArrayD *binsx)
+void MH::SetBinning(TH1 *h, const TArrayD &binsx)
 {
     MBinning bx;
-    bx.SetEdges(*binsx);
+    bx.SetEdges(binsx);
     SetBinning(h, &bx);
 }
 
-void MH::SetBinning(TH2 *h, const TArrayD *binsx, const TArrayD *binsy)
+void MH::SetBinning(TH2 *h, const TArrayD &binsx, const TArrayD &binsy)
 {
     MBinning bx;
     MBinning by;
-    bx.SetEdges(*binsx);
-    by.SetEdges(*binsy);
+    bx.SetEdges(binsx);
+    by.SetEdges(binsy);
     SetBinning(h, &bx, &by);
 }
 
-void MH::SetBinning(TH3 *h, const TArrayD *binsx, const TArrayD *binsy, const TArrayD *binsz)
+void MH::SetBinning(TH3 *h, const TArrayD &binsx, const TArrayD &binsy, const TArrayD &binsz)
 {
     MBinning bx;
     MBinning by;
     MBinning bz;
-    bx.SetEdges(*binsx);
-    by.SetEdges(*binsy);
-    bz.SetEdges(*binsz);
+    bx.SetEdges(binsx);
+    by.SetEdges(binsy);
+    bz.SetEdges(binsz);
     SetBinning(h, &bx, &by, &bz);
 }
@@ -263 +267 @@
     bx[nx] = binsx->GetXmax();
 
-    SetBinning(h, &bx);
+    SetBinning(h, bx);
 }
 
@@ -278 +282 @@
     by[ny] = binsy->GetXmax();
 
-    SetBinning(h, &bx, &by);
+    SetBinning(h, bx, by);
 }
 
@@ -297 +301 @@
     bz[nz] = binsz->GetXmax();
 
-    SetBinning(h, &bx, &by, &bz);
+    SetBinning(h, bx, by, bz);
 }
 
@@ -319 +323 @@
 }
 
-void MH::ScaleAxis(TArrayD &bins, Double_t f)
+void MH::ScaleArray(TArrayD &bins, Double_t f)
 {
     for (int i=0; i<bins.GetSize(); i++)
@@ -325 +329 @@
 }
 
+TArrayD MH::ScaleAxis(TAxis &axe, Double_t f)
+{
+    TArrayD arr(axe.GetNbins()+1);
+
+    for (int i=1; i<=axe.GetNbins()+1; i++)
+        arr[i-1] = axe.GetBinLowEdge(i);
+
+    ScaleArray(arr, f);
+
+    return arr;
+}
+
 void MH::ScaleAxis(TH1 *h, Double_t fx, Double_t fy, Double_t fz)
 {
     if (h->InheritsFrom(TH3::Class()))
-        ScaleAxis(*((TH3*)h)->GetZaxis()->GetXbins(), fz);
+    {
+        SetBinning((TH3*)h,
+                   ScaleAxis(*h->GetXaxis(), fx),
+                   ScaleAxis(*h->GetYaxis(), fy),
+                   ScaleAxis(*h->GetZaxis(), fz));
+        return;
+    }
 
     if (h->InheritsFrom(TH2::Class()))
-        ScaleAxis(*((TH2*)h)->GetYaxis()->GetXbins(), fy);
+    {
+        SetBinning((TH2*)h,
+                   ScaleAxis(*h->GetXaxis(), fx),
+                   ScaleAxis(*h->GetYaxis(), fy));
+        return;
+    }
 
     if (h->InheritsFrom(TH1::Class()))
-        ScaleAxis(*h->GetXaxis()->GetXbins(), fx);
+        SetBinning(h, ScaleAxis(*h->GetXaxis(), fx));
+}
+
+Bool_t MH::ApplyBinning(const MParList &plist, TString name, TH1 *h)
+{
+    const MBinning *bins = (MBinning*)plist.FindObject("Binning"+name);
+    if (!bins)
+    {
+        gLog << warn << "Object 'Binning" << name << "' [MBinning] not found... no binning applied." << endl;
+        return kFALSE;
+    }
+
+    SetBinning(h, bins);
+    return kTRUE;
 }