Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 3735)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 3736)
@@ -349,69 +349,47 @@
     {
     case 0:
-      val = (*this)[idx].GetInfo()[0];
-      return (*this)[idx].IsOK();
+      return (*this)[idx].GetInfo()[0];
     case 1:
-      val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun);
-      return val;
+      return (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun);
     case 2:
-      val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableEvt);
-      return val;
+      return (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableEvt);
     case 3:
-      val = (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnreliableRun);
-      return val;
+      return (*this)[idx].IsUnsuitable(MBadPixelsPix::kUnreliableRun);
     case 4:
-      val = (*this)[idx].IsHiGainBad();
-      return val;
+      return (*this)[idx].IsHiGainBad();
     case 5:
-      val = (*this)[idx].IsLoGainBad();
-      return val;
+      return (*this)[idx].IsLoGainBad();
     case 6:
-      val = !(*this)[idx].IsCalibrationSignalOK();
-      return val;
+      return !(*this)[idx].IsCalibrationSignalOK();
     case 7:
-      val = !(*this)[idx].IsCalibrationResultOK(); 
-      return val;
+      return !(*this)[idx].IsCalibrationResultOK(); 
     case 8:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainNotFitted);
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainNotFitted);
     case 9:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainNotFitted);
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainNotFitted);
     case 10:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainOscillating);
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainOscillating);
     case 11:
-     val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainOscillating);
-      return val;
+      return(*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainOscillating);
     case 12:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainSaturation );
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kLoGainSaturation );
     case 13:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeIsPedestal );
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeIsPedestal );
     case 14:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeErrNotValid);
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeErrNotValid);
     case 15:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeRelErrNotValid);
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeRelErrNotValid);
     case 16:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeSigmaNotValid );
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kChargeSigmaNotValid );
     case 17:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin  );
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin  );
     case 18:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInLast2Bins );
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kMeanTimeInLast2Bins );
     case 19:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kDeviatingNumPhes    );
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kDeviatingNumPhes    );
     case 20:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeNotFitted );
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeNotFitted );
     case 21:
-      val = (*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeOscillating  );
-      return val;
+      return (*this)[idx].IsUncalibrated(MBadPixelsPix::kRelTimeOscillating  );
     default:
       return kFALSE;