Changeset 3514 for trunk/MagicSoft/Mars/mhist

Timestamp:

03/15/04 19:51:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

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

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1262 +1262 @@
         return TH1D::DistancetoPrimitive(px, py);
 
-    if (GetPixelIndex(px, py)>=0)
+    const Bool_t issame = TString(GetDrawOption()).Contains("same", TString::kIgnoreCase);
+
+    const Float_t maxr = (1-fGeomCam->GetConvMm2Deg())*fGeomCam->GetMaxRadius()/2;
+    const Float_t conv = !issame ||
+        gPad->GetX1()<-maxr || gPad->GetY1()<-maxr ||
+        gPad->GetX2()> maxr || gPad->GetY2()>maxr ? 1 : fGeomCam->GetConvMm2Deg();
+
+    cout << conv << endl;
+
+    if (GetPixelIndex(px, py, conv)>=0)
         return 0;
 
@@ -1279 +1288 @@
 //
 //
-Int_t MHCamera::GetPixelIndex(Int_t px, Int_t py) const
+Int_t MHCamera::GetPixelIndex(Int_t px, Int_t py, Float_t conv) const
 {
     if (fNcells<=1)
@@ -1288 +1297 @@
     {
         MHexagon hex((*fGeomCam)[i]);
-        if (hex.DistancetoPrimitive(px, py)>0)
+        if (hex.DistancetoPrimitive(px, py, conv)>0)
             continue;
 

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -66 +66 @@
     TPaveStats *GetStatisticBox();
 
-    Int_t GetPixelIndex(Int_t px, Int_t py) const;
+    Int_t GetPixelIndex(Int_t px, Int_t py, Float_t conv=1) const;
 
     void PaintAxisTitle();