Changeset 2557 for trunk/MagicSoft/Mars/mhist

Timestamp:

11/22/03 21:14:14 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MFillH.cc (modified) (3 diffs)
• MHCamera.cc (modified) (3 diffs)
• MHCamera.h (modified) (2 diffs)
• MHVsTime.cc (modified) (13 diffs)
• MHVsTime.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  07/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Thomas Bretz, 07/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2002
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !
@@ -155 +155 @@
 
     AddToBranchList(Form("%s.*", (const char*)ExtractName(hist)));
-    AddToBranchList(Form("%s.*", (const char*)ExtractName(par)));
+    if (par)
+        AddToBranchList(Form("%s.*", (const char*)ExtractName(par)));
 
     if (title)
@@ -224 +225 @@
 
     AddToBranchList(fH->GetDataMember());
-    AddToBranchList(Form("%s.*", (const char*)ExtractName(par)));
+    if (par)
+        AddToBranchList(Form("%s.*", (const char*)ExtractName(par)));
 
     if (title)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -568 +568 @@
     Update(gPad->GetLogy(), isbox, iscol);
     PaintAxisTitle();
+
+    if (opt.Contains("pixelindex"))
+        PaintIndices(kFALSE);
+    if (opt.Contains("sectorindex"))
+        PaintIndices(kTRUE);
 }
 
@@ -627 +632 @@
 }
 
-void MHCamera::DrawPixelIndices()
+void MHCamera::PaintIndices(Bool_t sector)
 {
     if (fNcells<=1)
         return;
-
-    // FIXME: Is this correct?
-    for (int i=0; i<kItemsLegend; i++)
-        fColors[i] = 16;
-
-    if (!gPad)
-        Draw();
 
     TText txt;
@@ -645 +643 @@
     for (Int_t i=0; i<fNcells-2; i++)
     {
+        const MGeomPix &h = (*fGeomCam)[i];
+
         TString num;
-        num += i;
-
-        const MGeomPix &h = (*fGeomCam)[i];
-        TText *nt = txt.DrawText(h.GetX(), h.GetY(), num);
-        nt->SetTextSize(0.3*h.GetD()/fGeomCam->GetMaxRadius()/1.05);
-    }
-}
-
-void MHCamera::DrawSectorIndices()
-{
-    if (fNcells<=1)
-        return;
-
-    for (int i=0; i<kItemsLegend; i++)
-        fColors[i] = 16;
-
-    if (!gPad)
-        Draw();
-
-    TText txt;
-    txt.SetTextFont(122);
-    txt.SetTextAlign(22);   // centered/centered
-
-    for (Int_t i=0; i<fNcells-2; i++)
-    {
-        TString num;
-        num += (*fGeomCam)[i].GetSector();
-
-        const MGeomPix &h = (*fGeomCam)[i];
-        TText *nt = txt.DrawText(h.GetX(), h.GetY(), num);
-        nt->SetTextSize(0.3*h.GetD()/fGeomCam->GetMaxRadius()/1.05);
+        num += sector ? h.GetSector() : i;
+
+        txt.SetTextSize(0.3*h.GetD()/fGeomCam->GetMaxRadius()/1.05);
+        txt.PaintText(h.GetX(), h.GetY(), num);
     }
 }

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -59 +59 @@
     Int_t GetColor(Float_t val, Float_t min, Float_t max, Bool_t islog);
 
+    void  PaintIndices(Bool_t sector);
     void  Update(Bool_t islog, Bool_t isbox, Bool_t iscol);
     void  UpdateLegend(Float_t min, Float_t max, Bool_t islog);
@@ -144 +145 @@
     void  FillRandom(TH1 *h, Int_t ntimes=5000) { TH1::FillRandom(h, ntimes); }
     void  FillRandom();
-
-    void  DrawPixelIndices();
-    void  DrawSectorIndices();
 
     void  PrintInfo() const { Print(""); } // *MENU*

trunk/MagicSoft/Mars/mhist/MHVsTime.cc

@@ -60 +60 @@
 //
 MHVsTime::MHVsTime(const char *rule)
-    : fHist(NULL), fData(NULL), fScale(1)
+    : fGraph(NULL), fData(NULL), fScale(1)
 {  
     fName  = gsDefName;
@@ -68 +68 @@
         return;
 
-    fHist = new TGraph;
+    fGraph = new TGraph;
     fData = new MDataChain(rule);
 }
