Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3430)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3431)
@@ -11,4 +11,7 @@
 
   * mcalib/Makefile
+    - include directory mbadpixels
+
+  * manalysis/Makefile
     - include directory mbadpixels
 
@@ -42,4 +45,8 @@
   * mbadpixels/MBadPixelsCalc.cc
     - exchange "SetUnsuitable" by "SetUnsuitableEvt"
+
+  * manalysis/MGeomApply.cc
+    - remove obsolete MArrivalTime
+    - add MBadPixelsCam
 
 
Index: /trunk/MagicSoft/Mars/manalysis/MGeomApply.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MGeomApply.cc	(revision 3430)
+++ /trunk/MagicSoft/Mars/manalysis/MGeomApply.cc	(revision 3431)
@@ -72,9 +72,8 @@
 #include "MCalibrationChargeCam.h"
 #include "MPedPhotCam.h"
-#include "MArrivalTime.h"
 #include "MExtractedSignalCam.h"
 #include "MBlindPixels.h"
 #include "MArrivalTimeCam.h"
-
+#include "MBadPixelsCam.h"
 
 ClassImp(MGeomApply);
@@ -149,12 +148,11 @@
         bnd->InitSize(cam->GetNumPixels());
 
-    MArrivalTime *tme = (MArrivalTime*)pList->FindObject(AddSerialNumber("MArrivalTime"));
+    MArrivalTimeCam *tme = (MArrivalTimeCam*)pList->FindObject(AddSerialNumber("MArrivalTimeCam"));
     if (tme)
-        tme->InitSize(cam->GetNumPixels());
+      tme->InitSize(cam->GetNumPixels());
 
-    MArrivalTimeCam *tmecam = (MArrivalTimeCam*)pList->FindObject(AddSerialNumber("MArrivalTimeCam"));
-    if (tmecam)
-      tmecam->InitSize(cam->GetNumPixels());
-
+    MBadPixelsCam *bad = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
+    if (bad)
+      bad->InitSize(cam->GetNumPixels());
 
     return kTRUE;
Index: /trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/Makefile	(revision 3430)
+++ /trunk/MagicSoft/Mars/manalysis/Makefile	(revision 3431)
@@ -25,5 +25,5 @@
 	   -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
            -I../mhistmc -I../mfileio -I../mmain -I../mcalib -I../msignal         \
-           -I../mpointing -I../mtools -I../mfbase
+           -I../mpointing -I../mtools -I../mfbase -I../mbadpixels
 # mcalib: MGeomApply (MCalibrationCam)