Changeset 2476 for trunk/MagicSoft/Mars/mhist

Timestamp:

11/05/03 18:20:19 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHCamera.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -671 +671 @@
 //
 // Call this function to add a MCamEvent on top of the present contents.
-// Only 'used' pixels are added.
 //
 void MHCamera::AddCamContent(const MCamEvent &event, Int_t type)
@@ -682 +681 @@
     {
         Double_t val=0;
-        if (event.GetPixelContent(val, idx, *fGeomCam, type) && !IsUsed(idx))
+        if (event.GetPixelContent(val, idx, *fGeomCam, type)/* && !IsUsed(idx)*/)
             SetUsed(idx);
 
@@ -693 +692 @@
 //
 // Call this function to add a MHCamera on top of the present contents.
-// Only 'used' pixels are added.
 // Type:
 //  0) bin content
@@ -731 +729 @@
 //
 // Call this function to add a TArrayD on top of the present contents.
-// Only 'used' pixels are added.
 //
 void MHCamera::AddCamContent(const TArrayD &event, const TArrayC *used)
@@ -745 +742 @@
         Fill(idx, const_cast<TArrayD&>(event)[idx]); // FIXME: Slow!
 
-        if (used && (*const_cast<TArrayC*>(used))[idx])
+        if (!used || (*const_cast<TArrayC*>(used))[idx])
             SetUsed(idx);
     }
@@ -764 +761 @@
     for (Int_t idx=0; idx<fNcells-2; idx++)
     {
-        Double_t val=0;
-        if (event.GetPixelContent(val, idx, *fGeomCam, type) && !IsUsed(idx))
+        Double_t val=threshold;
+        if (event.GetPixelContent(val, idx, *fGeomCam, type)/* && !IsUsed(idx)*/)
             SetUsed(idx);
 
@@ -1128 +1125 @@
     if (fNotify && fNotify->GetSize()>0)
     {
-        new TCanvas;
+        // FIXME: Is there a simpler and more convinient way?
+
+        // The name which is created here depends on the instance of
+        // MHCamera and on the pad on which it is drawn --> The name
+        // is unique. For ExecuteEvent gPad is always correctly set.
+        const TString name = Form("%p;%p;PixelContent", this, gPad);
+
+        TCanvas *old = (TCanvas*)gROOT->GetListOfCanvases()->FindObject(name);
+        if (old)
+            old->cd();
+        else
+            new TCanvas(name);
+
+        /*
+         TIter Next(gPad->GetListOfPrimitives());
+         TObject *o;
+         while (o=Next()) cout << o->GetName() << " " << o->IsA()->GetName() << endl;
+         */
+
+        // FIXME: Make sure, that the old histograms are really deleted.
+        //        Are they already deleted?
         fNotify->ForEach(MCamEvent, DrawPixelContent)(idx);
+        gPad->Modified();
+        gPad->Update();
     }
 }