Changeset 977 for trunk/MagicSoft


Ignore:
Timestamp:
10/23/01 15:55:55 (23 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r961 r977  
    4444#include <TEllipse.h>
    4545
     46#include "MGeomPix.h"
     47#include "MGeomCam.h"
     48
     49#include "MCerPhotPix.h"
    4650#include "MCerPhotEvt.h"
    47 #include "MCerPhotPix.h"
    48 #include "MGeomCam.h"
    4951
    5052#include "MLog.h"

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

    r961 r977  
    4949
    5050#include "MParList.h"
     51#include "MGeomPix.h"
    5152#include "MGeomCam.h"
    5253#include "MCerPhotPix.h"

  • trunk/MagicSoft/Mars/mgui/MCamDisplay.h

    r976 r977  
    1212class TText;
    1313class TVirtualPad;
    14 class TClonesArray;
    1514
    1615class MGeomCam;

  • trunk/MagicSoft/Mars/mgui/MGeomCam.cc

    r974 r977  
    3636#include "MGeomCam.h"
    3737
     38#include <TObjArray.h>
     39
    3840#include "MLog.h"
     41#include "MGeomPix.h"
    3942#include "MHexagon.h"
    4043
    … …  
    6366}
    6467
     68// --------------------------------------------------------------------------
     69//
     70//  Destructor delete the pixel array with all pixels
     71//
     72MGeomCam::~MGeomCam()
     73{
     74    delete fPixels;
     75}
     76
     77// --------------------------------------------------------------------------
     78//
     79// Return the i-th pixel object
     80//
     81inline MGeomPix &MGeomCam::operator[](Int_t i)
     82{
     83    return *(MGeomPix*)fPixels->At(i);
     84}
     85
     86// --------------------------------------------------------------------------
     87//
     88// Return the i-th pixel object
     89//
     90inline MGeomPix &MGeomCam::operator[](Int_t i) const
     91{
     92    return *(MGeomPix*)fPixels->At(i);
     93}
     94
     95// --------------------------------------------------------------------------
     96//
     97// Calculate the maximum radius of the camera. This is ment for GUI layout.
     98//
    6599void MGeomCam::CalcMaxRadius()
    66100{

  • trunk/MagicSoft/Mars/mgui/MGeomCam.h

    r975 r977  
    55#include "MAGIC.h"
    66#endif
    7 #ifndef ROOT_TObjArray
    8 #include <TObjArray.h>
    9 #endif
    107#ifndef MPARCONTAINER_H
    118#include "MParContainer.h"
    129#endif
    13 #ifndef MGEOMPIX_H
    14 #include "MGeomPix.h"
    15 #endif
     10
     11class MGeomPix;
     12class TObjArray;
    1613
    1714class MGeomCam : public MParContainer
    … …  
    3027    MGeomCam(UInt_t npix, const char *name=NULL, const char *title=NULL);
    3128
    32     virtual ~MGeomCam() { delete fPixels; }
     29    virtual ~MGeomCam();
    3330
    3431    UInt_t  GetNumPixels() const { return fNumPixels; }
    3532    Float_t GetMaxRadius() const { return fMaxRadius; }
    3633
    37     MGeomPix &operator[](Int_t i)       { return *(MGeomPix*)fPixels->At(i); }
    38     MGeomPix &operator[](Int_t i) const { return *(MGeomPix*)fPixels->At(i); }
     34    MGeomPix &operator[](Int_t i);
     35    MGeomPix &operator[](Int_t i) const;
    3936
    4037    virtual void Print(Option_t *opt=NULL);

  • trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc

    r975 r977  
    3838
    3939#include <math.h>     // floor
     40
    4041#include "TCanvas.h"
    4142
    4243#include "MLog.h"
     44#include "MGeomPix.h"
    4345
    4446ClassImp(MGeomCamCT1);

  • trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc

    r975 r977  
    3838
    3939#include "MLog.h"
     40#include "MGeomPix.h"
    4041
    4142ClassImp(MGeomCamMagic)
Note: See TracChangeset for help on using the changeset viewer.