Changeset 6034 for trunk

Timestamp:

01/27/05 10:05:51 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -58 +58 @@
      - trying to get rid of the Err_%p workaround.
 
-   * manalysis/MCerPhotEvt.h:
+   * manalysis/MCerPhotEvt.[h,cc]:
      - added some '!' signs in the comment line. This is quick hack
        to gain I/O speed and storage space. We will soon have new
        containers for the calibrated data and image cleaning
        information.
+     - changed version number to 6
 
 

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

@@ -48 +48 @@
 // ----------
 //  - added fIdxIsland
+//
+// Version 6:
+// ----------
+//  - put the '!' into the comment line for
+//      Bool_t   fIsCore;        //! the pixel is a Core pixel -> kTRUE
+//      Short_t  fRing;          //! NT: number of analyzed rings around the core pixels, fRing>0 means: used, fRing= 0 means: unused, fRing= -1 means: unmapped (no possible to use in the calculation of the image parameters)
+//      Short_t  fIdxIsland;     //! the pixel is a Core pixel -> kTRUE
+//      Bool_t   fIsHGSaturated; //! the pixel's high gain is saturated
+//    This is a queick hack to gain storage space - the structure of
+//    the container for calibrated data will change soon.
 //
 ////////////////////////////////////////////////////////////////////////////

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h

@@ -5 +5 @@
 #include "MParContainer.h"
 #endif
+#ifndef MARS_MMath
 #include "MMath.h"
+#endif
+
 class MCerPhotPix : public MParContainer
 {
 private:
 
-    Int_t    fPixId;     // the pixel Id
+    Int_t    fPixId;         // the pixel Id
 
-    Bool_t   fIsCore;     // the pixel is a Core pixel -> kTRUE
-    Short_t  fRing;       // NT: number of analyzed rings around the core pixels, fRing>0 means: used, fRing= 0 means: unused, fRing= -1 means: unmapped (no possible to use in the calculation of the image parameters)
-    Short_t  fIdxIsland;  // the pixel is a Core pixel -> kTRUE
+    Bool_t   fIsCore;        //! the pixel is a Core pixel -> kTRUE
+    Short_t  fRing;          //! NT: number of analyzed rings around the core pixels, fRing>0 means: used, fRing= 0 means: unused, fRing= -1 means: unmapped (no possible to use in the calculation of the image parameters)
+    Short_t  fIdxIsland;     //! the pixel is a Core pixel -> kTRUE
 
-    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
 
     Bool_t   fIsSaturated;   // the pixel's low gain is saturated
-    Bool_t   fIsHGSaturated; // the pixel's high gain is saturated
+    Bool_t   fIsHGSaturated; //! the pixel's high gain is saturated
 
     // FIXME: arrival time t, and it's error sigma t
@@ -63 +66 @@
     Bool_t  IsSortable() const { return kTRUE; }
 
-    ClassDef(MCerPhotPix, 5)  // class containing information about the Cerenkov Photons in a pixel
+    ClassDef(MCerPhotPix, 6)  // class containing information about the Cerenkov Photons in a pixel
 };
 
 #endif
-
-
-