Changeset 6855 for trunk/MagicSoft/Mars/mhist/MHCamera.h

Timestamp:

03/18/05 17:21:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhist/MHCamera.h (modified) (5 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -10 +10 @@
 #ifndef ROOT_TArrayI
 #include <TArrayI.h>
-#endif
-#ifndef ROOT_TArrayD
-#include <TArrayD.h>
 #endif
 #ifndef ROOT_MArrayD
@@ -40 +37 @@
 public:
     enum {
-        kProfile      = BIT(18), // FIXME: When changing change max/min!
-        kFreezed      = BIT(19),
-        kNoLegend     = BIT(20),
-        kSqrtVariance = BIT(21)
+        kProfile            = BIT(18), // FIXME: When changing change max/min!
+        kFreezed            = BIT(19),
+        kNoLegend           = BIT(20)/*,
+        kSqrtVariance       = BIT(21),
+        kSinglePixelProfile = BIT(22)*/
     };
 private:
     MGeomCam      *fGeomCam;     // pointer to camera geometry (y-axis)
     TArrayC        fUsed;        // array containing flags
+    TArrayI        fBinEntries;  // number of entries per bin
 
     TArrayI        fColors;      //! Color conversion table
@@ -59 +58 @@
 
     void Init();
-
+/*
     Stat_t Profile(Stat_t val) const
     {
@@ -68 +67 @@
         return n>0 ? val/n : val;
     }
-
+  */
     Int_t GetColor(Float_t val, Float_t min, Float_t max, Bool_t islog);
 
@@ -162 +161 @@
     virtual void     CntCamContent(const MCamEvent &evt, TArrayD threshold, Int_t type=0, Bool_t isabove=kTRUE);
     virtual void     CntCamContent(const TArrayD &evt, Double_t threshold, Bool_t ispos=kTRUE);
-
-    Stat_t   GetBinContent(Int_t bin) const { return Profile(TH1D::GetBinContent(bin)); }
+    virtual void     CntCamContent(const MCamEvent &event, Int_t type1, const MCamEvent &thresevt, Int_t type2, Double_t threshold, Bool_t isabove);
+
+    Stat_t   GetBinContent(Int_t bin) const;
     Stat_t   GetBinContent(Int_t binx, Int_t biny) const { return GetBinContent(binx); }
     Stat_t   GetBinContent(Int_t binx, Int_t biny, Int_t binz) const { return GetBinContent(binx); }