Changeset 2416 for trunk/MagicSoft/Mars/mhist

Timestamp:

10/20/03 21:32:30 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MFillH.cc (modified) (3 diffs)
• MFillH.h (modified) (2 diffs)
• MH.cc (modified) (11 diffs)
• MH.h (modified) (2 diffs)
• MHCamEvent.cc (modified) (3 diffs)
• MHCamEvent.h (modified) (1 diff)
• MHCamera.cc (modified) (2 diffs)
• MHTriggerLvl0.cc (modified) (1 diff)
• MHTriggerLvl0.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MFillH.cc

@@ -324 +324 @@
     const Ssiz_t length = last-first-1;
 
-    //
-    // Make a copy before stripping leading and trailing White Spaces.
-    //
     TString strip = fHName(first+1, length);
     return strip.Strip(TString::kBoth);
@@ -343 +340 @@
         return kTRUE;
 
+    if (!fH->OverwritesDraw())
+        return kTRUE;
+
     if (TestBit(kDoNotDisplay))
         return kTRUE;
 
-    const Bool_t dr = fH->OverwritesDraw();
-    const Bool_t ts = fH->OverwritesDraw(NULL, "TS");
-    if (!dr && !ts)
-        return kTRUE;
-
-    if (!ts)
-    {
-        *fLog << warn << "You overwrote " << fH->ClassName() << "::";
-        *fLog << "Draw instead of " << fH->ClassName() << "::DrawTS" << endl;
-        *fLog << "This is not thread safe and might result in trouble using" << endl;
-        *fLog << "multithreaded programs like MONA." << endl;
-        *fLog << "" << endl;
-        return kTRUE;
-    }
-
     fCanvas = &fDisplay->AddTab(fH->GetName());
-    fH->DrawTS(fCanvas);
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
-//
-Bool_t MFillH::DrawCloneToDisplay()
-{
-    fH->DrawCloneTS(fCanvas);
-    fCanvas->Modified();
-    fCanvas->Update();
+    fH->Draw();
 
     return kTRUE;
@@ -533 +506 @@
     //
     if (fDisplay && fDisplay->HasCanvas(fCanvas))
-        DrawCloneToDisplay();
+    {
+        fCanvas->cd();
+        fH->DrawClone("nonew");
+        fCanvas->Modified();
+        fCanvas->Update();
+    }
 
     return kTRUE;

trunk/MagicSoft/Mars/mhist/MFillH.h

@@ -44 +44 @@
 
     Bool_t DrawToDisplay();
-    Bool_t DrawCloneToDisplay();
 
 public:
@@ -64 +63 @@
     Int_t PostProcess();
 
-    MH *GetH() { return fH; }
     TCanvas *GetCanvas() { return fCanvas; }
 

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -700 +700 @@
 // Also layout the two statistic boxes and a legend.
 //
-void MH::DrawSame(TH1 &hist1, TH1 &hist2, const TString title, TVirtualPad *pad)
+void MH::DrawSame(TH1 &hist1, TH1 &hist2, const TString title)
 {
     //
     // Draw first histogram
     //
-    if (!pad)
-        pad = gPad;
-
-    MParContainer::DrawTS(&hist1, pad);
-    pad->SetBorderMode(0);
-    pad->Update();
+    hist1.Draw();
+    gPad->SetBorderMode(0);
+    gPad->Update();
 
     if (hist1.GetEntries()>0 && hist2.GetEntries()>0)
@@ -729 +726 @@
     }
 
-    TPaveText *t = (TPaveText*)pad->FindObject("title");
+    TPaveText *t = (TPaveText*)gPad->FindObject("title");
     if (t)
     {
@@ -741 +738 @@
         // (see THistPainter::PaintTitle) title
         //
-        pad->Modified();  // indicates a change
-        pad->Update();    // recreates the original title
+        gPad->Modified();  // indicates a change
+        gPad->Update();    // recreates the original title
         t->Pop();          // bring our title on top
     }
@@ -750 +747 @@
     //
     // Where to get the TPaveStats depends on the root version
-    TPaveStats *s1 = (TPaveStats*)pad->FindObject("stats");
+    TPaveStats *s1 = (TPaveStats*)gPad->FindObject("stats");
     if (!s1)
         s1 = (TPaveStats*)hist1.GetListOfFunctions()->FindObject("stats");
@@ -766 +763 @@
     // Draw second histogram
     //
-    MParContainer::DrawTS(&hist2, pad, "sames");
-    pad->Update();
+    hist2.Draw("sames");
+    gPad->Update();
 
     //
@@ -773 +770 @@
     //
     // Where to get the TPaveStats depends on the root version
-    TPaveStats *s2 = (TPaveStats*)pad->FindObject("stats");
+    TPaveStats *s2 = (TPaveStats*)gPad->FindObject("stats");
     if (!s2)
         s2 = (TPaveStats*)hist2.GetListOfFunctions()->FindObject("stats");
@@ -790 +787 @@
         l.SetBorderSize(s2->GetBorderSize());
         l.SetBit(kCanDelete);
-        MParContainer::DrawTS(&l, pad);
+        l.Draw();
     }
 }
