Changeset 2415 for trunk/MagicSoft

Timestamp:

10/20/03 18:39:05 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamEvent.cc (modified) (3 diffs)
• MHCamEvent.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -104 +104 @@
     fSum = new MHCamera(*cam, name+";avg", fTitle);
     fSum->SetYTitle("a.u.");
-
+    fSum->SetBit(MHCamera::kProfile);
     return kTRUE;
 }
@@ -131 +131 @@
 Bool_t MHCamEvent::Finalize()
 {
+    fSum->ResetBit(MHCamera::kProfile);
     if (fSum->GetEntries()>0)
         fSum->Scale(1./fSum->GetEntries());
@@ -170 +171 @@
 }
 
-void MHCamEvent::Draw(Option_t *)
-{
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
+void MHCamEvent::DrawTS(TVirtualPad *p, Option_t *)
+{
+    if (!fSum)
+    {
+        *fLog << warn << "MHCamEvent::Draw - fSum==NULL not initialized." << endl;
+        return;
+    }
+
+    TVirtualPad *pad = p ? p : MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
     pad->Divide(1,2);
 
-    pad->cd(1);
-    gPad->SetBorderMode(0);
-    gPad->Divide(1,1);
-    gPad->cd(1);
-    gPad->SetBorderMode(0);
-    fSum->Draw();
-
-    pad->cd(2);
-    gPad->SetBorderMode(0);
-    fSum->Draw("EPhist");
-}
+    p = pad->GetPad(1);
+    p->SetBorderMode(0);
+
+    // 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);
+}

trunk/MagicSoft/Mars/mhist/MHCamEvent.h

@@ -32 +32 @@
     TH1 *GetHistByName(const TString name="");
 
-    void Draw(Option_t *o="");
+    void DrawTS(TVirtualPad *pad=NULL, Option_t *o="");
 
     void PrintOutliers(Float_t sigma) const;