Changeset 8698 for trunk/MagicSoft/Mars/mhbase

Timestamp:

08/23/07 11:26:38 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MH3.cc (modified) (11 diffs)
• MH3.h (modified) (4 diffs)
• MHn.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mhbase/MH3.cc

@@ -88 +88 @@
 // Class Version 3:
 // ----------------
-//   - Byte_t fStyleBits
+//   - Byte_t   fStyleBits
+//   + MBinning fBins[3]
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -145 +146 @@
     fData[2] = NULL;
 
+    fBins[0] = NULL;
+    fBins[1] = NULL;
+    fBins[2] = NULL;
+
     fName  = gsDefName;
     fTitle = gsDefTitle;
@@ -172 +177 @@
     fData[1] = NULL;
     fData[2] = NULL;
+
+    fBins[0] = NULL;
+    fBins[1] = NULL;
+    fBins[2] = NULL;
 
     fName  = gsDefName;
@@ -197 +206 @@
     fData[2] = NULL;
 
+    fBins[0] = NULL;
+    fBins[1] = NULL;
+    fBins[2] = NULL;
+
     switch (fDimension)
     {
@@ -233 +246 @@
     fData[2] = NULL;
 
+    fBins[0] = NULL;
+    fBins[1] = NULL;
+    fBins[2] = NULL;
+
     fName  = gsDefName;
     fTitle = gsDefTitle;
@@ -260 +277 @@
     fData[2] = new MDataPhrase(memberz);
 
+    fBins[0] = NULL;
+    fBins[1] = NULL;
+    fBins[2] = NULL;
+
     fName  = gsDefName;
     fTitle = gsDefTitle;
@@ -339 +360 @@
     {
     case 3:
-        binsz = (MBinning*)plist->FindObject(bz, "MBinning");
+        binsz = fBins[2] ? fBins[2] : (MBinning*)plist->FindObject(bz, "MBinning");
         if (!binsz)
         {
@@ -354 +375 @@
             fHist->SetBit(kIsLogz);
     case 2:
-        binsy = (MBinning*)plist->FindObject(by, "MBinning");
+        binsy = fBins[1] ? fBins[1] : (MBinning*)plist->FindObject(by, "MBinning");
         if (!binsy)
         {
@@ -369 +390 @@
             fHist->SetBit(kIsLogy);
     case 1:
-        binsx = (MBinning*)plist->FindObject(bx, "MBinning");
+        binsx = fBins[0] ? fBins[0] : (MBinning*)plist->FindObject(bx, "MBinning");
         if (!binsx)
         {
@@ -507 +528 @@
     {
         GetRangeX(*fHist, lo, hi);
-        cout << "====> " << GetName() << " " << fHist->GetName() << ": " << lo << " " << hi <<" " << fHist->GetNbinsX() <<  endl;
         fHist->GetXaxis()->SetRange(lo-2, hi+1);
     }
@@ -525 +545 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// Setup a inversed deep blue sea palette for the fCenter histogram.
-//
-void MH3::SetColors() const
-{
-    // FIXME: This must be redone each time the canvas is repainted....
-    gStyle->SetPalette(51, NULL);
-    Int_t c[50];
-    for (int i=0; i<50; i++)
-        c[49-i] = gStyle->GetColorPalette(i);
-    gStyle->SetPalette(50, c);
-}
-
 void MH3::Paint(Option_t *o)
 {
     TProfile *p=0;
+
+    if (fDimension==2)
+        MH::SetPalette("pretty");
 
     const TString pfx(Form("%sProfX", fHist->GetName()));

trunk/MagicSoft/Mars/mhbase/MH3.h

@@ -11 +11 @@
 class TH1;
 class MData;
+class MBinning;
 
 class MH3 : public MH
@@ -23 +24 @@
     TH1        *fHist;           // Histogram to fill
     MData      *fData[3];        // Object from which the data is filled
+    MBinning   *fBins[3];        // Binning set omitting the parlist access
     Double_t    fScale[3];       // Scale for the three axis (eg unit)
     Byte_t      fStyleBits;      // Set the range of a histogram automatically in Finalize
@@ -58 +60 @@
     void SetAutoRange(Bool_t x=kTRUE, Bool_t y=kTRUE, Bool_t z=kTRUE) { SetAutoRangeX(x); SetAutoRangeY(y); SetAutoRangeZ(z); }
 
+    void SetBinningX(MBinning *x) { fBins[0] = x; }
+    void SetBinningY(MBinning *y) { fBins[1] = y; }
+    void SetBinningZ(MBinning *z) { fBins[2] = z; }
+    void SetBinnings(MBinning *x=0, MBinning *y=0, MBinning *z=0) { SetBinningX(x); SetBinningY(y); SetBinningZ(z); }
+
     void Sumw2() const { if (fHist) fHist->Sumw2(); }
 
@@ -90 +97 @@
     void SetTitle(const char *title);
 
-    void SetColors() const;
     void Draw(Option_t *opt=NULL);
     void Paint(Option_t *opt="");

trunk/MagicSoft/Mars/mhbase/MHn.cc

@@ -27 +27 @@
 // MHn
 //
-//   +-----------------+
-//   |1                |
-//   |                 |
-//   |                 |
-//   |                 |
-//   |                 |
-//   +-----------------+
-//
-//   +-----------------+      +--------+--------+
-//   |1                |      |1       |2       |
-//   |                 |      |        |        |
-//   +-----------------+      |        |        |
-//   |2                |      |        |        |
-//   |                 |      |        |        |
-//   +-----------------+      +--------+--------+
-//
-//   +--------+--------+      +-----+-----+-----+
-//   |1       |2       |      |1    |3          |
-//   |        |        |      |     |           |
-//   +--------+--------+      +-----+           +
-//   |3       |        |      |2    |           |
-//   |        |        |      |     |           |
-//   +--------+--------+      +-----+-----+-----+
-//
-//   +--------+--------+      +------+----------+
-//   |1       |2       |      |1     |4         |
-//   |        |        |      +------+          |
-//   +--------+--------+      |2     |          |
-//   |3       |4       |      +------+          |
-//   |        |        |      |3     |          |
-//   +--------+--------+      +------+----------+
-//
-//   +-----+-----+-----+      +--------+--------+
-//   |1    |2    |3    |      |1       |2       |
-//   |     |     |     |      +--------+--------|
-//   +-----+-----+-----+      |3       |4       |
-//   |4    |5    |     |      +--------+        |
-//   |     |     |     |      |5       |        |
-//   +-----+-----+-----+      +--------+--------+
-//
-//   +-----+-----+-----+      +--------+--------+
-//   |1    |2    |3    |      |1       |2       |
-//   |     |     |     |      +--------+--------+
-//   +-----+-----+-----+      |3       |4       |
-//   |4    |5    |6    |      +--------+--------+
-//   |     |     |     |      |5       |6       |
-//   +-----+-----+-----+      +--------+--------+
+//
+// Initialization
+// --------------
+//
+// MHn is a histogram class which derives from MH as all Mars histogram
+// classes do, i.e. to fill the histogram use MFillH. (Example below)
+//
+// After instantisation of MHn add the histograms of your interest using
+// AddHist. Before the next AddHist is called you can now set the options
+// of your histogram using InitName, InitTitle, SetLog, SetAutoRange,
+// SetScale and SetDrawOption.
+//
+//
+// Layout
+// ------
+//
+// The layout of the histograms on the screen depends on the number of
+// initialized histograms and the option SetLayout. For details see below.
+//
+//  SetLayout(MHn::kSimple)
+//       < default >          SetLayout(MHn::kComplex)
+// ========================= ==========================
+//    +-----------------+
+//    |1                |
+//    |                 |
+//    |                 |
+//    |                 |
+//    |                 |
+//    +-----------------+
+//
+//    +-----------------+        +--------+--------+
+//    |1                |        |1       |2       |
+//    |                 |        |        |        |
+//    +-----------------+        |        |        |
+//    |2                |        |        |        |
+//    |                 |        |        |        |
+//    +-----------------+        +--------+--------+
+//
+//    +--------+--------+        +-----+-----+-----+
+//    |1       |2       |        |1    |3          |
+//    |        |        |        |     |           |
+//    +--------+--------+        +-----+           +
+//    |3       |        |        |2    |           |
+//    |        |        |        |     |           |
+//    +--------+--------+        +-----+-----+-----+
+//
+//    +--------+--------+        +------+----------+
+//    |1       |2       |        |1     |4         |
+//    |        |        |        +------+          |
+//    +--------+--------+        |2     |          |
+//    |3       |4       |        +------+          |
+//    |        |        |        |3     |          |
+//    +--------+--------+        +------+----------+
+//
+//    +-----+-----+-----+        +--------+--------+
+//    |1    |2    |3    |        |1       |2       |
+//    |     |     |     |        +--------+--------|
+//    +-----+-----+-----+        |3       |4       |
+//    |4    |5    |     |        +--------+        |
+//    |     |     |     |        |5       |        |
+//    +-----+-----+-----+        +--------+--------+
+//
+//    +-----+-----+-----+        +--------+--------+
+//    |1    |2    |3    |        |1       |2       |
+//    |     |     |     |        +--------+--------+
+//    +-----+-----+-----+        |3       |4       |
+//    |4    |5    |6    |        +--------+--------+
+//    |     |     |     |        |5       |6       |
+//    +-----+-----+-----+        +--------+--------+
 //
 //
 // For example:
-//   MHn myhist
-//   ...
+// ------------
+//    // Instatiate the MHn class with default name and title
+//    MHn hres("Energy2", "Energy Residual (lg E_{est} - lg E_{mc})");
+//
+//    // Initialize your first histogram (here a 2D histogram with x- and y-axis)
+//    hres.AddHist("MMcEvt.fEnergy", "log10(MEnergyEst.fVal)-log10(MMcEvt.fEnergy)");
+//    // Initialize the name of the histogram (ResEmc) and the title of the
+//    // binnings ((here BinningEnergy for x-axis and BinningEnergyResidual for y-axis)
+//    hres.InitName("ResEmc;Energy;EnergyResidual");
+//    // Initialize the title of the histogram and the axis titles
+//    hres.InitTitle(";E_{mc} [GeV];\\Delta lg E;");
+//    // Initialize the draw option for the histogram
+//    hres.SetDrawOption("colz profx");
+//    // for more details on the options and more options see below
+//    // or the class reference of MH3
+//
+//    // Initialize a second histogram
+//    hres.AddHist("MPointingPos.fZd", "log10(MEnergyEst.fVal)-log10(MMcEvt.fEnergy)");
+//    hres.InitName("ResTheta;Theta;EnergyResidual");
+//    hres.InitTitle(";Zd [\\circ];\\Delta lg E;");
+//    hres.SetDrawOption("colz profx");
+//
+//    // Note that only AddHist is mandatory. All other options can be omitted
+//
+//    // Initialize the filling task which can now be added to the tasklist
+//    MFillH fill(&hres);
+//    ...
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -268 +315 @@
 
     return kTRUE;
+}
+
+void MHn::SetScale(Double_t x, Double_t y, Double_t z) const
+{
+    if (fHist[fNum-1])
+        fHist[fNum-1]->SetScale(x, y, z);
+}
+
+void MHn::SetLog(Bool_t x, Bool_t y, Bool_t z) const
+{
+    if (fHist[fNum-1])
+        fHist[fNum-1]->SetLog(x, y, z);
+}
+void MHn::SetAutoRange(Bool_t x, Bool_t y, Bool_t z) const
+{
+    if (fHist[fNum-1])
+        fHist[fNum-1]->SetAutoRange(x, y, z);
+}
+
+void MHn::Sumw2() const
+{
+    if (fHist[fNum-1])
+        fHist[fNum-1]->Sumw2();
+}
+
+void MHn::SetBinnings(MBinning *x, MBinning *y, MBinning *z) const
+{
+    if (fHist[fNum-1])
+        fHist[fNum-1]->SetBinnings(x, y, z);
 }
 
@@ -337 +413 @@
             break;
         case 3:   // 3
-        case 4:   // 4
             pad->Divide(2,2);
+            delete pad->GetPad(4);
+            break;
+         case 4:   // 4
+            pad->Divide(2,2);
             break;
         case 5:   // 5
+            pad->Divide(3,2);
+            delete pad->GetPad(6);
+            break;
         case 6:   // 6
             pad->Divide(3,2);