@@ -833 +830 @@
 // to the present pad. The kCanDelete bit is set for the clone.
 //
-TObject *MH::DrawCloneTS(TVirtualPad *pad, Option_t *opt, Int_t w, Int_t h) const
+TObject *MH::DrawClone(Option_t *opt, Int_t w, Int_t h) const
 {
     TString option(opt);
 
-    //gLog << dbg << "DrawCloneTS: Arg=" << pad << " " << gPad << endl;
-
-    TVirtualPad *p = GetNewPad(option) || pad ? pad : NULL;
-    //gLog << dbg << "DrawCloneTS: nonew&&gpad=" << p << " " << opt << endl;
-    if (!p)
-        p = MakeDefCanvas(this, w, h);
-    else
-    /*{
-        gLog << dbg << "--> Clear" << endl;*/
-        p->Clear();
-    //}
-    //gLog << dbg << "DrawCloneTS: " << p << endl;
-
-    TObject *o = MParContainer::DrawCloneTS(pad, option);
-    o->SetBit(kCanDelete);
-    return o;
-}
-
-/*
-// --------------------------------------------------------------------------
-//
-// If the opt string contains 'nonew' or gPad is not given a new canvas
-// with size w/h is created. Otherwise the object is cloned and drawn
-// to the present pad. The kCanDelete bit is set for the clone.
-//
-TObject *MH::DrawClone(Option_t *opt, Int_t w, Int_t h) const
-{
-    TString option(opt);
-
-    gLog << dbg << "DrawCloneTS: Arg=" << gPad << endl;
-
-    TVirtualPad *p = GetNewPad(option) ? gPad : NULL;
-    gLog << dbg << "DrawCloneTS: nonew&&gpad=" << p << " " << opt << endl;
+    TVirtualPad *p = GetNewPad(option);
     if (!p)
         p = MakeDefCanvas(this, w, h);
     else
         p->Clear();
-    gLog << dbg << "DrawCloneTS: " << p << endl;
-
-    TObject *o = Clone(option);
+
+    gROOT->SetSelectedPad(NULL);
+
+    TObject *o = MParContainer::DrawClone(option);
     o->SetBit(kCanDelete);
     return o;
 }
-*/
 
 // --------------------------------------------------------------------------
@@ -886 +851 @@
 // Check whether a class inheriting from MH overwrites the Draw function
 //
