Changeset 9219 for trunk/MagicSoft/Mars/mgeom

Timestamp:

01/14/09 12:31:37 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgeom

Files:

• MGeomCam.cc (modified) (1 diff)
• MGeomCamDwarf.h (modified) (1 diff)
• MGeomPix.cc (modified) (5 diffs)
• MGeomPix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -517 +517 @@
     // search for the neighbor in the given direction
     //
-    int i;
-    for (i=0; i<pix.GetNumNeighbors(); i++)
+    for (int i=0; i<pix.GetNumNeighbors(); i++)
         if (GetDirection(idx, pix.GetNeighbor(i))==dir)
             return pix.GetNeighbor(i);

trunk/MagicSoft/Mars/mgeom/MGeomCamDwarf.h

@@ -1 @@
-#ifndef MARS_MGeomCamDwqarf
+#ifndef MARS_MGeomCamDwarf
 #define MARS_MGeomCamDwarf
 

trunk/MagicSoft/Mars/mgeom/MGeomPix.cc

@@ -55 +55 @@
 
 #include <TMath.h>
+#include <TVector2.h>
 
 #include "MLog.h"
@@ -77 +78 @@
     Set(x, y, r, s, a);
     SetNeighbors();
+}
+
+// --------------------------------------------------------------------------
+//
+// Return position as TVector2(fX, fY)
+//
+TVector2 MGeomPix::GetP() const
+{
+    return TVector2(fX, fY);
 }
 
@@ -186 +196 @@
     // more, rotated with respect to that one by +- 60 degrees.
     //
-    if (TMath::Abs(dx)*2>fD)
+    if (TMath::Abs(dx)>fD/2)
         return kFALSE;
 
@@ -194 +204 @@
     const static Double_t sin60 = TMath::Sin(60/kRad2Deg);
 
-    const Double_t dx2 = dx*cos60 + dy*sin60;
-    if  (TMath::Abs(dx2)*2>fD)
+    const Double_t dxc = dx*cos60;
+    const Double_t dys = dy*sin60;
+
+    if  (TMath::Abs(dxc + dys)>fD/2)
         return kFALSE;
 
-    const Double_t dx3 = dx*cos60 - dy*sin60;
-    if (TMath::Abs(dx3)*2>fD)
+    if (TMath::Abs(dxc - dys)>fD/2)
         return kFALSE;
 
@@ -218 +229 @@
     const Double_t y2 = pix.GetY();
 
-    if (x1>=x2 && y1>y2) return kRightTop;
-    if (x1>=x2 && y1<y2) return kRightBottom;
-    if (x1<=x2 && y1>y2) return kLeftTop;
-    if (x1<=x2 && y1<y2) return kLeftBottom;
-    if (x1>x2)           return kRight;
-    if (x1<x2)           return kLeft;
+    if (x1<=x2 && y1<y2) return kRightTop;
+    if (x1<=x2 && y1>y2) return kRightBottom;
+    if (x1>=x2 && y1<y2) return kLeftTop;
+    if (x1>=x2 && y1>y2) return kLeftBottom;
+    if (x1<x2)           return kRight;
+    if (x1>x2)           return kLeft;
+
+    cout << -1 << endl;
 
     return -1;

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -7 +7 @@
 
 class MGeomCam;
+class TVector2;
 
 class MGeomPix : public MParContainer
@@ -77 +78 @@
     UInt_t  GetSector() const { return fSector; }
 
+    TVector2 GetP() const;
+
     Float_t GetDist() const;
     Float_t GetDist(const MGeomPix &pix) const;