Changeset 7355 for trunk/MagicSoft/Mars/mgeom

Timestamp:

09/16/05 14:57:22 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgeom

Files:

• MGeomCam.cc (modified) (1 diff)
• MGeomCam.h (modified) (1 diff)
• MGeomPix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -237 +237 @@
 // --------------------------------------------------------------------------
 //
+// Returns the angle between of pixels i wrt pixel j (default=0). The angle
+// is returned in the range between -pi and pi (atan2) and 2*pi if i or j
+// is out of range.
+//
+Float_t MGeomCam::GetAngle(UShort_t i, UShort_t j) const
+{
+    if (i>=fNumPixels || j>=fNumPixels)
+        return TMath::TwoPi();
+
+    return (*this)[i].GetAngle((*this)[j]);
+}
+
+// --------------------------------------------------------------------------
+//
 // Have to call the radii of the subcameras starting to count from 1
 //

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -67 +67 @@
 
     Float_t GetDist(UShort_t i, UShort_t j=0) const;
+    Float_t GetAngle(UShort_t i, UShort_t j=0) const;
 
     UInt_t  GetNumSectors()                const  { return fNumSectors; }

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -63 +63 @@
     UInt_t  GetSector() const { return fSector; }
 
-    Float_t GetDist(const MGeomPix & pix) const  { return TMath::Hypot(fX-pix.fX, fY-pix.fY); }
+    Float_t GetDist(const MGeomPix &pix) const  { return TMath::Hypot(fX-pix.fX, fY-pix.fY); }
+    Float_t GetAngle(const MGeomPix &pix) const { return TMath::ATan2(fX - pix.GetX(), fY - pix.GetY()); }
+
 
     Float_t GetA() const    { return fA; /*fD*fD*gsTan60/2;*/ }