Changeset 8478 for trunk/MagicSoft/Mars/mhvstime

Timestamp:

05/09/07 13:15:53 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhvstime

Files:

• MHVsTime.cc (modified) (9 diffs)
• MHVsTime.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mhvstime/MHVsTime.cc

@@ -18 +18 @@
 !   Author(s): Thomas Bretz, 11/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2004
+!   Copyright: MAGIC Software Development, 2000-2007
 !
 !
@@ -58 +58 @@
 //  - MDataChain *fError;     // Object from which the error is filled
 //
+// Class Version 3:
+// ----------------
+//  + Double_t fMinimum;      // User defined minimum
+//  + Double_t fMaximum;      // User defined maximum
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MHVsTime.h"
@@ -92 +97 @@
 MHVsTime::MHVsTime(const char *rule, const char *error)
     : fGraph(NULL), fData(NULL), fError(NULL), fScale(1), fMaxPts(-1),
-    fNumEvents(1), fUseEventNumber(0)
+    fNumEvents(1), fMinimum(-1111), fMaximum(-1111), fUseEventNumber(0)
 {
     fName  = gsDefName;
@@ -129 +134 @@
 // --------------------------------------------------------------------------
 //
-// Call SetMinimum of fGraph
-//
-void MHVsTime::SetMinimum(Double_t min)
-{
-    if (fGraph)
-        fGraph->SetMinimum(min);
-}
-
-// --------------------------------------------------------------------------
-//
 // Return the data members used by the data chain to be used in
 // MTask::AddBranchToList
@@ -178 +173 @@
     fMean = 0;
     fN    = 0;
+
+    fMin =  FLT_MAX;
+    fMax = -FLT_MAX;
 
     return kTRUE;
@@ -252 +250 @@
         }
 
-        fGraph->SetPoint(fGraph->GetN(), t, fMean/fN*fScale);
+        const Double_t val = fMean/fN*fScale;
+
+        fGraph->SetPoint(fGraph->GetN(), t, val);
 
         if (fError)
             static_cast<TGraphErrors*>(fGraph)->SetPointError(fGraph->GetN()-1, 0, fMeanErr/fN*fScale);
+
+        fMin = TMath::Min(fMin, val);
+        fMax = TMath::Max(fMax, val);
 
         fMean = 0;
@@ -265 +268 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Set Minimum and Maximum;
+Bool_t MHVsTime::Finalize()
+{
+    const Double_t add = (fMax-fMin)*0.15;
+
+    if (fMinimum==-1111)
+        fGraph->SetMinimum(fMin-add);
+    if (fMaximum==-1111)
+        fGraph->SetMaximum(fMax+add);
+
+    return kTRUE;
+}
+
 void MHVsTime::Paint(Option_t *opt)
 {
-    /*
-     *fLog << all << fGraph << " " << gPad->GetName() << " ----> Paint " << opt << endl;
-     TListIter Next(gPad->GetListOfPrimitives()); TObject *obj;
-     while ((obj=Next())) *fLog << obj << " " << obj->GetName() << " " << obj->ClassName() << " " << Next.GetOption() << endl;
-     */
     if (!fGraph)
         return;
-
-//    *fLog << all << fGraph->GetN() << " " << opt << endl;
 
     if (fGraph->GetN()==0)
@@ -318 +329 @@
         gPad->SetLogy();
 
+    // If this is set to early the plot remains empty in root 5.12/00
+    if (fMinimum!=-1111)
+        fGraph->SetMinimum(fMinimum);
+    if (fMaximum!=-1111)
+        fGraph->SetMaximum(fMaximum);
+
+
     // This is a workaround if the TGraph has only one point.
     // Otherwise MStatusDisplay::Update hangs.
-//    gPad->GetListOfPrimitives()->Remove(fGraph);
-//    fGraph->Draw(fGraph->GetN()<2 ? "A" : str.Data());
-    //gPad->GetListOfPrimitives()->Add(fGraph, fGraph->GetN()<2 ? "A" : opt);
-    //    AppendPad(str);
-    //    fGraph->Draw(str);
-
+    gPad->GetListOfPrimitives()->Remove(fGraph);
+    fGraph->Draw(fGraph->GetN()<2 ? "A" : str.Data());
 }
 
@@ -339 +353 @@
     pad->SetBorderMode(0);
     AppendPad(opt);
-
-    fGraph->Draw("A");
 }
 

trunk/MagicSoft/Mars/mhvstime/MHVsTime.h

@@ -34 +34 @@
     MTime       fLast;      //! For checks
 
+    Double_t fMinimum;      // User defined minimum
+    Double_t fMaximum;      // User defined maximum
+
+    Double_t fMin;          //! Calculation of minimum
+    Double_t fMax;          //! Calculation of maximum
+
     enum {
         kIsLogy = BIT(18)
@@ -40 +46 @@
     Bool_t fUseEventNumber;
 
+    Bool_t Finalize();
+
 public:
     MHVsTime(const char *rule=NULL, const char *ruleerr=NULL);
@@ -45 +53 @@
 
     void SetScale(Double_t scale) { fScale = scale; }
-    void SetMinimum(Double_t min=-1111);
+
+    void SetMinimum(Double_t min=-1111) { fMinimum = min; }
+    void SetMaximum(Double_t max=-1111) { fMaximum = max; }
 
     Int_t GetNbins() const;
@@ -78 +88 @@
     void SetMaxPts(Int_t n) { fMaxPts=n; }
 
-    ClassDef(MHVsTime, 2) // Generalized 1/2/3D-histogram for Mars variables
+    ClassDef(MHVsTime, 3) // Generalized 1/2/3D-histogram for Mars variables
 };