Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8422)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8423)
@@ -19,5 +19,25 @@
                                                  -*-*- END OF LINE -*-*-
 
- 2007/04/12 Daniela Dorner
+
+ 2007/04/20 Thomas Bretz
+
+   * mbadpixels/MBadPixelsCam.cc, mbadpixels/MBadPixelsPix.cc: 
+     - propagate option in Clear member function
+     - the default is now to keep the previously excluded flag and
+       set the unsuitable-run flag accordingly
+
+   * mcalib/MCalibrationChargeCalc.cc:
+     - if the lower limit for the measured number of phe is calculated 
+       to be less than one phe it is artificially reset to one phe
+
+   * mhist/MHCamEvent.cc:
+     - call SetFrameBorder(0) for all subpads explicitly 
+
+   * mhist/MHCamera.cc:
+     - removed the obsolete definition of kItemsLegend
+
+
+
+ 2007/04/19 Daniela Dorner
 
    * datacenter/db/showplots-ds.php:
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 8422)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 8423)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.48 2007-01-30 14:16:44 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.49 2007-04-20 08:55:17 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -169,5 +169,5 @@
 void MBadPixelsCam::Clear(Option_t *o)
 {
-    fArray->R__FOR_EACH(TObject, Clear)();
+    fArray->R__FOR_EACH(TObject, Clear)(o);
 }
 
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc	(revision 8422)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc	(revision 8423)
@@ -129,5 +129,12 @@
 void MBadPixelsPix::Clear(Option_t *o)
 {
-    fInfo.Reset(0);
+    if (TString(o).IsNull())
+    {
+        fInfo[1] &= BIT(0);
+        fInfo[0]  = fInfo[1] ? kUnsuitableRun : 0;
+        fInfo[2]  = 0;
+    }
+    else
+        fInfo.Reset(0);
 }
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 8422)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 8423)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.173 2007-04-18 15:33:56 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.174 2007-04-20 08:55:18 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1354,4 +1354,7 @@
       upplim[i] = mean + fPheErrUpperLimit*sigma;
 
+      if (lowlim[i]<1)
+          lowlim[i] = 1;
+
       delete hist;
 
Index: trunk/MagicSoft/Mars/mhist/MHCamEvent.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 8422)
+++ trunk/MagicSoft/Mars/mhist/MHCamEvent.cc	(revision 8423)
@@ -263,4 +263,5 @@
     TString name = Form("%s_1", pad->GetName());
     TPad *p = new TPad(name,name,0.005, 0.5, 0.66, 0.995,col,0,0);
+    p->SetFrameBorderMode(0);
     p->SetNumber(1);
     p->Draw();
@@ -271,4 +272,5 @@
     name = Form("%s_2", pad->GetName());
     p = new TPad(name,name,0.66, 0.5, 0.995, 0.995,col,0,0);
+    p->SetFrameBorderMode(0);
     p->SetNumber(2);
     p->Draw();
@@ -282,4 +284,5 @@
     name = Form("%s_3", pad->GetName());
     p = new TPad(name,name,0.005, 0.005, 3./8, 0.5,col,0,0);
+    p->SetFrameBorderMode(0);
     p->SetNumber(3);
     p->Draw();
@@ -290,4 +293,5 @@
     name = Form("%s_4", pad->GetName());
     p = new TPad(name,name,3./8, 0.005, 6./8-0.005, 0.5,col,0,0);
+    p->SetFrameBorderMode(0);
     p->SetNumber(4);
     p->Draw();
@@ -311,4 +315,5 @@
     name = Form("%s_5", pad->GetName());
     p = new TPad(name,name,6./8,0.25,0.995,0.5,col,0,0);
+    p->SetFrameBorderMode(0);
     p->SetNumber(5);
     p->Draw();
@@ -322,4 +327,5 @@
     name = Form("%s_6", pad->GetName());
     p = new TPad(name,name,6./8,0.005,0.995,0.25,col,0,0);
+    p->SetFrameBorderMode(0);
     p->SetNumber(6);
     p->Draw();
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 8422)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 8423)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.102 2007-04-12 11:47:19 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.103 2007-04-20 08:55:19 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -88,6 +88,4 @@
 #include "MMath.h"    // MMath::GaussProb
 
-#define kItemsLegend 48 // see SetPalette(1,0)
-
 ClassImp(MHCamera);