Changeset 3461


Ignore:
Timestamp:
03/10/04 17:15:01 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3459 r3461  
    4040     - many enhancements
    4141     - many speed improvements
     42
     43   * mbadpixels/MBadPixelsPix.[h,cc]:
     44     - fixed
    4245
    4346

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

    r3460 r3461  
    7373{
    7474    fArray->ExpandCreate(i);
    75     *fLog << endl << dbg << "INIT SIZE: " << i << endl;
    7675}
    7776
    … …  
    108107MBadPixelsPix &MBadPixelsCam::operator[](Int_t i)
    109108{
    110     *fLog << dbg << "A: " << GetSize() << ": " << i << " " << fArray->UncheckedAt(i) << endl;
    111109    return *static_cast<MBadPixelsPix*>(fArray->UncheckedAt(i));
    112110}
    … …  
    118116const MBadPixelsPix &MBadPixelsCam::operator[](Int_t i) const
    119117{
    120     *fLog << dbg << "B: " << GetSize() << ": " << i << " " << fArray->UncheckedAt(i) << endl;
    121118    return *static_cast<MBadPixelsPix*>(fArray->UncheckedAt(i));
    122119}

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsMerge.cc

    r3460 r3461  
    9292{
    9393    MBadPixelsCam *cam = (MBadPixelsCam*)pList->FindCreateObj("MBadPixelsCam");
    94     *fLog << endl << dbg << "MERGE: " << cam << endl;
    9594    if (!cam)
    9695        return kFALSE;

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc

    r3449 r3461  
    3737using namespace std;
    3838
    39 const Int_t MBadPixelsPix::fgRunMask=MBadPixelsPix::kUnsuitableRun;
     39const Int_t MBadPixelsPix::fgRunMask =
     40    MBadPixelsPix::kUnsuitableRun |
     41    MBadPixelsPix::kUnreliableRun;
     42
    4043// ------------------------------------------------------------------------
    4144//
    … …  
    4346//
    4447MBadPixelsPix::MBadPixelsPix(const char* name, const char* title)
    45     : fInfo(2)
     48    : fInfo(5)
    4649{
    4750    fName  = name  ? name  : "MBadPixelsPix";

  • trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

    r3449 r3461  
    1919
    2020    enum UnsuitableType_t {
    21         kUnsuitableRun    = BIT(1),
    22         kUnsuitableEvt    = BIT(2),
    23         kUnreliableRun    = BIT(3)
     21        kUnsuitableRun = BIT(1),
     22        kUnsuitableEvt = BIT(2),
     23        kUnreliableRun = BIT(3)
    2424    };
     25
     26    static const Int_t fgRunMask; // All types which are not event wise determined
    2527
    2628    // All types are initialized to normal behaviour
    … …  
    4547    };
    4648   
    47      
    48     static const Int_t fgRunMask; // All types which are not event wise determined
    49 
    5049    void Reset();
    5150    void Clear(Option_t *o="");
    … …  
    5655
    5756    // Setter
    58     void   SetUnsuitableRun(UnsuitableType_t typ=kUnsuitableRun) { fInfo[0] |=  typ; }
    59     void   SetSuitableRun(UnsuitableType_t typ=kUnsuitableRun)   { fInfo[0] &= ~typ; }
     57    void   SetUnsuitableRun() { fInfo[0] |=  kUnsuitableRun; }
     58    void   SetSuitableRun()   { fInfo[0] &= ~kUnsuitableRun; }
    6059
    61     void   SetUnsuitableEvt(UnsuitableType_t typ=kUnsuitableEvt) { fInfo[0] |=  typ; }
    62     void   SetSuitableEvt(UnsuitableType_t typ=kUnsuitableEvt)   { fInfo[0] &= ~typ; }
     60    void   SetUnsuitableEvt() { fInfo[0] |=  kUnsuitableEvt; }
     61    void   SetSuitableEvt()   { fInfo[0] &= ~kUnsuitableEvt; }
    6362
    64     void   SetUnreliableRun(UnsuitableType_t typ=kUnreliableRun) { fInfo[0] |=  typ; }
    65     void   SetReliableRun(UnsuitableType_t typ=kUnreliableRun)   { fInfo[0] &= ~typ; }
     63    void   SetUnreliableRun() { fInfo[0] |=  kUnreliableRun; }
     64    void   SetReliableRun()   { fInfo[0] &= ~kUnreliableRun; }
    6665
    6766    // Calibration
    68     void SetHiGainSaturation         ( CalibrationType_t typ=kHiGainSaturation         )
    69       { fInfo[1] |= typ; }
    70     void SetLoGainSaturation         ( CalibrationType_t typ=kLoGainSaturation         )
    71       { fInfo[1] |= typ; }
    72     void SetCombinedMethodNotValid   ( CalibrationType_t typ=kCombinedMethodNotValid   )
    73       { fInfo[1] |= typ; }
    74     void SetPINDiodeMethodNotValid   ( CalibrationType_t typ=kPINDiodeMethodNotValid   )
    75       { fInfo[1] |= typ; }
    76     void SetFFactorMethodNotValid    ( CalibrationType_t typ=kFFactorMethodNotValid    )
    77       { fInfo[1] |= typ; }
    78     void SetBlindPixelMethodNotValid ( CalibrationType_t typ=kBlindPixelMethodNotValid )
    79       { fInfo[1] |= typ; }
    80     void SetMeanTimeInLastBin        ( CalibrationType_t typ=kMeanTimeInLastBin        )
    81       { fInfo[1] |= typ; }
    82     void SetMeanTimeInFirstBin       ( CalibrationType_t typ=kMeanTimeInFirstBin       )
    83       { fInfo[1] |= typ; }
    84     void SetLoGainOscillating        ( CalibrationType_t typ=kLoGainOscillating        )
    85       { fInfo[1] |= typ; }
    86     void SetHiGainOscillating        ( CalibrationType_t typ=kHiGainOscillating        )
    87       { fInfo[1] |= typ; }
    88     void SetConvHiLoNotValid         ( CalibrationType_t typ=kConvHiLoNotValid         )
    89       { fInfo[1] |= typ; }
    90     void SetChargeSigmaNotValid      ( CalibrationType_t typ=kChargeSigmaNotValid      )
    91       { fInfo[1] |= typ; }
    92     void SetChargeRelErrNotValid     ( CalibrationType_t typ=kChargeRelErrNotValid     )
    93       { fInfo[1] |= typ; }
    94     void SetChargeErrNotValid        ( CalibrationType_t typ=kChargeErrNotValid        )
    95       { fInfo[1] |= typ; }
    96     void SetChargeIsPedestal         ( CalibrationType_t typ=kChargeIsPedestal         )
    97       { fInfo[1] |= typ; }
    98     void SetLoGainNotFitted          ( CalibrationType_t typ=kLoGainNotFitted          )
    99       { fInfo[1] |= typ; }
    100     void SetHiGainNotFitted          ( CalibrationType_t typ=kHiGainNotFitted          )
    101       { fInfo[1] |= typ; }
     67    void SetHiGainSaturation         () { fInfo[1] |= kHiGainSaturation; }
     68    void SetLoGainSaturation         () { fInfo[1] |= kLoGainSaturation; }
     69    void SetCombinedMethodNotValid   () { fInfo[1] |= kCombinedMethodNotValid; }
     70    void SetPINDiodeMethodNotValid   () { fInfo[1] |= kPINDiodeMethodNotValid; }
     71    void SetFFactorMethodNotValid    () { fInfo[1] |= kFFactorMethodNotValid; }
     72    void SetBlindPixelMethodNotValid () { fInfo[1] |= kBlindPixelMethodNotValid; }
     73    void SetMeanTimeInLastBin        () { fInfo[1] |= kMeanTimeInLastBin; }
     74    void SetMeanTimeInFirstBin       () { fInfo[1] |= kMeanTimeInFirstBin; }
     75    void SetLoGainOscillating        () { fInfo[1] |= kLoGainOscillating; }
     76    void SetHiGainOscillating        () { fInfo[1] |= kHiGainOscillating; }
     77    void SetConvHiLoNotValid         () { fInfo[1] |= kConvHiLoNotValid; }
     78    void SetChargeSigmaNotValid      () { fInfo[1] |= kChargeSigmaNotValid; }
     79    void SetChargeRelErrNotValid     () { fInfo[1] |= kChargeRelErrNotValid; }
     80    void SetChargeErrNotValid        () { fInfo[1] |= kChargeErrNotValid; }
     81    void SetChargeIsPedestal         () { fInfo[1] |= kChargeIsPedestal; }
     82    void SetLoGainNotFitted          () { fInfo[1] |= kLoGainNotFitted; }
     83    void SetHiGainNotFitted          () { fInfo[1] |= kHiGainNotFitted; }
    10284
    10385    // Getter
    104     Bool_t IsUnsuitableRun(UnsuitableType_t typ=kUnsuitableRun) const { return   fInfo[0]&typ; }
    105     Bool_t IsSuitableRun(UnsuitableType_t typ=kUnsuitableRun) const   { return !(fInfo[0]&typ); }
     86    Bool_t IsUnsuitableRun() const { return   fInfo[0]&kUnsuitableRun; }
     87    Bool_t IsSuitableRun() const   { return !(fInfo[0]&kUnsuitableRun); }
    10688
    107     Bool_t IsUnsuitableEvt(UnsuitableType_t typ=kUnsuitableEvt) const { return   fInfo[0]&typ; }
    108     Bool_t IsSuitableEvt(UnsuitableType_t typ=kUnsuitableEvt) const   { return !(fInfo[0]&typ); }
     89    Bool_t IsUnsuitableEvt() const { return   fInfo[0]&kUnsuitableEvt; }
     90    Bool_t IsSuitableEvt() const   { return !(fInfo[0]&kUnsuitableEvt); }
    10991
    110     Bool_t IsUnreliableRun(UnsuitableType_t typ=kUnreliableRun) const { return   fInfo[0]&typ; }
    111     Bool_t IsReliableRun(UnsuitableType_t typ=kUnreliableRun) const   { return !(fInfo[0]&typ); }
     92    Bool_t IsUnreliableRun() const { return   fInfo[0]&kUnreliableRun; }
     93    Bool_t IsReliableRun() const   { return !(fInfo[0]&kUnreliableRun); }
    11294
    11395    Bool_t IsOK() const  { return fInfo[0]==0; }
Note: See TracChangeset for help on using the changeset viewer.