Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 4637)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 4641)
@@ -474,32 +474,27 @@
       return (*this)[idx].GetInfo()[0];
     case 1:
-      if  ((*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
+        return kFALSE;
+      val = 1;
       break;
     case 2:
-      if  ((*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableEvt))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableEvt))
+        return kFALSE;
+      val = 1;
       break;
     case 3:
-      if  ((*this)[idx].IsUnsuitable(MBadPixelsPix::kUnreliableRun))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUnsuitable(MBadPixelsPix::kUnreliableRun))
+          return kFALSE;
+      val = 1;
       break;
     case 4:
-      if  ((*this)[idx].IsHiGainBad())
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsHiGainBad())
+        return kFALSE;
+      val = 1;
       break;
     case 5:
-      if  ((*this)[idx].IsLoGainBad())
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsLoGainBad())
+        return kFALSE;
+      val = 1;
       break;
     case 6:
@@ -516,86 +511,72 @@
       break;
     case 8:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainNotFitted))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainNotFitted))
+        return kFALSE;
+      val = 1;
       break;
     case 9:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainNotFitted))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainNotFitted))
+        return kFALSE;
+      val = 1;
       break;
     case 10:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainOscillating))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainOscillating))
+        return kFALSE;
+      val = 1;
       break;
     case 11:
-      if ((*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainOscillating))
-        val = 1;
-      else
-        return kFALSE;
+      if (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainOscillating))
+        return kFALSE;
+      val = 1;
       break;
     case 12:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainSaturation ))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainSaturation ))
+        return kFALSE;
+      val = 1;
       break;
     case 13:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeIsPedestal ))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeIsPedestal ))
+        return kFALSE;
+      val = 1;
       break;
     case 14:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeErrNotValid))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeErrNotValid))
+        return kFALSE;
+      val = 1;
       break;
     case 15:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeRelErrNotValid))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeRelErrNotValid))
+        return kFALSE;
+      val = 1;
       break;
     case 16:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeSigmaNotValid ))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeSigmaNotValid ))
+        return kFALSE;
+      val = 1;
       break;
     case 17:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin  ))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin  ))
+        return kFALSE;
+      val = 1;
       break;
     case 18:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInLast2Bins ))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInLast2Bins ))
+        return kFALSE;
+      val = 1;
       break;
     case 19:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kDeviatingNumPhes ))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kDeviatingNumPhes ))
+        return kFALSE;
+      val = 1;
       break;
     case 20:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeNotFitted ))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeNotFitted ))
+        return kFALSE;
+      val = 1;
       break;
     case 21:
-      if  ((*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeOscillating))
-        val = 1;
-      else
-        return kFALSE;
+      if  (!(*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeOscillating))
+        return kFALSE;
+      val = 1;
       break;
     default: