Changeset 3466 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
03/10/04 20:23:56 (21 years ago)
Author:
moralejo
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r3465 r3466  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2004/03/10: Abelardo Moralejo
     22
     23   * manalysis/MCerPhotPix.[h,cc]
     24     - Added member fIsHGSaturated, and setter/getter functions.
     25       Updated class version to 4.
     26
     27   * mcalib/MCalibrate.cc, MCalibrateData.cc
     28     - Added setting of MCerPhotPix.fIsHGSaturated if one or more HG
     29       slices saturate.
     30
     31   * mimage/MNewImagePar.[h,cc]
     32     - Added member fNumHGSaturatedPixels to count the number of pixels
     33       in which high gain saturates. Added getter funciton for it.
     34       Updated class version to 3.
     35
     36
    2037 2004/03/10: Markus Gaug
    2138

  • trunk/MagicSoft/Mars/manalysis/MCerPhotPix.cc

    r3183 r3466  
    4141//  - added fIsSaturated
    4242//
     43// Version 4:
     44// ----------
     45//  - added fIsHGSaturated
     46//
    4347////////////////////////////////////////////////////////////////////////////
    4448#include "MCerPhotPix.h"
    … …  
    5660//
    5761MCerPhotPix::MCerPhotPix(Int_t pix, Float_t phot, Float_t errphot) :
    58   fPixId(pix), fRing(1), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot), fIsSaturated(kFALSE)
     62  fPixId(pix), fRing(1), fIsCore(kFALSE), fPhot(phot), fErrPhot(errphot), fIsSaturated(kFALSE), fIsHGSaturated(kFALSE)
    5963{
    6064}
    … …  
    6973    gLog << (fRing>0?"   Used ":" Unused ");
    7074    gLog << (fIsCore?" Core ":"      ");
     75    gLog << "High gain " << (fIsHGSaturated?"   ":"not") << " saturated";
    7176    gLog << (fIsSaturated?"   ":"Not") << " saturated";
    7277    gLog << " Nphot= " << fPhot << " Error(Nphot)=" << fErrPhot << endl;

  • trunk/MagicSoft/Mars/manalysis/MCerPhotPix.h

    r3415 r3466  
    1818    Float_t  fErrPhot;   // the error of fPhot
    1919
    20     Bool_t   fIsSaturated; // the pixel is saturated
     20    Bool_t   fIsSaturated;   // the pixel's low gain is saturated
     21    Bool_t   fIsHGSaturated; // the pixel's high gain is saturated
    2122
    2223    // FIXME: arrival time t, and it's error sigma t
    … …  
    4849    Bool_t   IsPixelSaturated() const    { return fIsSaturated; }
    4950
     51    void     SetPixelHGSaturated()         { fIsHGSaturated = kTRUE; }
     52    Bool_t   IsPixelHGSaturated() const    { return fIsHGSaturated; }
     53
    5054    void     AddNumPhotons(Float_t f)    { fPhot += f; }
    5155
    … …  
    5458    void     Print(Option_t *opt = NULL) const;
    5559
    56     ClassDef(MCerPhotPix, 3)  // class containing information about the Cerenkov Photons in a pixel
     60    ClassDef(MCerPhotPix, 4)  // class containing information about the Cerenkov Photons in a pixel
    5761};
    5862

  • trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

    r3437 r3466  
    327327        cpix->SetPixelSaturated();
    328328
     329      if (sig.GetNumHiGainSaturated() > 0)
     330        cpix->SetPixelHGSaturated();
     331
     332
    329333    } /* for (UInt_t pixidx=0; pixidx<npix; pixidx++) */
    330334 

  • trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

    r3437 r3466  
    340340      MCerPhotPix *cpix = fCerPhotEvt->AddPixel(pixidx, nphot, nphotErr);
    341341
     342      if (sig.GetNumHiGainSaturated() > 0)
     343        cpix->SetPixelHGSaturated();
     344
    342345      if (sig.GetNumLoGainSaturated() > 0)
    343346        cpix->SetPixelSaturated();

  • trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

    r3183 r3466  
    3737// ----------
    3838//  - added fNumSaturatedPixels
     39//
     40// Version 3:
     41// ----------
     42//  - added fNumHGSaturatedPixels
    3943//
    4044/////////////////////////////////////////////////////////////////////////////
    … …  
    8286
    8387    fNumSaturatedPixels = -1;
     88    fNumHGSaturatedPixels = -1;
    8489}
    8590
    … …  
    95100
    96101    fNumSaturatedPixels = 0;
     102    fNumHGSaturatedPixels = 0;
    97103
    98104    const UInt_t npixevt = evt.GetNumPixels();
    … …  
    109115
    110116        // count saturated pixels
     117        if (pix.IsPixelHGSaturated())
     118            fNumHGSaturatedPixels++;
    111119        if (pix.IsPixelSaturated())
    112120            fNumSaturatedPixels++;
    … …  
    175183    *fLog << " - Used Pixels    [#]   = " << fNumUsedPixels << " Pixels" << endl;
    176184    *fLog << " - Core Pixels    [#]   = " << fNumCorePixels << " Pixels" << endl;
    177     *fLog << " - Sat. Pixels    [#]   = " << fNumSaturatedPixels << " Pixels" << endl;
     185    *fLog << " - Sat. Pixels (HG) [#]  = " << fNumHGSaturatedPixels << " Pixels" << endl;
     186    *fLog << " - Sat. Pixels (LG) [#]  = " << fNumSaturatedPixels << " Pixels" << endl;
    178187}

  • trunk/MagicSoft/Mars/mimage/MNewImagePar.h

    r3183 r3466  
    2121    Short_t fNumUsedPixels;      // Number of pixels which survived the image cleaning
    2222    Short_t fNumCorePixels;      // number of core pixels
    23     Short_t fNumSaturatedPixels; // number of pixels with saturating lo-gains
     23    Short_t fNumHGSaturatedPixels; // number of pixels with saturating hi-gains
     24    Short_t fNumSaturatedPixels;   // number of pixels with saturating lo-gains
    2425
    2526public:
    … …  
    3839
    3940    Short_t GetNumSaturatedPixels() const { return fNumSaturatedPixels; }
     41    Short_t GetNumHGSaturatedPixels() const { return fNumHGSaturatedPixels; }
    4042
    4143    void Print(Option_t *opt=NULL) const;
    … …  
    4446              const MHillas &hillas);
    4547
    46     ClassDef(MNewImagePar, 2) // Container to hold new image parameters
     48    ClassDef(MNewImagePar, 3) // Container to hold new image parameters
    4749};
    4850
Note: See TracChangeset for help on using the changeset viewer.