Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3850)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3851)
@@ -27,4 +27,8 @@
    * mjobs/MJCalibration.cc
      - take out display of previously excluded pixels 
+
+   * mbadpixels/MBadPixelsCam.cc
+     - set val to 1 in case that GetPixelContent is true, before display 
+       was not correct
 
 
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 3850)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 3851)
@@ -349,46 +349,122 @@
       return (*this)[idx].GetInfo()[0];
     case 1:
-      return (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun);
+      if  ((*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 2:
-      return (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableEvt);
+      if  ((*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableEvt))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 3:
-      return (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnreliableRun);
+      if  ((*this)[idx].IsUnsuitable(MBadPixelsPix::kUnreliableRun))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 4:
-      return (*this)[idx].IsHiGainBad();
+      if  ((*this)[idx].IsHiGainBad())
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 5:
-      return (*this)[idx].IsLoGainBad();
+      if  ((*this)[idx].IsLoGainBad())
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 8:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainNotFitted);
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainNotFitted))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 9:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainNotFitted);
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainNotFitted))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 10:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainOscillating);
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainOscillating))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 11:
-      return(*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainOscillating);
+      if ((*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainOscillating))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 12:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainSaturation );
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainSaturation ))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 13:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeIsPedestal );
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeIsPedestal ))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 14:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeErrNotValid);
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeErrNotValid))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 15:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeRelErrNotValid);
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeRelErrNotValid))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 16:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeSigmaNotValid );
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeSigmaNotValid ))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 17:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin  );
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin  ))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 18:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInLast2Bins );
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInLast2Bins ))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 19:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kDeviatingNumPhes    );
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kDeviatingNumPhes ))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 20:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeNotFitted );
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeNotFitted ))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     case 21:
-      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeOscillating  );
+      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeOscillating))
+        val = 1;
+      else
+        return kFALSE;
+      break;
     default:
       return kFALSE;
     }
   
-  return kFALSE;
+  return kTRUE;
 }
 
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationTestPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationTestPix.cc	(revision 3850)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationTestPix.cc	(revision 3851)
@@ -50,5 +50,5 @@
 using namespace std;
 
-const Int_t   MHCalibrationTestPix::fgChargeNbins     = 2000;
+const Int_t   MHCalibrationTestPix::fgChargeNbins     = 1000;
 const Axis_t  MHCalibrationTestPix::fgChargeFirst     = -0.5;
 const Axis_t  MHCalibrationTestPix::fgChargeLast      = 3999.5;
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3850)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3851)
@@ -178,4 +178,5 @@
                             const Int_t fit, const Int_t rad)
 {
+
     c.cd(x);
     gPad->SetBorderMode(0);
@@ -454,9 +455,12 @@
         // Defects
         TCanvas &c4 = fDisplay->AddTab("Defect");
-        c4.Divide(3,2);
-        
-        CamDraw(c4, 1, 3, disp23, 0);
-        CamDraw(c4, 2, 3, disp24, 0);
-        CamDraw(c4, 3, 3, disp25, 0);
+        //        c4.Divide(3,2);
+        c4.Divide(2,2);
+        
+        //        CamDraw(c4, 1, 3, disp23, 0);
+        //        CamDraw(c4, 2, 3, disp24, 0);
+        //        CamDraw(c4, 3, 3, disp25, 0);
+        CamDraw(c4, 1, 2, disp24, 0);
+        CamDraw(c4, 2, 2, disp25, 0);
 
         if (fRelTimes)
@@ -510,6 +514,8 @@
         // Defects
         TCanvas &c15 = fDisplay->AddTab("Defect");
-        c15.Divide(5,2);
-        
+        //      c15.Divide(5,2);
+        c15.Divide(4,2);
+        
+        /*
         CamDraw(c15, 1, 5, disp23, 0);
         CamDraw(c15, 2, 5, disp24, 0);
@@ -517,4 +523,9 @@
         CamDraw(c15, 4, 5, disp26, 0);
         CamDraw(c15, 5, 5, disp27, 0);
+        */
+        CamDraw(c15, 1, 4, disp24, 0);
+        CamDraw(c15, 2, 4, disp25, 0);
+        CamDraw(c15, 3, 4, disp26, 0);
+        CamDraw(c15, 4, 4, disp27, 0);
         
         // Abs. Times
@@ -614,11 +625,11 @@
         // Defects
         TCanvas &c29 = fDisplay->AddTab("Defect");
-        c29.Divide(5,2);
-        
-        CamDraw(c29, 1, 5, disp23, 0);
-        CamDraw(c29, 2, 5, disp24, 0);
-        CamDraw(c29, 3, 5, disp25, 0);
-        CamDraw(c29, 4, 5, disp26, 0);
-        CamDraw(c29, 5, 5, disp27, 0);
+        //      c29.Divide(5,2);
+        c29.Divide(4,2);
+        
+        CamDraw(c29, 1, 4, disp24, 0);
+        CamDraw(c29, 2, 4, disp25, 0);
+        CamDraw(c29, 3, 4, disp26, 0);
+        CamDraw(c29, 4, 4, disp27, 0);
         
         // Abs. Times