Changeset 9369 for trunk/MagicSoft/Mars/mgeom/MGeomPix.h

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mgeom/MGeomPix.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -2 +2 @@
 #define MARS_MGeomPix
 
-#ifndef MARS_MParContainer
-#include "MParContainer.h"
+#ifndef MARS_MGeom
+#include "MGeom.h"
 #endif
 
-class MGeomCam;
-class TVector2;
-class TOrdCollection;
-
-
-class MGeomPix : public MParContainer
+class MGeomPix : public MGeom
 { 
 public:
@@ -17 +12 @@
     static const Float_t gsTan30; // tan(30/kRad2Deg);
 
-    enum {
-        kRightTop,
-        kRight,
-        kRightBottom,
-        kLeftBottom,
-        kLeft,
-        kLeftTop
-    };
+    static const Float_t gsCos60; // cos(60/kRad2Deg);
+    static const Float_t gsSin60; // sin(30/kRad2Deg);
 
 private:
-    enum {
-        kIsInOutermostRing = 0,
-        kIsInOuterRing     = 1,
-    };
-
-    Float_t fX;            // [mm]   the x coordinate of the center
-    Float_t fY;            // [mm]   the y coordinate of the center
     Float_t fD;            // [mm]   the d coordinate of the pixel (dist between two parallel sides)
-    Float_t fA;            // [mm^2] Area of the pixel
-
-    Byte_t  fNumNeighbors; // number of valid neighbors
-    Short_t fNeighbors[6]; // the IDs of the pixel next to it (we are assuming an hexagonal geometry)
-
-    UInt_t fSector;        // Number of sector the pixels corresponds to
-    UInt_t fAidx;          // Area index of the pixel
-
-    Byte_t fUserBits;
 
 public:
@@ -51 +24 @@
     {
         MGeomPix &pix = (MGeomPix&)obj;
-        pix.fX = fX;
-        pix.fY = fY;
+
         pix.fD = fD;
-        pix.fA = fA;
-        pix.fNumNeighbors = fNumNeighbors;
-        pix.fSector = fSector;
-        pix.fAidx = fAidx;
-        pix.fUserBits = fUserBits;
-        for (int i=0; i<6; i++)
-            pix.fNeighbors[i] = fNeighbors[i];
 
+        MGeom::Copy(obj);
         TObject::Copy(obj);
     }
 
+    void SetD(Float_t d=1) { fD=d; fA=d*d*gsTan60/2; }
+
+    Float_t GetD() const  { return fD; }         // Distance between two parallel sides
+    Float_t GetL() const  { return fD*gsTan30; } // Length of one of the parallel sides
+    Float_t GetT() const  { return fD/gsTan60; } // Distance between two opposite edges (traverse)
+
+    Bool_t  IsInside(Float_t px, Float_t py) const;
+    Float_t DistanceToPrimitive(Float_t px, Float_t py) const;
+    void    PaintPrimitive(const TAttLine &line, const TAttFill &fill, Double_t scalexy=1, Double_t scaled=1) const;
+
     void Print(Option_t *opt=NULL) const;
 
-    void Set(Float_t x, Float_t y, Float_t d=1, UInt_t s=0, UInt_t aidx=0) { fX=x; fY=y; fD=d; fA=d*d*gsTan60/2; fSector=s; fAidx=aidx; }
-
-    void SetNeighbors(Short_t i0=-1, Short_t i1=-1, Short_t i2=-1,
-                      Short_t i3=-1, Short_t i4=-1, Short_t i5=-1);
-
-    void CheckOuterRing(const MGeomCam &cam);
-
-    Float_t GetX() const  { return fX; }
-    Float_t GetY() const  { return fY; }
-    Float_t GetD() const  { return fD; }         // Distance between two parellel sides
-    Float_t GetL() const  { return fD*gsTan30; } // Length of one of the parallel sides
-    Float_t GetT() const  { return fD/gsTan60; } // Distance between two opposite edges (traverse)
-    UInt_t  GetSector() const { return fSector; }
-
-    TVector2 GetP() const;
-
-    Float_t GetDist() const;
-    Float_t GetDist(const MGeomPix &pix) const;
-    Float_t GetAngle(const MGeomPix &pix) const;
-
-    Float_t GetA() const    { return fA; /*fD*fD*gsTan60/2;*/ }
-    Int_t   GetAidx() const { return fAidx; }
-
-    Byte_t  GetNumNeighbors() const { return fNumNeighbors; }
-    Short_t GetNeighbor(Byte_t i) const { return fNeighbors[i]; }
-
-    Bool_t IsInOutermostRing() const { return TESTBIT(fUserBits, kIsInOutermostRing); }
-    Bool_t IsInOuterRing() const     { return TESTBIT(fUserBits, kIsInOuterRing); }
-
-    Bool_t IsInside(Float_t px, Float_t py) const;
-    Int_t  GetDirection(const MGeomPix &pix) const;
-
-    virtual Float_t DistanceToPrimitive(Float_t px, Float_t py) const;
-    //void GetIntersectionBorder(TOrdCollection &col, const MGeomPix &hex) const;
-    //Double_t CalcOverlapArea(const MGeomPix &cam) const;
-
-    //TObject *GetGraphics() { return new MHexagon(*this); }
-
-    ClassDef(MGeomPix, 4) // Geometry class describing the geometry of one pixel
+    ClassDef(MGeomPix, 5) // Geometry class describing the geometry of one pixel
 };