Changeset 2409 for trunk/MagicSoft/Mars/mhist/MHCamera.cc

Timestamp:

10/20/03 17:44:51 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -80 +80 @@
 void MHCamera::Init()
 {
+    UseCurrentStyle();
+
     SetDirectory(NULL);
 
@@ -241 +243 @@
 Int_t MHCamera::Fill(Axis_t x, Axis_t y, Stat_t w)
 {
-    if (fNcells<=1)
+    if (fNcells<=1 || IsFreezed())
         return -1;
 
@@ -265 +267 @@
         mean += fArray[i];
 
-    return mean/(fNcells-2);
+    return Profile(mean/(fNcells-2));
 }
 
@@ -286 +288 @@
     sq  /= n;
 
-    return sqrt(sq-sum*sum);
+    return Profile(sqrt(sq-sum*sum));
 }
 
@@ -297 +299 @@
 {
     if (fMinimum != -1111)
-        return fMinimum;
+        return Profile(fMinimum);
 
     if (fNcells<=1)
@@ -316 +318 @@
                 minimum = fArray[idx+1];
     }
-    return minimum;
+    return Profile(minimum);
 }
 
@@ -326 +328 @@
 Double_t MHCamera::GetMaximum(Bool_t all) const
 {
-    if (fMaximum != -1111)
-        return fMaximum;
+    if (fMaximum!=-1111)
+        return Profile(fMaximum);
 
     if (fNcells<=1)
@@ -345 +347 @@
                 maximum = fArray[idx+1];
     }
-    return maximum;
+    return Profile(maximum);
 }
 
@@ -455 +457 @@
                 gLog << warn << "MHCamera::Update: " << GetName() << " <" << GetTitle() << "> - Pixel Index #" << i << " contents is NaN (Not a Number)..." << endl;
 
-            hex.SetFillColor(GetColor(fArray[i+1], min, max, islog));
+            hex.SetFillColor(GetColor(GetBinContent(i+1), min, max, islog));
         }
         else
@@ -466 +468 @@
             if (IsUsed(i) && !TMath::IsNaN(fArray[i+1]))
             {
-                Float_t size = pix.GetD()*(fArray[i+1]-min)/(max-min);
+                Float_t size = pix.GetD()*(GetBinContent(i+1)-min)/(max-min);
                 if (size>pix.GetD())
                     size=pix.GetD();
@@ -673 +675 @@
 void MHCamera::AddCamContent(const MCamEvent &event, Int_t type)
 {
-    if (fNcells<=1)
+    if (fNcells<=1 || IsFreezed())
         return;
 
@@ -699 +701 @@
 void MHCamera::AddCamContent(const MHCamera &d, Int_t type)
 {
-    if (fNcells!=d.fNcells)
+    if (fNcells!=d.fNcells || IsFreezed())
         return;
 
@@ -733 +735 @@
 void MHCamera::AddCamContent(const TArrayD &event, const TArrayC *used)
 {
-    if (event.GetSize()!=fNcells-2)
+    if (event.GetSize()!=fNcells-2 || IsFreezed())
         return;
 
@@ -756 +758 @@
 void MHCamera::CntCamContent(const MCamEvent &event, Double_t threshold, Int_t type)
 {
-    if (fNcells<=1)
+    if (fNcells<=1 || IsFreezed())
         return;
 
@@ -779 +781 @@
 void MHCamera::CntCamContent(const TArrayD &event, Double_t threshold, Bool_t ispos)
 {
-    if (event.GetSize()!=fNcells-2)
+    if (event.GetSize()!=fNcells-2 || IsFreezed())
         return;
 
@@ -799 +801 @@
 void MHCamera::FillRandom()
 {
-    if (fNcells<=1)
+    if (fNcells<=1 || IsFreezed())
         return;
 
@@ -855 +857 @@
 void MHCamera::Reset(Option_t *opt)
 {
-    if (fNcells<=1)
+    if (fNcells<=1 || IsFreezed())
         return;
 
@@ -1127 +1129 @@
     cout << "Software Pixel Index: " << idx << endl;
     cout << "Hardware Pixel Id:    " << idx+1 << endl;
-    cout << "Contents:             " << fArray[idx+1] << "  <";
+    cout << "Contents:             " << GetBinContent(idx+1) << "  <";
     cout << (IsUsed(idx)?"on":"off");
     cout << ">" << endl;
 
     if (fNotify && fNotify->GetSize()>0)
-        new TCanvas;
-    fNotify->ForEach(MCamEvent, DrawPixelContent)(idx);
+    {
+        TCanvas *c=new TCanvas;
+        fNotify->ForEach(MCamEvent, DrawPixelContent)(idx, c);
+    }
 }
 
@@ -1140 +1144 @@
     return fGeomCam->GetNumPixels();
 }
+
+TH1 *MHCamera::DrawCopy() const
+{
+    gPad=NULL;
+    return TH1D::DrawCopy();
+}