Changeset 1458 for trunk

Timestamp:

07/31/02 11:10:37 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgeom

Files:

• MGeomCam.cc (modified) (1 diff)
• MGeomCam.h (modified) (1 diff)
• MGeomCamCT1.cc (modified) (1 diff)
• MGeomCamMagic.cc (modified) (1 diff)
• MGeomCamMagic.h (modified) (1 diff)
• MGeomPix.cc (modified) (2 diffs)
• MGeomPix.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -78 +78 @@
 // --------------------------------------------------------------------------
 //
+//  Set the kIsOuterRing flag for all pixels which have a outermost pixel
+//  as Next Neighbor and don't have the kIsOutermostRing flag itself.
+//
+void MGeomCam::InitOuterRing()
+{
+    for (UInt_t i=0; i<fNumPixels; i++)
+        (*this)[i].CheckOuterRing(*this);
+}
+
+// --------------------------------------------------------------------------
+//
 // Calculate the maximum radius of the camera. This is ment for GUI layout.
 //

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -24 +24 @@
 protected:
     void CalcMaxRadius();
+    void InitOuterRing();
 
 public:
-
     MGeomCam(UInt_t npix, Float_t dist, const char *name=NULL, const char *title=NULL);
 

trunk/MagicSoft/Mars/mgeom/MGeomCamCT1.cc

@@ -200 +200 @@
       (*this)[i].SetNeighbors(nn[i][0], nn[i][1], nn[i][2],
                               nn[i][3], nn[i][4], nn[i][5]);
+
+  InitOuterRing();
 }
 

trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.cc

@@ -896 +896 @@
       (*this)[i].SetNeighbors(nn[i][0], nn[i][1], nn[i][2],
                               nn[i][3], nn[i][4], nn[i][5]);
+
+  InitOuterRing();
 }

trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.h

@@ -13 +13 @@
 
 public:
-
     MGeomCamMagic(const char *name=NULL);
 

trunk/MagicSoft/Mars/mgeom/MGeomPix.cc

@@ -39 +39 @@
 #include "MLog.h"
 #include "MLogManip.h"
+
+#include "MGeomCam.h"
 
 ClassImp(MGeomPix);
@@ -83 +85 @@
 
     fNumNeighbors = i;
+
+    if (fNumNeighbors<5)
+        SetBit(kIsInOutermostRing);
+}
+
+// --------------------------------------------------------------------------
+//
+//  Set the kIsOuterRing flag if this pixel has a outermost pixel
+//  as Next Neighbor and don't have the kIsOutermostRing flag itself.
+//
+void MGeomPix::CheckOuterRing(const MGeomCam &cam)
+{
+    if (IsInOutermostRing())
+        return;
+
+    for (int i=0; i<fNumNeighbors; i++)
+        if (cam[fNeighbors[i]].IsInOutermostRing())
+        {
+            SetBit(kIsInOuterRing);
+            return;
+        }
 }
 

trunk/MagicSoft/Mars/mgeom/MGeomPix.h

@@ -6 +6 @@
 #endif
 
+class MGeomCam;
+
 class MGeomPix : public MParContainer
 { 
 private:
+    enum {
+        kIsInOutermostRing = BIT(14),
+        kIsInOuterRing     = BIT(15)
+    };
+
     Float_t fX;  // [mm] the x coordinate of the center
     Float_t fY;  // [mm] the y coordinate of the center
@@ -14 +21 @@
 
     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
+    Short_t fNeighbors[6]; // the IDs of the pixel next to it (we are assuming an hexagonal geometry)
 
 public:
@@ -26 +32 @@
     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);
 
     void SetX(Float_t x) { fX = x; }
@@ -40 +48 @@
     Short_t GetNeighbor(Byte_t i) const { return fNeighbors[i]; }
 
+    Bool_t IsInOutermostRing() const { return TestBit(kIsInOutermostRing); }
+    Bool_t IsInOuterRing() const     { return TestBit(kIsInOuterRing); }
+
     ClassDef(MGeomPix, 1) // Geometry class describing the geometry of one pixel
 };