Changeset 2048 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
04/30/03 11:23:11 (22 years ago)
Author:
tonello
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r2045 r2048  
    11                                                 -*-*- END OF LINE -*-*-
     2
     3 2003/04/30: Nadia Tonello
     4
     5   * manalysis/MCerPhotPix.[h,cc]:
     6     - deleted Bool_t fIsUsed and substituted with
     7        the condition: fRing>0 in the functions
     8        Bool_t IsPixelUsed() const{return fRing>0;}
     9        void   SetPixelUsed()  { fRing = 1;}
     10        void   SetPixelUnused(){ fRing = 0;}
     11
    212
    313 2003/04/29: Wolfgang Wittek
  • trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

    r1527 r2048  
    3333//
    3434// Default constructor. The pixel is assumed as used and not a core pixel.
     35// NT 29/04/2003: A pixel is considered used when fRing > 0.
    3536//
    3637MCerPhotPix::MCerPhotPix(Int_t pix, Float_t phot, Float_t errphot) :
    37     fPixId(pix), fIsUsed(kTRUE), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot)
     38    fPixId(pix), fRing(1), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot)
    3839{
    3940}
     
    4748{
    4849    fPixId   = pix;
    49     fIsUsed  = kTRUE;
     50    fRing    = 1;
    5051    fPhot    = phot;
    5152    fErrPhot = errphot;
     
    5960{
    6061    gLog << GetDescriptor() <<" Pixel: "<< fPixId;
    61     gLog << (fIsUsed?"   Used ":" Unused ");
     62    gLog << (fRing>0?"   Used ":" Unused ");
    6263    gLog << (fIsCore?" Core ":"      ");
    6364    gLog << "Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl;
    6465}
    6566
     67
     68
     69
     70
     71
     72
     73
     74
     75
     76
     77
     78
     79
     80
  • trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h

    r1965 r2048  
    1010private:
    1111
    12     Int_t   fPixId;       // the pixel Id
     12    Int_t   fPixId;        // the pixel Id
    1313
    14     Bool_t  fIsUsed;      // the pixel is used for calculations --> kTRUE
    15     Bool_t  fIsCore;      // the pixel is a Core pixel          --> kTRUE
     14    UShort_t fRing;         // NT: number of analyzed rings around the core pixels
     15    Bool_t   fIsCore;       // the pixel is a Core pixel          --> kTRUE
    1616
    17     UShort_t fRing;       // NT: number of analyzed rings around the core pixels
    18     Float_t fPhot;        // The number of Cerenkov photons
    19     Float_t fErrPhot;     // the error of fPhot
     17    Float_t  fPhot;        // The number of Cerenkov photons
     18    Float_t  fErrPhot;     // the error of fPhot
    2019
    2120    // FIXME: arrival time t, and it's error sigma t
     
    3130    void    SetPixelContent(Int_t pix, Float_t phot, Float_t errphot);
    3231
    33     Bool_t  IsPixelUsed() const      { return fIsUsed;  }
    34     void    SetPixelUnused()         { fIsUsed = kFALSE; fRing=0; }
    35     void    SetPixelUsed()           { fIsUsed = kTRUE;  fRing=1; }
     32    Bool_t  IsPixelUsed() const      { return fRing>0; }
     33    void    SetPixelUnused()         { fRing=0; }
     34    void    SetPixelUsed()           { fRing=1; }
    3635
    37     void    SetRing(Short_t r)       { fRing = r; fIsUsed = (r>0); }
    38 
     36    void    SetRing(UShort_t r)      { fRing = r;   }
    3937    Short_t GetRing() const          { return fRing;}
    4038
Note: See TracChangeset for help on using the changeset viewer.