Changeset 7346 for trunk

Timestamp:

09/09/05 19:24:18 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mgeom/MGeomCam.cc (modified) (3 diffs)
• mgeom/MGeomCam.h (modified) (3 diffs)
• mgeom/MGeomPix.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/09/09 Thomas Bretz
+
+   * mgeom/MGeomPix.cc:
+     - fixed a problem with incorrectly set bits for outermost
+       pixels (introduced with the latest changes)
+
+
+
  2005/09/09 Daniela Dorner
 

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -67 +67 @@
 // --------------------------------------------------------------------------
 //
-// Default Constructor
-/*
-MGeomCam::MGeomCam()
-    : fNumPixels(0), fCamDist(0), fConvMm2Deg(0),  fMaxRadius(1), fMinRadius(1)
-{
-    fName  = "MGeomCam";
-    fTitle = "Storage container for a camera geometry";
-}
-*/
-// --------------------------------------------------------------------------
-//
-// Initializes a Camera Geometry with npix pixels. All pixels
-// are deleted when the corresponding array is deleted.
+// Default Constructor. Initializes a Camera Geometry with npix pixels. All
+// pixels are deleted when the corresponding array is deleted.
 //
 MGeomCam::MGeomCam(UInt_t npix, Float_t dist, const char *name, const char *title)
@@ -141 +130 @@
 // --------------------------------------------------------------------------
 //
-// Returns the distance between the pixels i and j. -1 if an index
-// doesn't exist. The default for j is 0. Assuming that 0 is the index
-// for a central pixel you can get the distance to the camera center.
-//
-Float_t MGeomCam::GetDist(UShort_t i, UShort_t j) const
-{
-    if (i>=fNumPixels || j>=fNumPixels)
-        return -1;
-
-    return (*this)[i].GetDist((*this)[j]);
-}
-
-// --------------------------------------------------------------------------
-//
 //  Set the kIsOuterRing flag for all pixels which have a outermost pixel
 //  as Next Neighbor and don't have the kIsOutermostRing flag itself.
@@ -244 +219 @@
             fMaxRadius[0] = maxr;
     }
+}
+
+// --------------------------------------------------------------------------
+//
+// Returns the distance between the pixels i and j. -1 if an index
+// doesn't exist. The default for j is 0. Assuming that 0 is the index
+// for a central pixel you can get the distance to the camera center.
+//
+Float_t MGeomCam::GetDist(UShort_t i, UShort_t j) const
+{
+    if (i>=fNumPixels || j>=fNumPixels)
+        return -1;
+
+    return (*this)[i].GetDist((*this)[j]);
 }
 

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -35 +35 @@
 
 protected:
-
     void CalcMaxRadius();
     void CalcNumSectors();
@@ -41 +40 @@
     void InitOuterRing();
 
-
 public:
-    //MGeomCam();
     MGeomCam(UInt_t npix=0, Float_t dist=1, const char *name=NULL, const char *title=NULL);
 
@@ -70 +67 @@
 
     Float_t GetDist(UShort_t i, UShort_t j=0) const;
-    
+
     UInt_t  GetNumSectors()                const  { return fNumSectors; }
     UInt_t  GetNumAreas()                  const  { return fNumAreas; }

trunk/MagicSoft/Mars/mgeom/MGeomPix.cc

@@ -103 +103 @@
     fNumNeighbors = i;
 
-    if (fNumNeighbors<5)
-        SetBit(kIsInOutermostRing);
+    fNumNeighbors<5 ? SetBit(kIsInOutermostRing) : ResetBit(kIsInOutermostRing);
 }
 
@@ -116 +115 @@
     if (IsInOutermostRing())
         return;
+
+    ResetBit(kIsInOuterRing);
 
     for (int i=0; i<fNumNeighbors; i++)