Changeset 3466 for trunk/MagicSoft/Mars/mimage

Timestamp:

03/10/04 20:23:56 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mimage

Files:

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

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -37 +37 @@
 // ----------
 //  - added fNumSaturatedPixels
+// 
+// Version 3:
+// ----------
+//  - added fNumHGSaturatedPixels
 // 
 /////////////////////////////////////////////////////////////////////////////
@@ -82 +86 @@
 
     fNumSaturatedPixels = -1;
+    fNumHGSaturatedPixels = -1;
 }
 
@@ -95 +100 @@
 
     fNumSaturatedPixels = 0;
+    fNumHGSaturatedPixels = 0;
 
     const UInt_t npixevt = evt.GetNumPixels();
@@ -109 +115 @@
 
         // count saturated pixels
+        if (pix.IsPixelHGSaturated())
+            fNumHGSaturatedPixels++;
         if (pix.IsPixelSaturated())
             fNumSaturatedPixels++;
@@ -175 +183 @@
     *fLog << " - Used Pixels    [#]   = " << fNumUsedPixels << " Pixels" << endl;
     *fLog << " - Core Pixels    [#]   = " << fNumCorePixels << " Pixels" << endl;
-    *fLog << " - Sat. Pixels    [#]   = " << fNumSaturatedPixels << " Pixels" << endl;
+    *fLog << " - Sat. Pixels (HG) [#]  = " << fNumHGSaturatedPixels << " Pixels" << endl;
+    *fLog << " - Sat. Pixels (LG) [#]  = " << fNumSaturatedPixels << " Pixels" << endl;
 }

trunk/MagicSoft/Mars/mimage/MNewImagePar.h

@@ -21 +21 @@
     Short_t fNumUsedPixels;      // Number of pixels which survived the image cleaning
     Short_t fNumCorePixels;      // number of core pixels
-    Short_t fNumSaturatedPixels; // number of pixels with saturating lo-gains
+    Short_t fNumHGSaturatedPixels; // number of pixels with saturating hi-gains
+    Short_t fNumSaturatedPixels;   // number of pixels with saturating lo-gains
 
 public:
@@ -38 +39 @@
 
     Short_t GetNumSaturatedPixels() const { return fNumSaturatedPixels; }
+    Short_t GetNumHGSaturatedPixels() const { return fNumHGSaturatedPixels; }
 
     void Print(Option_t *opt=NULL) const;
@@ -44 +46 @@
               const MHillas &hillas);
 
-    ClassDef(MNewImagePar, 2) // Container to hold new image parameters
+    ClassDef(MNewImagePar, 3) // Container to hold new image parameters
 };