-Bool_t MH::OverwritesDraw(TClass *cls, const char *ext) const
+Bool_t MH::OverwritesDraw(TClass *cls) const
 {
     if (!cls)
@@ -900 +865 @@
     // Check whether the class cls overwrites Draw
     //
-    TString name("Draw");
-    name += ext;
-    if (cls->GetMethodAny(name))
+    if (cls->GetMethodAny("Draw"))
         return kTRUE;
 
@@ -912 +875 @@
     while ((base=(TBaseClass*)NextBase()))
     {
-        if (OverwritesDraw(base->GetClassPointer(), ext))
+        if (OverwritesDraw(base->GetClassPointer()))
             return kTRUE;
     }

trunk/MagicSoft/Mars/mhist/MH.h

@@ -22 +22 @@
     MH(const char *name=NULL, const char *title=NULL);
 
-    Bool_t OverwritesDraw(TClass *cls=NULL, const char *ext="") const;
+    Bool_t OverwritesDraw(TClass *cls=NULL) const;
 
     virtual Bool_t SetupFill(const MParList *pList) { return kTRUE; }
@@ -64 +64 @@
 
     static void DrawSameCopy(const TH1 &hist1, const TH1 &hist2, const TString title);
-    static void DrawSame(TH1 &hist1, TH1 &hist2, const TString title, TVirtualPad *pad=NULL);
+    static void DrawSame(TH1 &hist1, TH1 &hist2, const TString title);
 
     TObject *Clone(const char *name="") const;
 
-    TObject *DrawClone(Option_t *opt, Int_t w, Int_t h) const
-    {
-        return MH::DrawCloneTS(NULL, opt, 625, 440);
-    }
+    TObject *DrawClone(Option_t *opt, Int_t w, Int_t h) const;
     TObject *DrawClone(Option_t *opt="") const
     {
-        return MH::DrawCloneTS(NULL, opt, 625, 440);
-    }
-    TObject *DrawCloneTS(TVirtualPad *pad, Option_t *opt, Int_t w, Int_t h) const;
-    TObject *DrawCloneTS(TVirtualPad *pad=NULL, Option_t *opt="") const
-    {
-        return MH::DrawCloneTS(pad, opt, 625, 440);
+        return MH::DrawClone(opt, 625, 440);
     }
 

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -137 +137 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// Print pixel indices which value is higher than mean+sigma*rms
-//
-void MHCamEvent::PrintOutliers(Float_t sigma) const
+void MHCamEvent::PrintOutliers(Float_t s) const
 {
     const Double_t mean = fSum->GetMean();
@@ -153 +149 @@
             continue;
 
-        if ((*fSum)[i+1]>mean+sigma*rms)
-            *fLog << "Contents of Pixel-Index #" << i << ": " << (*fSum)[i+1] << " > " << sigma << "*rms" << endl;
+        if ((*fSum)[i+1]>mean+s*rms)
+            *fLog << "Contents of Pixel-Index #" << i << ": " << (*fSum)[i+1] << " > " << s << "*rms" << endl;
         // if ((*fSum)[i+1]==0)
         //     *fLog << "Contents of Pixel-Index #" << i << ": " << (*fSum)[i+1] << " == 0" << endl;
@@ -171 +167 @@
 }
 
-void MHCamEvent::DrawTS(TVirtualPad *p, Option_t *)
+void MHCamEvent::Draw(Option_t *)
 {
-    if (!fSum)
-    {
-        *fLog << warn << "MHCamEvent::Draw - fSum==NULL not initialized." << endl;
-        return;
-    }
-
-    TVirtualPad *pad = p ? p : MakeDefCanvas(this);
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
     pad->Divide(1,2);
 
-    p = pad->GetPad(1);
-    p->SetBorderMode(0);
+    pad->cd(1);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    gPad->SetBorderMode(0);
+    fSum->Draw();
 
-    // fSum doesn't derive from MParContainer
-    MParContainer::DrawTS(fSum, p);
-
-    p = pad->GetPad(2);
-    p->SetBorderMode(0);
-
-    // fSum doesn't derive from MParContainer
-    MParContainer::DrawTS(fSum, p, "EPhist");
-
-    // fSum doesn't derive from MParContainer
-    //MParContainer::DrawTS(fSum, pad);
+    pad->cd(2);
+    gPad->SetBorderMode(0);
+    fSum->Draw("EPhist");
 }

trunk/MagicSoft/Mars/mhist/MHCamEvent.h

@@ -32 +32 @@
     TH1 *GetHistByName(const TString name="");
 
-    void DrawTS(TVirtualPad *pad=NULL, Option_t *o="");
+    void Draw(Option_t *o="");
 
-    void PrintOutliers(Float_t sigma) const;
+    void PrintOutliers(Float_t s) const;
 
     ClassDef(MHCamEvent, 1) // Histogram to sum camera events

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1135 +1135 @@
     if (fNotify && fNotify->GetSize()>0)
     {
-        TCanvas *c=new TCanvas;
-        fNotify->ForEach(MCamEvent, DrawPixelContent)(idx, c);
+        new TCanvas;
+        fNotify->ForEach(MCamEvent, DrawPixelContent)(idx);
     }
 }
@@ -1148 +1148 @@
 {
     gPad=NULL;
-    return TH1D::DrawCopy();
+    return TH1D::DrawCopy(fName+";cpy");
 } 

trunk/MagicSoft/Mars/mhist/MHTriggerLvl0.cc

@@ -171 +171 @@
 }
 
-void MHTriggerLvl0::DrawTS(TVirtualPad *p=NULL, Option_t * ="")
+void MHTriggerLvl0::Draw(Option_t *)
 {
-    TVirtualPad *pad = p ? p : MakeDefCanvas(this);
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
-    //-----------------------------
     pad->Divide(1,2);
 
-    p = pad->GetPad(1);
-    p->SetBorderMode(0);
-    p->Divide(1,1);
-    p->cd(1);
-    p->SetBorderMode(0);
-    // fSum does not derive from MParContainer
-    MParContainer::DrawTS(fSum, p);
+    pad->cd(1);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    gPad->SetBorderMode(0);
+    fSum->Draw();
 
-    p = pad->GetPad(2);
-    p->SetBorderMode(0);
-    // fSum does not derive from MParContainer
-    MParContainer::DrawTS(fSum, p, "EPhist");
-    //-----------------------------
-
-    //MParContainer::DrawTS(fSum, p);
+    pad->cd(2);
+    gPad->SetBorderMode(0);
+    fSum->Draw("EPhist");
 }

trunk/MagicSoft/Mars/mhist/MHTriggerLvl0.h

@@ -34 +34 @@
     TH1 *GetHistByName(const TString name="");
 
-    //void Draw(Option_t * ="");
-    void DrawTS(TVirtualPad *pad=NULL, Option_t * ="");
+    void Draw(Option_t * ="");
 
     void PrintOutlayers(Float_t s) const;