Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 3465)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 3469)
@@ -41,8 +41,5 @@
       kMeanTimeInFirstBin       = BIT(12),
       kMeanTimeInLastBin        = BIT(13), 
-      kBlindPixelMethodNotValid = BIT(14),
-      kFFactorMethodNotValid    = BIT(15), 
-      kPINDiodeMethodNotValid   = BIT(16),
-      kCombinedMethodNotValid   = BIT(17)
+      kNotCalibrated            = BIT(14)   
     };
     
@@ -67,8 +64,5 @@
     void SetHiGainSaturation         () { fInfo[1] |= kHiGainSaturation; }
     void SetLoGainSaturation         () { fInfo[1] |= kLoGainSaturation; }
-    void SetCombinedMethodNotValid   () { fInfo[1] |= kCombinedMethodNotValid; }
-    void SetPINDiodeMethodNotValid   () { fInfo[1] |= kPINDiodeMethodNotValid; }
-    void SetFFactorMethodNotValid    () { fInfo[1] |= kFFactorMethodNotValid; }
-    void SetBlindPixelMethodNotValid () { fInfo[1] |= kBlindPixelMethodNotValid; }
+    void SetNotCalibrated           () { fInfo[1] |= kNotCalibrated; }
     void SetMeanTimeInLastBin        () { fInfo[1] |= kMeanTimeInLastBin; }
     void SetMeanTimeInFirstBin       () { fInfo[1] |= kMeanTimeInFirstBin; }
@@ -98,8 +92,5 @@
     Bool_t IsHiGainSaturation         () const      { return fInfo[1] & kHiGainSaturation ;        }
     Bool_t IsLoGainSaturation         () const      { return fInfo[1] & kLoGainSaturation ;        }
-    Bool_t IsCombinedMethodNotValid   () const      { return fInfo[1] & kCombinedMethodNotValid;   }
-    Bool_t IsPINDiodeMethodNotValid   () const      { return fInfo[1] & kPINDiodeMethodNotValid;   }
-    Bool_t IsFFactorMethodNotValid    () const      { return fInfo[1] & kFFactorMethodNotValid;    }
-    Bool_t IsBlindPixelMethodNotValid () const      { return fInfo[1] & kBlindPixelMethodNotValid; }
+    Bool_t IsNotCalibrated            () const      { return fInfo[1] & kNotCalibrated;            }
     Bool_t IsMeanTimeInLastBin        () const      { return fInfo[1] & kMeanTimeInLastBin;        }
     Bool_t IsMeanTimeInFirstBin       () const      { return fInfo[1] & kMeanTimeInFirstBin;       }