Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 8501)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 8502)
@@ -18,4 +18,18 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2007/05/14 Thomas Bretz
+
+   * mjobs/MJCalibration.cc:
+     - fixed the unintentionally removed setting of pedestal 
+       for MPedestalSubtract
+
+   * mpedestal/MPedestalSubtract.cc:
+     - improved output for debugging purpose
+
+   * msignal/MExtractor.[h,cc]:
+     - according to the last changes the version number has been 
+       increased to 9
+
+
 
  2007/05/11 Daniela Dorner
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 8501)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 8502)
@@ -1802,4 +1802,5 @@
     // Produce pedestal subtracted raw-data
     MPedestalSubtract pedsub;
+    pedsub.SetPedestalCam(&pedcam);
     tlist.AddToList(&pedsub);
 
Index: /trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc
===================================================================
--- /trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc	(revision 8501)
+++ /trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc	(revision 8502)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.4 2007-01-15 12:06:15 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.5 2007-05-14 09:53:15 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -105,6 +105,15 @@
         return kFALSE;
 
-    if (fPedestals || fNamePedestalCam.IsNull())
+    if (fPedestals)
+    {
+        *fLog << inf << "Pedestals given by pointer will be subtracted." << endl;
         return kTRUE;
+    }
+
+    if (fNamePedestalCam.IsNull())
+    {
+        *fLog << inf << "No name for MPedestalCam given, pedestal subtraction will be skipped." << endl;
+        return kTRUE;
+    }
 
     fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber(fNamePedestalCam), "MPedestalCam");
@@ -114,4 +123,6 @@
         return kFALSE;
     }
+
+    *fLog << inf << "Pedestals " << fNamePedestalCam << " will be subtracted." << endl;
 
     return kTRUE;
Index: /trunk/MagicSoft/Mars/msignal/MExtractor.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 8501)
+++ /trunk/MagicSoft/Mars/msignal/MExtractor.cc	(revision 8502)
@@ -79,4 +79,8 @@
 //  - Byte_t fSaturationLimit;
 //  + Uint_t fSaturationLimit;
+//
+// Class Version 9:
+// ----------------
+//  - MPedestalCam fPedestals
 //
 //
Index: /trunk/MagicSoft/Mars/msignal/MExtractor.h
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MExtractor.h	(revision 8501)
+++ /trunk/MagicSoft/Mars/msignal/MExtractor.h	(revision 8502)
@@ -114,5 +114,5 @@
   void Print(Option_t *o="") const; //*MENU*
 
-  ClassDef(MExtractor, 8) // Signal Extractor Base Class
+  ClassDef(MExtractor, 9) // Signal Extractor Base Class
 };