Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 5716)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 5717)
@@ -20,4 +20,33 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/01/07 Thomas Bretz
+
+   * mbadpixels/MBadPixelsCalc.[h,cc], macros/ONOFFAnalaysis.C:
+     - replaced PedPhotContainer by PedPhotCam for consistency
+   
+   * mbase/MLog.[h,cc]:
+     - return *this in Seperator()
+
+   * mbase/MPrint.[h,cc]:
+     - use new separator manipulator in PreProcess
+     - fixed a type: separator instead of seperator
+
+   * mfileio/MReadTree.[h,cc]:
+     - added a check for branch->IsAutoDelete() in Notify()
+
+   * mpedestal/MExtractPedestal.[h,cc]:
+     - added new option 'fRandomCalculation' be used to switch on-/off-
+       randomization in extractors, the default should be like before
+     - added Process() calling Calc()
+
+   * mpedestal/MPedCalcFromLoGain.[h,cc], mpedestal/MPedCalcPedRun.[h,cc]:
+     - renamed Process() to Calc()
+
+   * Makefile:
+     - removed macros/calibration.C, which seems to have been
+       unintantionally introduced.
+
+
 
  2005/01/05 Thomas Bretz
Index: /trunk/MagicSoft/Mars/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/Makefile	(revision 5716)
+++ /trunk/MagicSoft/Mars/Makefile	(revision 5717)
@@ -20,6 +20,5 @@
 #
 #PROGRAMS = readraw merpp mars test mona status
-PROGRAMS = readdaq readraw merpp mars mona showlog callisto showplot star \
-	   macros/calibration
+PROGRAMS = readdaq readraw merpp mars mona showlog callisto showplot star
 SOLIB    = libmars.so
 CINT     = M
Index: /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 5716)
+++ /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc	(revision 5717)
@@ -86,5 +86,5 @@
 //
 MBadPixelsCalc::MBadPixelsCalc(const char *name, const char *title)
-    : fPedestalLevel(3), fNamePedPhotContainer("MPedPhotCam")
+    : fPedestalLevel(3), fNamePedPhotCam("MPedPhotCam")
 {
     fName  = name  ? name  : gsDefName.Data();
@@ -103,8 +103,8 @@
     if (fPedestalLevel>0)
     {
-        fPedPhotCam = (MPedPhotCam*)pList->FindObject(AddSerialNumber(fNamePedPhotContainer), "MPedPhotCam");
+        fPedPhotCam = (MPedPhotCam*)pList->FindObject(AddSerialNumber(fNamePedPhotCam), "MPedPhotCam");
         if (!fPedPhotCam)
         {
-	  *fLog << err << fNamePedPhotContainer << "[MPedPhotCam] not found... aborting." << endl;
+	  *fLog << err << fNamePedPhotCam << "[MPedPhotCam] not found... aborting." << endl;
             return kFALSE;
         }
@@ -118,6 +118,5 @@
     }
 
-    *fLog << inf << "Name of MPedPhotCam container : " << fNamePedPhotContainer
-          << endl;
+    *fLog << inf << "Name of MPedPhotCam used: " << fNamePedPhotCam << endl;
 
     return kTRUE;
Index: /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h
===================================================================
--- /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h	(revision 5716)
+++ /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.h	(revision 5717)
@@ -18,5 +18,5 @@
 
     Float_t fPedestalLevel;
-    TString fNamePedPhotContainer; // name of the 'MPedPhotCam' container
+    TString fNamePedPhotCam; // name of the 'MPedPhotCam' container
    
     //    void CheckPedestalRMS() const;
@@ -31,5 +31,5 @@
 
     void SetPedestalLevel(Float_t f) { fPedestalLevel=f; }
-    void SetNamePedPhotContainer(const char *name)    { fNamePedPhotContainer = name; }
+    void SetNamePedPhotCam(const char *name)    { fNamePedPhotCam = name; }
 
     ClassDef(MBadPixelsCalc, 1) // Task to find bad pixels (star, broken pixels, etc)