Changeset 2048 for trunk/MagicSoft

Timestamp:

04/30/03 11:23:11 (22 years ago)

Author:

tonello

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCerPhotPix.cc (modified) (3 diffs)
• manalysis/MCerPhotPix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/04/30: Nadia Tonello
+
+   * manalysis/MCerPhotPix.[h,cc]:
+     - deleted Bool_t fIsUsed and substituted with 
+        the condition: fRing>0 in the functions
+        Bool_t IsPixelUsed() const{return fRing>0;}
+        void   SetPixelUsed()  { fRing = 1;}
+        void   SetPixelUnused(){ fRing = 0;}
+
 
  2003/04/29: Wolfgang Wittek

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

@@ -33 +33 @@
 //
 // Default constructor. The pixel is assumed as used and not a core pixel.
+// NT 29/04/2003: A pixel is considered used when fRing > 0.
 //
 MCerPhotPix::MCerPhotPix(Int_t pix, Float_t phot, Float_t errphot) :
-    fPixId(pix), fIsUsed(kTRUE), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot)
+    fPixId(pix), fRing(1), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot)
 {
 } 
@@ -47 +48 @@
 {
     fPixId   = pix;
-    fIsUsed  = kTRUE;
+    fRing    = 1;
     fPhot    = phot;
     fErrPhot = errphot;
@@ -59 +60 @@
 { 
     gLog << GetDescriptor() <<" Pixel: "<< fPixId;
-    gLog << (fIsUsed?"   Used ":" Unused ");
+    gLog << (fRing>0?"   Used ":" Unused ");
     gLog << (fIsCore?" Core ":"      ");
     gLog << "Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h

@@ -10 +10 @@
 private:
 
-    Int_t   fPixId;       // the pixel Id
+    Int_t   fPixId;        // the pixel Id
 
-    Bool_t  fIsUsed;      // the pixel is used for calculations --> kTRUE
-    Bool_t  fIsCore;      // the pixel is a Core pixel          --> kTRUE
+    UShort_t fRing;         // NT: number of analyzed rings around the core pixels
+    Bool_t   fIsCore;       // the pixel is a Core pixel          --> kTRUE
 
-    UShort_t fRing;       // NT: number of analyzed rings around the core pixels
-    Float_t fPhot;        // The number of Cerenkov photons
-    Float_t fErrPhot;     // the error of fPhot
+    Float_t  fPhot;        // The number of Cerenkov photons
+    Float_t  fErrPhot;     // the error of fPhot
 
     // FIXME: arrival time t, and it's error sigma t
@@ -31 +30 @@
     void    SetPixelContent(Int_t pix, Float_t phot, Float_t errphot);
 
-    Bool_t  IsPixelUsed() const      { return fIsUsed;   }
-    void    SetPixelUnused()         { fIsUsed = kFALSE; fRing=0; }
-    void    SetPixelUsed()           { fIsUsed = kTRUE;  fRing=1;  }
+    Bool_t  IsPixelUsed() const      { return fRing>0; }
+    void    SetPixelUnused()         { fRing=0; }
+    void    SetPixelUsed()           { fRing=1; }
 
-    void    SetRing(Short_t r)       { fRing = r; fIsUsed = (r>0); }
-
+    void    SetRing(UShort_t r)      { fRing = r;   }
     Short_t GetRing() const          { return fRing;}