Changeset 2297 for trunk/MagicSoft/Mars/mhist

Timestamp:

08/01/03 11:33:07 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamera.cc (modified) (4 diffs)
• MHCamera.h (modified) (3 diffs)
• MHStarMap.cc (modified) (1 diff)
• MHStarMap.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -222 +222 @@
 }
 
+// ------------------------------------------------------------------------
+//
+// Use x and y in millimeters
+//
+Int_t MHCamera::Fill(Axis_t x, Axis_t y, Stat_t w)
+{
+    for (Int_t idx=0; idx<fNcells-2; idx++)
+    {
+        MHexagon hex((*fGeomCam)[idx]);
+        if (hex.DistanceToPrimitive(x, y)>0)
+            continue;
+
+        SetUsed(idx);
+        return Fill(idx, w);
+    }
+    return -1;
+}
+
 Stat_t MHCamera::GetMean(Int_t axis) const
 {
@@ -839 +857 @@
 }
 
-TPaveStats *MHCamera::GetStats()
+TPaveStats *MHCamera::GetStatisticBox()
 {
     TObject *obj = 0;
@@ -857 +875 @@
 void MHCamera::UpdateLegend(Float_t min, Float_t max, Bool_t islog)
 {
-    TPaveStats *stats = GetStats();
+    TPaveStats *stats = GetStatisticBox();
 
     const Float_t hndc   = 0.92 - (stats ? stats->GetY1NDC() : 1);
@@ -992 +1010 @@
 // ------------------------------------------------------------------------
 //
-// Function introduced  (31-01-03)  WILL BE REMOVED IN THE FUTURE! DON'T
-// USE IT!
 //
 Int_t MHCamera::GetPixelIndex(Int_t px, Int_t py) const

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -45 +45 @@
     void  SetRange();
 
-    TPaveStats *GetStats();
+    TPaveStats *GetStatisticBox();
 
     Int_t GetPixelIndex(Int_t px, Int_t py) const;
@@ -74 +74 @@
 
     Bool_t IsUsed(Int_t idx) const { return TESTBIT(const_cast<TArrayC&>(fUsed)[idx], kIsUsed); }
+
+    Int_t Fill(Axis_t x, Axis_t y, Stat_t w);
 
     //void     AddPixContent(Int_t idx) const { AddBinContent(idx+1); }
@@ -146 +148 @@
 
     //void SetStatusBar(TGStatusBar *bar) { fStatusBar = bar; }
+
+    const MGeomCam &GetGeomCam() const { return *fGeomCam; }
 
     ClassDef(MHCamera, 1) // Displays the magic camera

trunk/MagicSoft/Mars/mhist/MHStarMap.cc

@@ -32 +32 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-
 #include "MHStarMap.h"
 
+#include <TH2.h>
 #include <TStyle.h>   // gStyle
 #include <TColor.h>   // SetRGB

trunk/MagicSoft/Mars/mhist/MHStarMap.h

@@ -6 +6 @@
 #endif
 
-#ifndef ROOT_TH2
-#include <TH2.h>
-#endif
-
+class TH2F;
 class MHillas;
 
@@ -35 +32 @@
     Bool_t Fill(const MParContainer *par, const Stat_t w=1);
 
-    TH1 *GetHistByName(const TString name) { return fStarMap; }
+    TH1 *GetHistByName(const TString name) { return (TH1*)fStarMap; }
 
     TH2F *GetHist() { return fStarMap; }