Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 3442)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 3443)
@@ -107,44 +107,25 @@
     Bool_t IsBad() const { return fInfo[0]!=0; }
 
-    Bool_t IsHiGainSaturation         () const
-      { return !((fInfo[1] | ~kHiGainSaturation)         == ~kHiGainSaturation );         }
-    Bool_t IsLoGainSaturation         () const
-      { return !((fInfo[1] | ~kLoGainSaturation)         == ~kLoGainSaturation );         }
-    Bool_t IsCombinedMethodNotValid   () const
-      { return !((fInfo[1] | ~kCombinedMethodNotValid)   == ~kCombinedMethodNotValid );   }
-    Bool_t IsPINDiodeMethodNotValid   () const
-      { return !((fInfo[1] | ~kPINDiodeMethodNotValid)   == ~kPINDiodeMethodNotValid );   }
-    Bool_t IsFFactorMethodNotValid    () const
-      { return !((fInfo[1] | ~kFFactorMethodNotValid)    == ~kFFactorMethodNotValid );    }
-    Bool_t IsBlindPixelMethodNotValid () const
-      { return !((fInfo[1] | ~kBlindPixelMethodNotValid) == ~kBlindPixelMethodNotValid ); }
-    Bool_t IsMeanTimeInLastBin        () const
-      { return !((fInfo[1] | ~kMeanTimeInLastBin)        == ~kMeanTimeInLastBin );        }
-    Bool_t IsMeanTimeInFirstBin       () const
-      { return !((fInfo[1] | ~kMeanTimeInFirstBin)       == ~kMeanTimeInFirstBin );       }
-    Bool_t IsLoGainOscillating        () const
-      { return !((fInfo[1] | ~kLoGainOscillating)        == ~kLoGainOscillating );        }
-    Bool_t IsHiGainOscillating        () const
-      { return !((fInfo[1] | ~kHiGainOscillating)        == ~kHiGainOscillating );        }
-    Bool_t IsConvHiLoNotValid         () const
-      { return !((fInfo[1] | ~kConvHiLoNotValid)         == ~kConvHiLoNotValid );         }
-    Bool_t IsChargeSigmaNotValid      () const
-      { return !((fInfo[1] | ~kChargeSigmaNotValid)      == ~kChargeSigmaNotValid );      }
-    Bool_t IsChargeRelErrNotValid     () const
-      { return !((fInfo[1] | ~kChargeRelErrNotValid)     == ~kChargeRelErrNotValid );     }
-    Bool_t IsChargeErrNotValid        () const
-      { return !((fInfo[1] | ~kChargeErrNotValid)        == ~kChargeErrNotValid );        }
-    Bool_t IsChargeIsPedestal         () const
-      { return !((fInfo[1] | ~kChargeIsPedestal)         == ~kChargeIsPedestal );         }
-    Bool_t IsLoGainNotFitted          () const
-      { return !((fInfo[1] | ~kLoGainNotFitted)          == ~kLoGainNotFitted );          }
-    Bool_t IsHiGainNotFitted          () const
-      { return !((fInfo[1] | ~kHiGainNotFitted)          == ~kHiGainNotFitted );          }
+    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 IsMeanTimeInLastBin        () const      { return fInfo[1] & kMeanTimeInLastBin;        }
+    Bool_t IsMeanTimeInFirstBin       () const      { return fInfo[1] & kMeanTimeInFirstBin;       }
+    Bool_t IsLoGainOscillating        () const      { return fInfo[1] & kLoGainOscillating;        }
+    Bool_t IsHiGainOscillating        () const      { return fInfo[1] & kHiGainOscillating;        }
+    Bool_t IsConvHiLoNotValid         () const      { return fInfo[1] & kConvHiLoNotValid;         }
+    Bool_t IsChargeSigmaNotValid      () const      { return fInfo[1] & kChargeSigmaNotValid;      }
+    Bool_t IsChargeRelErrNotValid     () const      { return fInfo[1] & kChargeRelErrNotValid;     }
+    Bool_t IsChargeErrNotValid        () const      { return fInfo[1] & kChargeErrNotValid;        }
+    Bool_t IsChargeIsPedestal         () const      { return fInfo[1] & kChargeIsPedestal;         }
+    Bool_t IsLoGainNotFitted          () const      { return fInfo[1] & kLoGainNotFitted;          }
+    Bool_t IsHiGainNotFitted          () const      { return fInfo[1] & kHiGainNotFitted;          }
 
-    Bool_t IsLoGainBad() const { return IsLoGainSaturation()
-                                   || IsConvHiLoNotValid()
-                                   || IsLoGainOscillating() ;}    
-    Bool_t IsHiGainBad() const { return ( IsHiGainSaturation() && IsConvHiLoNotValid() 
-                                          || IsHiGainOscillating() ); }
+    Bool_t IsLoGainBad() const { return IsLoGainSaturation() || IsConvHiLoNotValid() || IsLoGainOscillating() ;}
+    Bool_t IsHiGainBad() const { return (IsHiGainSaturation() && IsConvHiLoNotValid()) || IsHiGainOscillating(); }
+
     Bool_t IsCalibrationSignalOK() const  { return !( IsChargeIsPedestal()
                                                       || IsChargeErrNotValid()
@@ -153,21 +134,13 @@
                                                       || IsMeanTimeInFirstBin()
                                                       || IsMeanTimeInLastBin() );  }
-    Bool_t IsCalibrationFitOK() const    { return !( (IsHiGainSaturation() && IsHiGainNotFitted())
-                                                     || ( IsLoGainSaturation() && IsLoGainNotFitted()) ); }
+    Bool_t IsCalibrationFitOK()       const    { return !( (!IsHiGainSaturation() && IsHiGainNotFitted())
+                                                      || ( IsHiGainSaturation() && IsLoGainNotFitted()) ); }
     Bool_t IsCalibrationOscillating() const  { return ( !IsHiGainSaturation() && IsHiGainOscillating()) 
-                                                 || ( IsHiGainSaturation() && IsLoGainOscillating()) ; }
-    Bool_t IsCalibrationResultOK() const  {  return IsCalibrationSignalOK()
-                                               && !(IsCalibrationOscillating())
-                                               && IsCalibrationFitOK()
-                                               && ( (!IsHiGainSaturation() && !IsHiGainBad())
-                                                    || (IsHiGainSaturation() && !IsLoGainBad()) ) ;}
-    Bool_t IsCalibrationFFactorMethodOK() const  { return IsCalibrationResultOK()
-                                                     && !IsFFactorMethodNotValid() ; }
-    Bool_t IsCalibrationBlindPixelMethodOK() const  { return IsCalibrationResultOK()
-                                                        && !IsBlindPixelMethodNotValid(); }
-    Bool_t IsCalibrationPINDiodeMethodOK() const  { return IsCalibrationResultOK()
-                                                      && !IsPINDiodeMethodNotValid() ; }
-    Bool_t IsCalibrationCombinedMethodOK() const  { return IsCalibrationResultOK()
-                                                      && !IsCombinedMethodNotValid(); }
+                                                  || ( IsHiGainSaturation() && IsLoGainOscillating()) ; }
+    Bool_t IsCalibrationResultOK()    const  {  return IsCalibrationSignalOK()
+                                                  && !IsCalibrationOscillating()
+                                                  && IsCalibrationFitOK()
+                                                  && (   (!IsHiGainSaturation() && !IsHiGainBad())
+                                                       || (IsHiGainSaturation() && !IsLoGainBad()) ) ;}
 
     void Merge(const MBadPixelsPix &pix);