Changeset 2048 for trunk/MagicSoft/Mars
- Timestamp:
- 04/30/03 11:23:11 (22 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r2045 r2048 1 1 -*-*- 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 2 12 3 13 2003/04/29: Wolfgang Wittek -
trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc
r1527 r2048 33 33 // 34 34 // 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. 35 36 // 36 37 MCerPhotPix::MCerPhotPix(Int_t pix, Float_t phot, Float_t errphot) : 37 fPixId(pix), f IsUsed(kTRUE), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot)38 fPixId(pix), fRing(1), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot) 38 39 { 39 40 } … … 47 48 { 48 49 fPixId = pix; 49 f IsUsed = kTRUE;50 fRing = 1; 50 51 fPhot = phot; 51 52 fErrPhot = errphot; … … 59 60 { 60 61 gLog << GetDescriptor() <<" Pixel: "<< fPixId; 61 gLog << (f IsUsed?" Used ":" Unused ");62 gLog << (fRing>0?" Used ":" Unused "); 62 63 gLog << (fIsCore?" Core ":" "); 63 64 gLog << "Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl; 64 65 } 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 -
trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h
r1965 r2048 10 10 private: 11 11 12 Int_t fPixId; // the pixel Id12 Int_t fPixId; // the pixel Id 13 13 14 Bool_t fIsUsed; // the pixel is used for calculations --> kTRUE15 Bool_t fIsCore;// the pixel is a Core pixel --> kTRUE14 UShort_t fRing; // NT: number of analyzed rings around the core pixels 15 Bool_t fIsCore; // the pixel is a Core pixel --> kTRUE 16 16 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 20 19 21 20 // FIXME: arrival time t, and it's error sigma t … … 31 30 void SetPixelContent(Int_t pix, Float_t phot, Float_t errphot); 32 31 33 Bool_t IsPixelUsed() const { return f IsUsed;}34 void SetPixelUnused() { f IsUsed = kFALSE; fRing=0; }35 void SetPixelUsed() { f IsUsed = kTRUE; fRing=1;}32 Bool_t IsPixelUsed() const { return fRing>0; } 33 void SetPixelUnused() { fRing=0; } 34 void SetPixelUsed() { fRing=1; } 36 35 37 void SetRing(Short_t r) { fRing = r; fIsUsed = (r>0); } 38 36 void SetRing(UShort_t r) { fRing = r; } 39 37 Short_t GetRing() const { return fRing;} 40 38
Note:
See TracChangeset
for help on using the changeset viewer.