Changeset 8698 for trunk/MagicSoft/Mars/mhbase/MH3.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhbase/MH3.cc (modified) (11 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()));