Changeset 10056 for trunk

Timestamp:

11/22/10 16:11:05 (14 years ago)

Author:

tbretz

Message:

Added scale factor for time axis in MH3.

Location:

trunk/Mars

Files:

• Changelog (modified) (1 diff)
• mhbase/MH3.cc (modified) (5 diffs)
• mhbase/MH3.h (modified) (2 diffs)

trunk/Mars/Changelog

@@ -30 +30 @@
    * mbase/MStatusDisplay.cc:
      - display canvas title in status line
+
+   * mhbase/MH3.[h,cc]:
+     - added scaling for fourth (time) axis
 
 

trunk/Mars/mhbase/MH3.cc

@@ -214 +214 @@
     fScale[1] = 1;
     fScale[2] = 1;
+    fScale[3] = 1;
 
     fConversion = NULL;
@@ -789 +790 @@
     {
     case -3:
-        t = fData[3]->GetValue();
+        t = fData[3]->GetValue()*fScale[3];
     case -2:
     case  3:
@@ -800 +801 @@
     }
 
-    if (fData[4])
-        w *= fData[4]->GetValue();
+    if (fWeight)
+        w *= fWeight->GetValue();
 
     // If label option is set, convert value to label
@@ -1266 +1267 @@
     switch (fDimension)
     {
+    case -3:
+        h->SetScaleZ(fScale[3]);
     case -2:
     case 3:
@@ -1276 +1279 @@
     }
 
-    if (fData[4])
-        h->SetWeight(fData[4]->GetRule());
+    if (fWeight)
+        h->SetWeight(fWeight->GetRule());
 
     return h;

trunk/Mars/mhbase/MH3.h

@@ -71 +71 @@
     MData      *fWeight;         // Additional weight
     MBinning   *fBins[3];        // Binning set omitting the parlist access
-    Double_t    fScale[3];       // Scale for the three axis (eg unit)
+    Double_t    fScale[4];       // Scale for the three axis (eg unit)
     Byte_t      fStyleBits;      // Set the range of a histogram automatically in Finalize
 
@@ -100 +100 @@
     void SetScaleY(Double_t scale) { fScale[1] = scale; }
     void SetScaleZ(Double_t scale) { fScale[2] = scale; }
-    void SetScale(Double_t x, Double_t y=1, Double_t z=2) { SetScaleX(x); SetScaleY(y); SetScaleZ(z); }
+    void SetScaleT(Double_t scale) { fScale[3] = scale; }
+    void SetScale(Double_t x, Double_t y=1, Double_t z=1, Double_t t=1) { SetScaleX(x); SetScaleY(y); SetScaleZ(z); SetScaleT(t); }
 
     void SetLogx(Bool_t b=kTRUE) { b ? fHist->SetBit(kIsLogx) : fHist->ResetBit(kIsLogx); }