Changeset 8385 for trunk/MagicSoft/Mars/mgeom

Timestamp:

03/29/07 13:53:26 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgeom

Files:

• MGeomCam.cc (modified) (2 diffs)
• MGeomPix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -198 +198 @@
 
         const UInt_t  s = pix.GetAidx();
-        const Float_t x = pix.GetX();
-        const Float_t y = pix.GetY();
+
         const Float_t d = pix.GetD();
-
-        const Float_t r = TMath::Hypot(x, y);
+        const Float_t r = pix.GetDist();
 
         const Float_t maxr = r + d;
@@ -435 +433 @@
     }
 
-
     const MGeomPix &pix = (*this)[idx];
     GetNeighbors(arr, pix, r);

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -10 +10 @@
 class MGeomPix : public MParContainer
 { 
-private:
+public:
     static const Float_t gsTan60; // tan(60/kRad2Deg);
     static const Float_t gsTan30; // tan(30/kRad2Deg);
 
+private:
     enum {
         kIsInOutermostRing = BIT(22),
@@ -63 +64 @@
     UInt_t  GetSector() const { return fSector; }
 
+    Float_t GetDist() const  { return TMath::Hypot(fX, 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()); }