Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3838)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3839)
@@ -47,7 +47,15 @@
 
    * mbadpixels/MBadPixelsPix.[h,cc]
+   * mbadpixels/MBadPixelsCam.cc
      - removed bits: kHiGainNotCalibrated and kLoGainNotCalibrated
-     - added bit: kDeviatingFFactor
-
+     - added bits: kDeviatingFFactor, kConversionHiLoNotValid
+     - removed functions: IsCalibrationResultOK() 
+	and IsCalibrationSignalOK()
+
+   * mcalib/MCalibrate.cc
+   * mcalib/MCalibrateRelTime.cc
+     - exchanged query for IsCalibrationResultOK() to 
+       IsUnsuitableRun(MBadPixelsPix::kUnsuitableRun). This includes 
+       now the oscillating pixels (which are sometimes many!!)
 
  2004/04/26: Abelardo Moralejo
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 3838)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc	(revision 3839)
@@ -323,6 +323,4 @@
 // 4: MBadPixelsPix::IsHiGainBad()
 // 5: MBadPixelsPix::IsLoGainBad()
-// 6: !MBadPixelsPix::IsCalibrationSignalOK()
-// 7: !MBadPixelsPix::IsCalibrationResultOK();
 // 8: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kHiGainNotFitted)
 // 9: MBadPixelsPix::IsUncalibrated(MBadPixelsPix::kLoGainNotFitted)
@@ -360,8 +358,4 @@
     case 5:
       return (*this)[idx].IsLoGainBad();
-    case 6:
-      return !(*this)[idx].IsCalibrationSignalOK();
-    case 7:
-      return !(*this)[idx].IsCalibrationResultOK(); 
     case 8:
       return (*this)[idx].IsUncalibrated(MBadPixelsPix::kHiGainNotFitted);
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc	(revision 3838)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc	(revision 3839)
@@ -55,5 +55,7 @@
 // BIT(12): kMeanTimeInFirstBin  :  The signal has its mean maximum in the first used FADC slice - signal extractor bad
 // BIT(13): kMeanTimeInLast2Bins :  The signal has its mean maximum in the last two used FADC slice - signal extractor bad
-// BIT(14): kDeviatingNumPhes    :  The calculated number of photo-electrons deviates too much from the mean - inconsitency
+// BIT(14): kDeviatingNumPhes    :  The calculated number of photo-electrons deviates too much from the mean - inconsistency
+// BIT(15): kDeviatingFFactor    :  The calculated overall F-Factor deviates too much from the mean - inconsistency
+// BIT(16): kConversionHiLoNotValid: The calibrated Conversion between Hi-Gain and Low Gain gives absurd results
 //
 // These bits can be called with the enum MBadPixelsPix::UncalibratedType_t in combination 
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 3838)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 3839)
@@ -28,20 +28,20 @@
     // All types are initialized to normal behaviour
     enum UncalibratedType_t {
-      kHiGainNotCalibrated      = BIT(1),
-      kLoGainNotCalibrated      = BIT(2), 
-      kHiGainNotFitted          = BIT(3),
-      kLoGainNotFitted          = BIT(4), 
-      kRelTimeNotFitted         = BIT(5),
-      kHiGainOscillating        = BIT(6),
-      kLoGainOscillating        = BIT(7),
-      kRelTimeOscillating       = BIT(8),
-      kLoGainSaturation         = BIT(9),
-      kChargeIsPedestal         = BIT(10),
-      kChargeErrNotValid        = BIT(11),
-      kChargeRelErrNotValid     = BIT(12),
-      kChargeSigmaNotValid      = BIT(13),
-      kMeanTimeInFirstBin       = BIT(14),
-      kMeanTimeInLast2Bins      = BIT(15), 
-      kDeviatingNumPhes         = BIT(16)
+      kHiGainNotFitted          = BIT(1),
+      kLoGainNotFitted          = BIT(2), 
+      kRelTimeNotFitted         = BIT(3),
+      kHiGainOscillating        = BIT(4),
+      kLoGainOscillating        = BIT(5),
+      kRelTimeOscillating       = BIT(6),
+      kLoGainSaturation         = BIT(7),
+      kChargeIsPedestal         = BIT(8 ),
+      kChargeErrNotValid        = BIT(9 ),
+      kChargeRelErrNotValid     = BIT(10),
+      kChargeSigmaNotValid      = BIT(11),
+      kMeanTimeInFirstBin       = BIT(12),
+      kMeanTimeInLast2Bins      = BIT(13), 
+      kDeviatingNumPhes         = BIT(14),
+      kDeviatingFFactor         = BIT(15),
+      kConversionHiLoNotValid   = BIT(16)
     };
     
@@ -66,21 +66,8 @@
     Bool_t IsLoGainBad() const { return IsUnsuitable  (kUnsuitableRun      )
 				     || IsUncalibrated(kLoGainSaturation   ) 
-				     || IsUncalibrated(kLoGainNotCalibrated) 
+				     || IsUncalibrated(kConversionHiLoNotValid) 
 				     || IsUncalibrated(kLoGainOscillating  ) ; }
     Bool_t IsHiGainBad() const { return IsUnsuitable  (kUnsuitableRun      )
-				     || IsUncalibrated(kHiGainNotCalibrated) 
   				     || IsUncalibrated(kHiGainOscillating  ) ; }
-
-    Bool_t IsCalibrationSignalOK() const  { return !( IsUncalibrated(kChargeIsPedestal    )
-					           || IsUncalibrated(kChargeErrNotValid   )
-					           || IsUncalibrated(kChargeRelErrNotValid)
-					           || IsUncalibrated(kChargeSigmaNotValid )
-					           || IsUncalibrated(kMeanTimeInFirstBin  )
- 					           || IsUncalibrated(kMeanTimeInLast2Bins )  );  }
-
-    Bool_t IsCalibrationResultOK() const  {  return  !IsUnsuitable(kUnsuitableRun) 
-					          &&  IsCalibrationSignalOK()
-                                                  && !IsHiGainBad()
-					          && !IsLoGainBad() ; }
 
     void Merge(const MBadPixelsPix &pix);
Index: trunk/MagicSoft/Mars/mcalib/MCalibrate.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3838)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrate.cc	(revision 3839)
@@ -293,5 +293,5 @@
             {
               MBadPixelsPix         &bad = (*fBadPixels)[pixidx];
-              if (!bad.IsCalibrationResultOK())
+              if (!bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
                 continue;
             }
Index: trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc	(revision 3838)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc	(revision 3839)
@@ -164,5 +164,5 @@
         {
           MBadPixelsPix          &bad = (*fBadPixels)[pixidx];
-          if (!bad.IsCalibrationResultOK())
+          if (!bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
             continue;
         }