Changeset 3461 for trunk/MagicSoft/Mars/mbadpixels

Timestamp:

03/10/04 17:15:01 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbadpixels

Files:

• MBadPixelsCam.cc (modified) (3 diffs)
• MBadPixelsMerge.cc (modified) (1 diff)
• MBadPixelsPix.cc (modified) (2 diffs)
• MBadPixelsPix.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -73 +73 @@
 {
     fArray->ExpandCreate(i);
-    *fLog << endl << dbg << "INIT SIZE: " << i << endl;
 }
 
@@ -108 +107 @@
 MBadPixelsPix &MBadPixelsCam::operator[](Int_t i)
 {
-    *fLog << dbg << "A: " << GetSize() << ": " << i << " " << fArray->UncheckedAt(i) << endl;
     return *static_cast<MBadPixelsPix*>(fArray->UncheckedAt(i));
 }
@@ -118 +116 @@
 const MBadPixelsPix &MBadPixelsCam::operator[](Int_t i) const
 {
-    *fLog << dbg << "B: " << GetSize() << ": " << i << " " << fArray->UncheckedAt(i) << endl;
     return *static_cast<MBadPixelsPix*>(fArray->UncheckedAt(i));
 }

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsMerge.cc

@@ -92 +92 @@
 {
     MBadPixelsCam *cam = (MBadPixelsCam*)pList->FindCreateObj("MBadPixelsCam");
-    *fLog << endl << dbg << "MERGE: " << cam << endl;
     if (!cam)
         return kFALSE;

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc

@@ -37 +37 @@
 using namespace std;
 
-const Int_t MBadPixelsPix::fgRunMask=MBadPixelsPix::kUnsuitableRun;
+const Int_t MBadPixelsPix::fgRunMask =
+    MBadPixelsPix::kUnsuitableRun |
+    MBadPixelsPix::kUnreliableRun;
+
 // ------------------------------------------------------------------------
 //
@@ -43 +46 @@
 //
 MBadPixelsPix::MBadPixelsPix(const char* name, const char* title)
-    : fInfo(2)
+    : fInfo(5)
 {
     fName  = name  ? name  : "MBadPixelsPix";

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -19 +19 @@
 
     enum UnsuitableType_t {
-        kUnsuitableRun    = BIT(1),
-        kUnsuitableEvt    = BIT(2),
-        kUnreliableRun    = BIT(3)
+        kUnsuitableRun = BIT(1),
+        kUnsuitableEvt = BIT(2),
+        kUnreliableRun = BIT(3)
     };
+
+    static const Int_t fgRunMask; // All types which are not event wise determined
 
     // All types are initialized to normal behaviour
@@ -45 +47 @@
     };
     
-      
-    static const Int_t fgRunMask; // All types which are not event wise determined
-
     void Reset();
     void Clear(Option_t *o="");
@@ -56 +55 @@
 
     // Setter
-    void   SetUnsuitableRun(UnsuitableType_t typ=kUnsuitableRun) { fInfo[0] |=  typ; }
-    void   SetSuitableRun(UnsuitableType_t typ=kUnsuitableRun)   { fInfo[0] &= ~typ; }
+    void   SetUnsuitableRun() { fInfo[0] |=  kUnsuitableRun; }
+    void   SetSuitableRun()   { fInfo[0] &= ~kUnsuitableRun; }
 
-    void   SetUnsuitableEvt(UnsuitableType_t typ=kUnsuitableEvt) { fInfo[0] |=  typ; }
-    void   SetSuitableEvt(UnsuitableType_t typ=kUnsuitableEvt)   { fInfo[0] &= ~typ; }
+    void   SetUnsuitableEvt() { fInfo[0] |=  kUnsuitableEvt; }
+    void   SetSuitableEvt()   { fInfo[0] &= ~kUnsuitableEvt; }
 
-    void   SetUnreliableRun(UnsuitableType_t typ=kUnreliableRun) { fInfo[0] |=  typ; }
-    void   SetReliableRun(UnsuitableType_t typ=kUnreliableRun)   { fInfo[0] &= ~typ; }
+    void   SetUnreliableRun() { fInfo[0] |=  kUnreliableRun; }
+    void   SetReliableRun()   { fInfo[0] &= ~kUnreliableRun; }
 
     // Calibration
-    void SetHiGainSaturation         ( CalibrationType_t typ=kHiGainSaturation         )
-      { fInfo[1] |= typ; }
-    void SetLoGainSaturation         ( CalibrationType_t typ=kLoGainSaturation         )
-      { fInfo[1] |= typ; }
-    void SetCombinedMethodNotValid   ( CalibrationType_t typ=kCombinedMethodNotValid   )
-      { fInfo[1] |= typ; }
-    void SetPINDiodeMethodNotValid   ( CalibrationType_t typ=kPINDiodeMethodNotValid   )
-      { fInfo[1] |= typ; }
-    void SetFFactorMethodNotValid    ( CalibrationType_t typ=kFFactorMethodNotValid    )
-      { fInfo[1] |= typ; }
-    void SetBlindPixelMethodNotValid ( CalibrationType_t typ=kBlindPixelMethodNotValid )
-      { fInfo[1] |= typ; }
-    void SetMeanTimeInLastBin        ( CalibrationType_t typ=kMeanTimeInLastBin        )
-      { fInfo[1] |= typ; }
-    void SetMeanTimeInFirstBin       ( CalibrationType_t typ=kMeanTimeInFirstBin       )
-      { fInfo[1] |= typ; }
-    void SetLoGainOscillating        ( CalibrationType_t typ=kLoGainOscillating        )
-      { fInfo[1] |= typ; }
-    void SetHiGainOscillating        ( CalibrationType_t typ=kHiGainOscillating        )
-      { fInfo[1] |= typ; }
-    void SetConvHiLoNotValid         ( CalibrationType_t typ=kConvHiLoNotValid         )
-      { fInfo[1] |= typ; }
-    void SetChargeSigmaNotValid      ( CalibrationType_t typ=kChargeSigmaNotValid      )
-      { fInfo[1] |= typ; }
-    void SetChargeRelErrNotValid     ( CalibrationType_t typ=kChargeRelErrNotValid     )
-      { fInfo[1] |= typ; }
-    void SetChargeErrNotValid        ( CalibrationType_t typ=kChargeErrNotValid        )
-      { fInfo[1] |= typ; }
-    void SetChargeIsPedestal         ( CalibrationType_t typ=kChargeIsPedestal         )
-      { fInfo[1] |= typ; }
-    void SetLoGainNotFitted          ( CalibrationType_t typ=kLoGainNotFitted          )
-      { fInfo[1] |= typ; }
-    void SetHiGainNotFitted          ( CalibrationType_t typ=kHiGainNotFitted          )
-      { fInfo[1] |= typ; }
+    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 SetMeanTimeInLastBin        () { fInfo[1] |= kMeanTimeInLastBin; }
+    void SetMeanTimeInFirstBin       () { fInfo[1] |= kMeanTimeInFirstBin; }
+    void SetLoGainOscillating        () { fInfo[1] |= kLoGainOscillating; }
+    void SetHiGainOscillating        () { fInfo[1] |= kHiGainOscillating; }
+    void SetConvHiLoNotValid         () { fInfo[1] |= kConvHiLoNotValid; }
+    void SetChargeSigmaNotValid      () { fInfo[1] |= kChargeSigmaNotValid; }
+    void SetChargeRelErrNotValid     () { fInfo[1] |= kChargeRelErrNotValid; }
+    void SetChargeErrNotValid        () { fInfo[1] |= kChargeErrNotValid; }
+    void SetChargeIsPedestal         () { fInfo[1] |= kChargeIsPedestal; }
+    void SetLoGainNotFitted          () { fInfo[1] |= kLoGainNotFitted; }
+    void SetHiGainNotFitted          () { fInfo[1] |= kHiGainNotFitted; }
 
     // Getter
-    Bool_t IsUnsuitableRun(UnsuitableType_t typ=kUnsuitableRun) const { return   fInfo[0]&typ; }
-    Bool_t IsSuitableRun(UnsuitableType_t typ=kUnsuitableRun) const   { return !(fInfo[0]&typ); }
+    Bool_t IsUnsuitableRun() const { return   fInfo[0]&kUnsuitableRun; }
+    Bool_t IsSuitableRun() const   { return !(fInfo[0]&kUnsuitableRun); }
 
-    Bool_t IsUnsuitableEvt(UnsuitableType_t typ=kUnsuitableEvt) const { return   fInfo[0]&typ; }
-    Bool_t IsSuitableEvt(UnsuitableType_t typ=kUnsuitableEvt) const   { return !(fInfo[0]&typ); }
+    Bool_t IsUnsuitableEvt() const { return   fInfo[0]&kUnsuitableEvt; }
+    Bool_t IsSuitableEvt() const   { return !(fInfo[0]&kUnsuitableEvt); }
 
-    Bool_t IsUnreliableRun(UnsuitableType_t typ=kUnreliableRun) const { return   fInfo[0]&typ; }
-    Bool_t IsReliableRun(UnsuitableType_t typ=kUnreliableRun) const   { return !(fInfo[0]&typ); }
+    Bool_t IsUnreliableRun() const { return   fInfo[0]&kUnreliableRun; }
+    Bool_t IsReliableRun() const   { return !(fInfo[0]&kUnreliableRun); }
 
     Bool_t IsOK() const  { return fInfo[0]==0; }