Changeset 1394


Ignore:
Timestamp:
07/10/02 11:31:05 (22 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r1390 r1394  
    11                                                                  -*-*- END -*-*-
     2 2002/07/10: Thomas Bretz
     3
     4   * mmain/Makefile:
     5     - added -I../mfileio
     6
     7   * manalysis/MCerPhotPix.h:
     8     - renamed IsCorePixel to IsPixelCore
     9     - renamed SetCorePixel to SetPixelCore
     10
     11   * manalysis/MHillas.[h,cc]:
     12     - added fNumCorePixel
     13     - added fNumUsedPixel
     14
     15   * manalysis/MImgCleanStd.cc:
     16     - renamed IsCorePixel and SetCorePixel
     17
     18
     19
    220 2002/07/08: Thomas Bretz
    321

  • trunk/MagicSoft/Mars/NEWS

    r1390 r1394  
    3131   
    3232   - Added three buttons to the camera display to change the palette
     33
     34   - Added the number of used and core pixels after image cleaning
     35     to MHillas
    3336
    3437

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

    r1203 r1394  
    143143        const MCerPhotPix &pix = (*this)[i];
    144144
    145         if (id == pix.GetPixId() && pix.IsCorePixel())
     145        if (id == pix.GetPixId() && pix.IsPixelCore())
    146146            return kTRUE;
    147147    }

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

    r1023 r1394  
    3434    void    SetPixelUsed()           { fIsUsed = kTRUE;  }
    3535
    36     void    SetCorePixel()           { fIsCore = kTRUE; }
    37     Bool_t  IsCorePixel() const      { return fIsCore;  }
     36    void    SetPixelCore()           { fIsCore = kTRUE; }
     37    Bool_t  IsPixelCore() const      { return fIsCore;  }
    3838
    3939    void    SetNumPhotons(Float_t f) { fPhot    = f; }

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

    r1353 r1394  
    3232//
    3333//    basic image parameters
     34//
     35// Version 1:
     36// ----------
    3437// fLength   major axis of ellipse
    3538// fWidth    minor axis
    … …  
    3942// fMeanY    y of center of ellipse
    4043//
     44// Version 2:
     45// ----------
     46// fNumCorePixels  number of pixels called core
     47// fNumUsedPixels  number of pixels which survived the cleaning
     48//
    4149/////////////////////////////////////////////////////////////////////////////
    4250#include "MHillas.h"
    … …  
    8896    fWidth  = 0;
    8997    fDelta  = 0;
    90     fSize   = 0;
    91     fMeanX  = 0;
    92     fMeanY  = 0;
     98
     99    fSize   = -1;
     100    fMeanX  = -1;
     101    fMeanY  = -1;
     102
     103    fNumUsedPixels = -1;
     104    fNumCorePixels = -1;
    93105
    94106    Clear();
    … …  
    220232    fSize  = 0;
    221233
     234    fNumUsedPixels = 0;
     235    fNumCorePixels = 0;
     236
    222237    //
    223238    // FIXME! npix should be retrieved from MCerPhotEvt
    224239    //
    225     UShort_t npix=0;
    226240    for (UInt_t i=0; i<npixevt; i++)
    227241    {
    … …  
    239253        fMeanY += nphot * gpix.GetY();               // [mm]
    240254
    241         npix++;
     255        if (pix.IsPixelCore())
     256            fNumCorePixels++;
     257
     258        fNumUsedPixels++;
    242259    }
    243260
    … …  
    245262    // sanity check
    246263    //
    247     if (fSize==0 || npix<=2)
     264    if (fSize==0 || fNumUsedPixels<=2)
    248265        return kFALSE;
    249266

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

    r1218 r1394  
    2424    Float_t   fSinDelta; //! [1] sin of Delta (to be used in derived classes)
    2525    Float_t   fCosDelta; //! [1] cos of Delta (to be used in derived classes)
     26
     27    Short_t fNumUsedPixels; // Number of pixels which survived the image cleaning
     28    Short_t fNumCorePixels; // number of core pixels
    2629
    2730    TEllipse *fEllipse;  //! Graphical Object to Display Ellipse
    … …  
    5659    Float_t GetMeanY() const  { return fMeanY; }
    5760
     61    Int_t GetNumUsedPixels() const { return fNumUsedPixels; }
     62    Int_t GetNumCorePixels() const { return fNumCorePixels; }
     63
    5864    virtual void AsciiRead(ifstream &fin);
    5965    //virtual void AsciiWrite(ofstream &fout) const;
    6066
    61     ClassDef(MHillas, 1) // Storage Container for Hillas Parameter
     67    ClassDef(MHillas, 2) // Storage Container for Hillas Parameter
    6268};
    6369

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

    r1211 r1394  
    187187
    188188        if (pix.IsPixelUsed())
    189             pix.SetCorePixel();
     189            pix.SetPixelCore();
    190190    }
    191191}
    … …  
    211211        // if pixel is a core pixel go to the next pixel
    212212        //
    213         if (pix.IsCorePixel())
     213        if (pix.IsPixelCore())
    214214            continue;
    215215

  • trunk/MagicSoft/Mars/mmain/Makefile

    r1052 r1394  
    2323#
    2424INCLUDES = -I. -I../mbase -I../manalysis -I../mdatacheck -I../meventdisp \
    25            -I../mgui -I../mhist -I../mmontecarlo
     25           -I../mgui -I../mhist -I../mmontecarlo -I../mfileio
    2626
    2727#------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.