Changeset 2849 for trunk/MagicSoft/Mars/mimage

Timestamp:

01/19/04 15:46:56 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

• MNewImagePar.cc (modified) (4 diffs)
• MNewImagePar.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -32 +32 @@
 // fLeakage2 ratio: (photons in the 2 outer rings of pixels) over fSize
 //
+// Version 2:
+// Added fNumSaturatedPixels: number of pixels in which at least one slice
+// of the low gain FADC was saturated.
+// 
 /////////////////////////////////////////////////////////////////////////////
 #include "MNewImagePar.h"
@@ -74 +78 @@
     fNumUsedPixels = -1;
     fNumCorePixels = -1;
+
+    fNumSaturatedPixels = -1;
 }
 
@@ -86 +92 @@
     fNumCorePixels = 0;
 
+    fNumSaturatedPixels = 0;
+
     const UInt_t npixevt = evt.GetNumPixels();
 
@@ -97 +105 @@
     {
         const MCerPhotPix &pix = evt[i];
+
+        if (pix.IsPixelSaturated())
+          fNumSaturatedPixels++;
+
         if (!pix.IsPixelUsed())
             continue;

trunk/MagicSoft/Mars/mimage/MNewImagePar.h

@@ -22 +22 @@
     Short_t fNumCorePixels; // number of core pixels
 
+    Short_t fNumSaturatedPixels; // number of saturated pixels
+
 public:
     MNewImagePar(const char *name=NULL, const char *title=NULL);
@@ -36 +38 @@
     Int_t GetNumCorePixels() const { return fNumCorePixels; }
 
+    Short_t GetNumSaturatedPixels() const { return fNumSaturatedPixels; }
+
     void Print(Option_t *opt=NULL) const;
 
@@ -41 +45 @@
               const MHillas &hillas);
 
-    ClassDef(MNewImagePar, 1) // Container to hold new image parameters
+    ClassDef(MNewImagePar, 2) // Container to hold new image parameters
 };