Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 9153)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 9369)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.52 2007-06-24 16:31:57 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.53 2009-03-01 21:48:13 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -185,5 +185,5 @@
 // Calculate the number of pixels without the given type-flags.
 //
-// The second argument aidx is the area index (see MGeomCam, MGeomPix)
+// The second argument aidx is the area index (see MGeomCam, MGeom)
 // The default (or any value less than 0) means: all
 //
@@ -216,5 +216,5 @@
 // Calculate the number of pixels with the given type-flags.
 //
-// The second argument aidx is the area index (see MGeomCam, MGeomPix)
+// The second argument aidx is the area index (see MGeomCam, MGeom)
 // The default (or any value less than 0) means: all
 //
@@ -263,5 +263,5 @@
 // Counts the number of neighbors matching NOT UnsuitableType type
 //
-Short_t MBadPixelsCam::GetNumSuitableNeighbors(MBadPixelsPix::UnsuitableType_t type, const MGeomPix &pix) const
+Short_t MBadPixelsCam::GetNumSuitableNeighbors(MBadPixelsPix::UnsuitableType_t type, const MGeom &pix) const
 {
     const Int_t n2 = pix.GetNumNeighbors();
@@ -284,5 +284,5 @@
 // doesn't matter) has less than two reliable neighbor pixels.
 //
-// The second argument aidx is the area index (see MGeomCam, MGeomPix)
+// The second argument aidx is the area index (see MGeomCam, MGeom)
 // The default (or any value less than 0) means: all
 //
@@ -302,5 +302,5 @@
     for (int i=0; i<n; i++)
     {
-        const MGeomPix &pix = geom[i];
+        const MGeom &pix = geom[i];
         if (aidx>=0 && pix.GetAidx()!=aidx)
             continue;
@@ -320,5 +320,5 @@
 // the function is called for all its neighbors. If
 //
-// The second argument aidx is the area index (see MGeomCam, MGeomPix)
+// The second argument aidx is the area index (see MGeomCam, MGeom)
 // The default (or any value less than 0) means: all
 //
@@ -327,5 +327,5 @@
 Short_t MBadPixelsCam::GetNumMaxCluster(MBadPixelsPix::UnsuitableType_t type, TObjArray &list, Int_t idx, Int_t aidx) const
 {
-    const MGeomPix *pix = (MGeomPix*)list[idx];
+    const MGeom *pix = (MGeom*)list[idx];
     if (!pix)
         return 0;
@@ -358,5 +358,5 @@
 // type and the given area index.
 //
-// The second argument aidx is the area index (see MGeomCam, MGeomPix)
+// The second argument aidx is the area index (see MGeomCam, MGeom)
 // The default (or any value less than 0) means: all
 //
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.h
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.h	(revision 9153)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.h	(revision 9369)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-!  $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.h,v 1.12 2007-12-14 09:56:01 tbretz Exp $
+!  $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.h,v 1.13 2009-03-01 21:48:13 tbretz Exp $
 \* ======================================================================== */
 #ifndef MARS_MBadPixelsCam
@@ -15,5 +15,5 @@
 class TClonesArray;
 
-class MGeomPix;
+class MGeom;
 
 class MBadPixelsCam : public MParContainer, public MCamEvent
@@ -22,5 +22,5 @@
     TClonesArray *fArray; //-> 
 
-    Short_t GetNumSuitableNeighbors(MBadPixelsPix::UnsuitableType_t type, const MGeomPix &pix) const;
+    Short_t GetNumSuitableNeighbors(MBadPixelsPix::UnsuitableType_t type, const MGeom &pix) const;
     Short_t GetNumMaxCluster(MBadPixelsPix::UnsuitableType_t type, TObjArray &list, Int_t idx, Int_t aidx) const;
 
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc	(revision 9153)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc	(revision 9369)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.41 2008-01-09 11:30:24 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.42 2009-03-01 21:48:13 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -257,6 +257,6 @@
         // Get the corresponding geometry and pedestal
         //
-        MSignalPix     &pix  = (*fEvt)[i];
-        const MGeomPix &gpix = (*fGeomCam)[i];
+        MSignalPix  &pix  = (*fEvt)[i];
+        const MGeom &gpix = (*fGeomCam)[i];
 
         // Do Not-Use-Central-Pixel
@@ -346,5 +346,5 @@
         // Get the corresponding geometry and pedestal
         //
-        const MGeomPix    &gpix = (*fGeomCam)[i];
+        const MGeom       &gpix = (*fGeomCam)[i];
         const MPedPhotPix &ppix = pedphot[i];
 
@@ -442,5 +442,5 @@
 
         // Geometry of bad pixel
-        const MGeomPix &gpix = (*fGeomCam)[i];
+        const MGeom &gpix = (*fGeomCam)[i];
 
         // Number of neighbor pixels