Changeset 2849 for trunk/MagicSoft/Mars

Timestamp:

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

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCerPhotPix.cc (modified) (3 diffs)
• manalysis/MCerPhotPix.h (modified) (3 diffs)
• mcalib/MCalibrate.cc (modified) (2 diffs)
• mimage/MNewImagePar.cc (modified) (4 diffs)
• mimage/MNewImagePar.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/01/19: Abelardo Moralejo
+
+   * manalysis/MCerPhotPix.[h,cc]
+     - Added fIsSaturated to flag whether low gain of the pixel is
+       saturated. Added corresponding getter and setter functions.
+       Updated ClassDef to version 2.
+
+   * mcalib/MCalibrate.cc
+     - Set the new saturation flag of MCerPhotPix to kTRUE if at least 
+       one low gain FADC slice is saturated.
+
+   * mimage/MNewImagePar.[h,cc]
+     - Added new member variable fNumSaturatedPixels to count how many
+       pixels were saturated. Updated ClassDef to version 2.
+
 
  2004/01/19: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

@@ -23 +23 @@
 !
 \* ======================================================================== */
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// MCerPhotPix
+//
+// Storage container for the signal in a pixel in number of photons.
+//
+// Version 2:
+// Added fIsSaturated, boolean variable set to kTRUE whenever one or more of 
+// the low gain FADC slices of the pixel is in saturation.
+//
+////////////////////////////////////////////////////////////////////////////
+
 #include "MCerPhotPix.h"
 
@@ -37 +51 @@
 //
 MCerPhotPix::MCerPhotPix(Int_t pix, Float_t phot, Float_t errphot) :
-    fPixId(pix), fRing(1), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot)
+  fPixId(pix), fRing(1), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot), fIsSaturated(kFALSE)
 {
 } 
@@ -50 +64 @@
     gLog << (fRing>0?"   Used ":" Unused ");
     gLog << (fIsCore?" Core ":"      ");
+    gLog << (fIsSaturated?" Saturated ":"Not Saturated");
     gLog << "Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl;
 }

trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h

@@ -14 +14 @@
     UShort_t fRing;      // NT: number of analyzed rings around the core pixels (fRing>0 means: used)
     Bool_t   fIsCore;    // the pixel is a Core pixel -> kTRUE
+    Bool_t   fIsSaturated; // the pixel is saturated
 
     Float_t  fPhot;      // The number of Cerenkov photons
@@ -41 +42 @@
     void     Set(Float_t np, Float_t ep) { fPhot = np; fErrPhot = ep; }
 
+    void     SetPixelSaturated()         { fIsSaturated = kTRUE; }
+    Bool_t   IsPixelSaturated() const    { return fIsSaturated; }
+
     void     AddNumPhotons(Float_t f)    { fPhot += f; }
 
@@ -47 +51 @@
     void     Print(Option_t *opt = NULL) const;
 
-    ClassDef(MCerPhotPix, 1)  // class containing information about the Cerenkov Photons in a pixel
+    ClassDef(MCerPhotPix, 2)  // class containing information about the Cerenkov Photons in a pixel
 };
 

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -126 +126 @@
 
     const UInt_t imaxnumpix = fSignals->GetSize();
-    
+
     for (UInt_t pixidx=0; pixidx<imaxnumpix; pixidx++)
     {
@@ -161 +161 @@
         nphotErr  = TMath::Sqrt(nphotErr);
 
+
         fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr);
+
+        if (sig.GetNumLoGainSaturated() > 0)
+          (*fCerPhotEvt)[pixidx].SetPixelSaturated();
     }
 

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
 };