@@ -78 +78 @@
 MHVsTime::~MHVsTime()
 {
-    if (fHist)
-        delete fHist;
+    if (fGraph)
+        delete fGraph;
 
     if (fData)
@@ -92 +92 @@
 TString MHVsTime::GetDataMember() const
 {
-    *fLog << dbg << fData->GetDataMember() << endl;
     return fData ? fData->GetDataMember() : (TString)"";
 }
@@ -105 +104 @@
 {
     // reset histogram (necessary if the same eventloop is run more than once) 
-    //fHist->Reset();
+    //fGraph->Reset();
 
     if (fData && !fData->PreProcess(plist))
         return kFALSE;
 
-    if (fHist)
+    if (fGraph)
     {
-        delete fHist;
-        fHist = new TGraph;
+        delete fGraph;
+        fGraph = new TGraph;
     }
 
@@ -119 +118 @@
     title += " vs Time";
 
-    fHist->SetNameTitle(fName, title);
+    fGraph->SetNameTitle(fName, title);
 
     return kTRUE;
@@ -130 +129 @@
 void MHVsTime::SetName(const char *name)
 {
-    fHist->SetName(name);
+    fGraph->SetName(name);
     MParContainer::SetName(name);
 }
@@ -140 +139 @@
 void MHVsTime::SetTitle(const char *title)
 {
-    fHist->SetTitle(title);
+    fGraph->SetTitle(title);
     MParContainer::SetTitle(title);
 }
@@ -160 +159 @@
     const Double_t T = (*t);///3600;
 
-    fHist->SetPoint(fHist->GetN(), T>12*3600?T-24*3600:T, v);
+    fGraph->SetPoint(fGraph->GetN(), T>12*3600?T-24*3600:T, v);
 
     return kTRUE;
@@ -182 +181 @@
 void MHVsTime::Draw(Option_t *opt)
 {
-    if (fHist->GetN()==0)
+    if (fGraph->GetN()==0)
         return;
 
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fGraph);
     pad->SetBorderMode(0);
 
@@ -192 +191 @@
     TString str(opt);
 
-    fHist->GetHistogram()->SetXTitle("Time");
-    fHist->GetHistogram()->SetYTitle(GetRule());
-    fHist->GetHistogram()->GetXaxis()->SetTimeFormat("%H:%M:%S");
-    fHist->GetHistogram()->GetXaxis()->SetTimeDisplay(1);
-    fHist->GetHistogram()->GetXaxis()->SetLabelSize(0.033);
-    fHist->Draw("AP");
-    if (fHist->TestBit(kIsLogy))
+    fGraph->GetHistogram()->SetXTitle("Time");
+    fGraph->GetHistogram()->SetYTitle(GetRule());
+    fGraph->GetHistogram()->GetXaxis()->SetTimeFormat("%H:%M:%S");
+    fGraph->GetHistogram()->GetXaxis()->SetTimeDisplay(1);
+    fGraph->GetHistogram()->GetXaxis()->SetLabelSize(0.033);
+    fGraph->Draw("AP");
+    if (fGraph->TestBit(kIsLogy))
         pad->SetLogy();
 
@@ -229 +228 @@
 Int_t MHVsTime::GetNbins() const
 {
-    return fHist->GetN();
-}
-
+    return fGraph->GetN();
+}
+/*
 TH1 *MHVsTime::GetHist()
 {
-    return fHist ? fHist->GetHistogram() : 0;
+    return fGraph ? fGraph->GetHistogram() : 0;
 }
 
 const TH1 *MHVsTime::GetHist() const
 {
-    return fHist ? fHist->GetHistogram() : 0;
+    return fGraph ? fGraph->GetHistogram() : 0;
 }
 
@@ -246 +245 @@
     return GetHist();
 }
+*/

trunk/MagicSoft/Mars/mhist/MHVsTime.h

@@ -13 +13 @@
 protected:
     // Could be const but root < 3.02/06 doesn't like this...
-    TGraph     *fHist;  // Histogram to fill
+    TGraph     *fGraph;  // Histogram to fill
     MDataChain *fData;  // Object from which the data is filled
     Double_t    fScale; // Scale for axis (eg unit)
@@ -38 +38 @@
     TString GetRule() const;
 
-    const TH1 *GetHist() const;
-    TH1 *GetHist();
-    TH1 *GetHistByName(const TString name="");
+    /*
+//    const TH1 *GetHist() const;
+//    TH1 *GetHist();
+//    TH1 *GetHistByName(const TString name="");
+*/
+    const TGraph *GetGraph() const { return fGraph; }
+    TGraph *GetGraph() { return fGraph; }
+
 
     void Draw(Option_t *opt=NULL);