Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 3842)
+++ 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;
 }