Changeset 9369 for trunk/MagicSoft/Mars/mhist

Timestamp:

03/01/09 21:54:27 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCamEventRot.cc (modified) (1 diff)
• MHCamera.cc (modified) (11 diffs)

trunk/MagicSoft/Mars/mhist/MHCamEventRot.cc

@@ -226 +226 @@
             if (fUseThreshold!=kNoBound)
             {
-                if (val>fThreshold && fUseThreshold==kIsLowerBound ||
-                    val<fThreshold && fUseThreshold==kIsUpperBound)
+                if ((val>fThreshold && fUseThreshold==kIsLowerBound) ||
+                    (val<fThreshold && fUseThreshold==kIsUpperBound))
                     fHist.Fill(cx[ix], cy[iy]);
             }

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.118 2009-03-01 12:51:03 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.119 2009-03-01 21:48:14 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -79 +79 @@
 #include "MString.h"
 #include "MBinning.h"
-#include "MHexagon.h"
 
 #include "MGeomPix.h"
@@ -109 +108 @@
     gROOT->GetListOfCleanups()->Add(fNotify);
 
+    /*
     TVirtualPad *save = gPad;
     gPad = 0;
-    /*
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,01,06)
     SetPalette(1, 0);
@@ -123 +122 @@
     SetInvDeepBlueSeaPalette();
 #endif
+    gPad = save;
 */
-    gPad = save;
 }
 
@@ -218 +217 @@
 Bool_t MHCamera::MatchSector(Int_t idx, const TArrayI &sector, const TArrayI &aidx) const
 {
-    const MGeomPix &pix = (*fGeomCam)[idx];
+    const MGeom &pix = (*fGeomCam)[idx];
     return FindVal(sector, pix.GetSector()) && FindVal(aidx, pix.GetAidx());
 }
@@ -980 +979 @@
         gPad->GetX2()> maxr || gPad->GetY2()>maxr ? 1 : fGeomCam->GetConvMm2Deg();
 
-    MHexagon hex;
+    TAttLine line;
+    TAttFill fill;
+    line.SetLineStyle(kSolid);
+    line.SetLineColor(kBlack);
     for (Int_t i=0; i<fNcells-2; i++)
     {
-        hex.SetFillStyle(issame || (IsTransparent() && !IsUsed(i)) ? 0 : 1001);
+        fill.SetFillStyle(issame || (IsTransparent() && !IsUsed(i)) ? 0 : 1001);
 
         if (!issame)
@@ -990 +992 @@
             if (!IsUsed(i) || !iscol || isnan)
             {
-                hex.SetFillColor(10);
+                fill.SetFillColor(10);
 
                 if (isnan)
@@ -996 +998 @@
             }
             else
-                hex.SetFillColor(GetColor(GetBinContent(i+1), min, max, islog));
+                fill.SetFillColor(GetColor(GetBinContent(i+1), min, max, islog));
         }
 
-        const MGeomPix &pix = (*fGeomCam)[i];
-
-        Float_t x = pix.GetX()*conv/(fAbberation+1);
-        Float_t y = pix.GetY()*conv/(fAbberation+1);
-        Float_t d = pix.GetD()*conv;
-
-        if (!isbox)
-            if (IsUsed(i) || !TestBit(kNoUnused))
-                hex.PaintHexagon(x, y, d);
-        else
-            if (IsUsed(i) && TMath::Finite(fArray[i+1]))
-            {
-                Float_t size = d*(GetBinContent(i+1)-min)/(max-min);
-                if (size>d)
-                    size=d;
-                hex.PaintHexagon(x, y, size);
-            }
+        const MGeom &pix = (*fGeomCam)[i];
+
+        Double_t scale = 1;//conv/(fAbberation+1);
+
+        if (!isbox && !IsUsed(i) && TestBit(kNoUnused))
+            continue;
+
+        if (isbox && (!IsUsed(i) || !TMath::Finite(fArray[i+1])))
+            continue;
+
+        if (isbox)
+        {
+            scale = (GetBinContent(i+1)-min)/(max-min);
+            if (scale>1)
+                scale=1;
+        }
+
+        pix.PaintPrimitive(line, fill, conv, scale/(fAbberation+1));
     }
 }
@@ -1319 +1322 @@
     for (Int_t i=0; i<fNcells-2; i++)
     {
-        const MGeomPix &h = (*fGeomCam)[i];
+        const MGeom &h = (*fGeomCam)[i];
 
         TString num;
@@ -1335 +1338 @@
         //(GetColor(GetBinContent(i+1), min, max, 0));
         txt.SetTextColor(kRed);
-        txt.SetTextSize(0.3*h.GetD()/fGeomCam->GetMaxRadius()/1.05);
+        txt.SetTextSize(0.3*h.GetT()/fGeomCam->GetMaxRadius()/1.05);
         txt.PaintText(h.GetX(), h.GetY(), num);
     }
@@ -2024 +2027 @@
         return -1;
 
-    Int_t i;
-    for (i=0; i<fNcells-2; i++)
-    {
-        MHexagon hex((*fGeomCam)[i]);
-        if (hex.DistancetoPrimitive(px, py, conv)>0)
-            continue;
-
-        return i;
-    }
+    for (Int_t i=0; i<fNcells-2; i++)
+        if ((*fGeomCam)[i].DistancetoPrimitive(px*conv, py*conv)<=0)
+            return i;
+
     return -1;
 }