Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3805)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3806)
@@ -77,4 +77,8 @@
    * mbadpixels/Makefile:
      - added mpedestals
+
+   * Makefile:
+     - added mpedestals
+
 
 
Index: trunk/MagicSoft/Mars/Makefile
===================================================================
--- trunk/MagicSoft/Mars/Makefile	(revision 3805)
+++ trunk/MagicSoft/Mars/Makefile	(revision 3806)
@@ -49,4 +49,5 @@
           mbadpixels \
 	  mcalib \
+          mpedestal \
           mfileio \
           mreflector \
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 3805)
+++ trunk/MagicSoft/Mars/NEWS	(revision 3806)
@@ -1,4 +1,9 @@
                                                                -*-*- END -*-*-
  *** Version <cvs>
+
+   - implementes interleave in merpp to be able to merpp parts of a file
+
+   - implemented force-functionality to merpp
+
 
 
Index: trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 3805)
+++ trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h	(revision 3806)
@@ -18,12 +18,7 @@
 #pragma link C++ class MBlindPixelsCalc2+;
 
-#pragma link C++ class MPedestalPix+;
 #pragma link C++ class MHPedestalPix+;
-#pragma link C++ class MPedestalCam+;
 #pragma link C++ class MHPedestalCam+;
-#pragma link C++ class MPedCalcPedRun+;
-#pragma link C++ class MPedPhotCalc+;
-#pragma link C++ class MMcPedestalCopy+;
-#pragma link C++ class MMcPedestalNSBAdd+;
+
 #pragma link C++ class MGeomApply+;
 
@@ -74,8 +69,3 @@
 #pragma link C++ class MMcCalibrationUpdate+;
 
-#pragma link C++ class MPedPhotCam+;
-#pragma link C++ class MPedPhotPix+;
-
 #endif
-
-
Index: trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- trunk/MagicSoft/Mars/manalysis/Makefile	(revision 3805)
+++ trunk/MagicSoft/Mars/manalysis/Makefile	(revision 3806)
@@ -24,6 +24,7 @@
 INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \
 	   -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../mbadpixels -I../mastro
+           -I../mhistmc -I../mfileio -I../mmain -I../mcalib          \
+           -I../msignal -I../mpointing -I../mtools -I../mfbase       \
+           -I../mbadpixels -I../mastro -I../mpedestal
 # mcalib: MGeomApply (MCalibrationCam)
 
@@ -32,14 +33,6 @@
 .SUFFIXES: .c .cc .cxx .h .hxx .o 
 
-SRCFILES = MPedestalPix.cc \
-           MHPedestalPix.cc \
-           MPedestalCam.cc \
+SRCFILES = MHPedestalPix.cc \
            MHPedestalCam.cc \
-           MPedPhotPix.cc \
-           MPedPhotCam.cc \
-           MPedCalcPedRun.cc \
-           MPedPhotCalc.cc \
-           MMcPedestalCopy.cc \
-           MMcPedestalNSBAdd.cc \
            MGeomApply.cc \
            MCameraData.cc \
Index: trunk/MagicSoft/Mars/mbadpixels/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/Makefile	(revision 3805)
+++ trunk/MagicSoft/Mars/mbadpixels/Makefile	(revision 3806)
@@ -22,9 +22,11 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../manalysis -I../mgeom -I../mgui -I../mmc
+INCLUDES = -I. -I../mbase -I../manalysis -I../mgeom -I../mgui \
+           -I../mmc -I../mpedestal
 # MBadPixelsCalc  (manalysis): MPedPhotCam, MSigmabar
 # MBadPixelsCalc  (mgeom):     MGeomCam
 # MBadPixelsCam   (mgui):      MCamEvent
 # MMcBadPixelsSet (mmc):       MMcRunHeader
+# MBadPixelsTreat (mpedestal): MPedPhot*
 
 
Index: trunk/MagicSoft/Mars/mpedestal/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/Makefile	(revision 3805)
+++ trunk/MagicSoft/Mars/mpedestal/Makefile	(revision 3806)
@@ -22,6 +22,13 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mgui
+INCLUDES = -I. -I../mbase -I../mgui -I../mraw -I../mmc -I../mgeom \
+           -I../msignal -I../manalysis -I../mbadpixels
 # MCamEvent
+# MMcPedestalCopy   (MRawRunHeader)
+# MMcPedestalCopy   (MMcRunHeader)
+# MMcPedestalNSBAdd (MGeomCam)
+# MPedCalcPedRun    (MExtractedSignal)
+# MPedPhotCalc      (MCerPhotEvt)
+# MPedPhotCalc      (MBadPixelsCam)
 
 #------------------------------------------------------------------------------