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

Timestamp:

06/03/08 16:27:48 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -25 +25 @@
 private:
     enum {
-        kIsInOutermostRing = BIT(22),
-        kIsInOuterRing     = BIT(23),
-        kUserBits          = 0x1fc000 // 14-21 are allowed
+        kIsInOutermostRing = 0,
+        kIsInOuterRing     = 1,
     };
 
@@ -40 +39 @@
     UInt_t fSector;        // Number of sector the pixels corresponds to
     UInt_t fAidx;          // Area index of the pixel
+
+    Byte_t fUserBits;
 
 public:
@@ -54 +55 @@
         pix.fSector = fSector;
         pix.fAidx = fAidx;
+        pix.fUserBits = fUserBits;
         for (int i=0; i<6; i++)
             pix.fNeighbors[i] = fNeighbors[i];
+
+        TObject::Copy(obj);
     }
 
@@ -83 +87 @@
     Short_t GetNeighbor(Byte_t i) const { return fNeighbors[i]; }
 
-    Bool_t IsInOutermostRing() const { return TestBit(kIsInOutermostRing); }
-    Bool_t IsInOuterRing() const     { return TestBit(kIsInOuterRing); }
+    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;
 
-    /*
-     //
-     // These function are for future usage. They are not virtual in
-     // root by now.
-     //
-     void SetBit(UInt_t f, Bool_t set) { set ? TObject::SetBit(f) : TObject::ResetBit(f); }
-     void SetBit(UInt_t f)    { TObject::SetBit(f & kUserBits); }
-     void ResetBit(UInt_t f)  { TObject::ResetBit(f & kUserBits); }
-     void InvertBit(UInt_t f) { TObject InvertBit(f & kUserBits); }
-     */
-
-    ClassDef(MGeomPix, 3) // Geometry class describing the geometry of one pixel
+    ClassDef(MGeomPix, 4) // Geometry class describing the geometry of one pixel
 };