Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7374)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7375)
@@ -19,5 +19,5 @@
                                                  -*-*- END OF LINE -*-*-
 
- 2005/09/30 Daniela Dorner
+ 2005/09/30 Thomas Bretz
 
    * callisto.rc, callisto_MarApr05.rc:
@@ -37,4 +37,12 @@
      _ really display rms (former display was incorrectly Pedestal
        instead of its rms
+
+   * mjobs/MJCalibration.cc:
+     - fixed a small bug in the display of unsuitable pixels. 
+       (LoGainBlackout haven't been displayed, and previously excluded
+        pixels were wrong)
+
+   * mbadpixels/MBadPixelsCam.cc:
+     - small simplifications in GetPixelContent
 
    * mmuon/MHMuonPar.cc:
Index: /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 7374)
+++ /trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 7375)
@@ -679,14 +679,12 @@
       break;
     case 6:
-      if  ((*this)[idx].GetUnsuitableCalLevel())
-        val = (*this)[idx].GetUnsuitableCalLevel();
-      else
-        return kFALSE;
+      if  (!(*this)[idx].GetUnsuitableCalLevel())
+        return kFALSE;
+      val = (*this)[idx].GetUnsuitableCalLevel();
       break;
     case 7:
-      if  ((*this)[idx].GetUnreliableCalLevel())
-        val = (*this)[idx].GetUnreliableCalLevel();
-      else
-        return kFALSE;
+      if  (!(*this)[idx].GetUnreliableCalLevel())
+        return kFALSE;
+      val = (*this)[idx].GetUnreliableCalLevel();
       break;
     case 8:
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 7374)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 7375)
@@ -895,12 +895,12 @@
       t17->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol)));
       t17->SetTextAlign(12);
+      TText *t15= pave->AddText(Form("Too many Low-Gain Blackout Events:       %3i pixels",
+                                       CountBadPixels(&disp24,10 )));
+      t15->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol)));
+      t15->SetTextAlign(12);
       TText *t14= pave->AddText(Form("Previously Excluded:                                   %3i pixels",
-                                       CountBadPixels(&disp24,10)));
-      t14->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol)));
+                                       CountBadPixels(&disp24,11)));
+      t14->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol)));
       t14->SetTextAlign(12);
-      TText *t15= pave->AddText(Form("Too many Low-Gain Blackout Events              %3i pixels",
-                                       CountBadPixels(&disp24,25 )));
-      t15->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol)));
-      t15->SetTextAlign(12);
       pave->Draw();
 
@@ -1367,14 +1367,13 @@
 }
 
-const Int_t MJCalibration::CountBadPixels ( MHCamera *cam , const Int_t what ) const
+const Int_t MJCalibration::CountBadPixels(MHCamera *cam, const Int_t what) const
 {
-
-  Int_t cnt = 0;
-
-  for (UInt_t pix=0; pix<cam->GetNumPixels();pix++)
-    if ((Int_t)cam->GetPixContent(pix) == what)
-      cnt++;
-
-  return cnt;
+    Int_t cnt = 0;
+
+    for (UInt_t pix=0; pix<cam->GetNumPixels(); pix++)
+        if (TMath::Nint(cam->GetPixContent(pix)) == what)
+            cnt++;
+
+    return cnt;
 }