Changeset 977

Timestamp:

10/23/01 15:55:55 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MHillas.cc (modified) (1 diff)
• manalysis/MImgCleanStd.cc (modified) (1 diff)
• mgui/MCamDisplay.h (modified) (1 diff)
• mgui/MGeomCam.cc (modified) (2 diffs)
• mgui/MGeomCam.h (modified) (2 diffs)
• mgui/MGeomCamCT1.cc (modified) (1 diff)
• mgui/MGeomCamMagic.cc (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MHillas.cc

@@ -44 +44 @@
 #include <TEllipse.h>
 
+#include "MGeomPix.h"
+#include "MGeomCam.h"
+
+#include "MCerPhotPix.h"
 #include "MCerPhotEvt.h"
-#include "MCerPhotPix.h"
-#include "MGeomCam.h"
 
 #include "MLog.h"

trunk/MagicSoft/Mars/manalysis/MImgCleanStd.cc

@@ -49 +49 @@
 
 #include "MParList.h"
+#include "MGeomPix.h"
 #include "MGeomCam.h"
 #include "MCerPhotPix.h"

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -12 +12 @@
 class TText;
 class TVirtualPad;
-class TClonesArray;
 
 class MGeomCam;

trunk/MagicSoft/Mars/mgui/MGeomCam.cc

@@ -36 +36 @@
 #include "MGeomCam.h"
 
+#include <TObjArray.h>
+
 #include "MLog.h"
+#include "MGeomPix.h"
 #include "MHexagon.h"
 
@@ -63 +66 @@
 }
 
+// --------------------------------------------------------------------------
+//
+//  Destructor delete the pixel array with all pixels
+//
+MGeomCam::~MGeomCam()
+{
+    delete fPixels;
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the i-th pixel object
+//
+inline MGeomPix &MGeomCam::operator[](Int_t i)
+{
+    return *(MGeomPix*)fPixels->At(i);
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the i-th pixel object
+//
+inline MGeomPix &MGeomCam::operator[](Int_t i) const
+{
+    return *(MGeomPix*)fPixels->At(i);
+}
+
+// --------------------------------------------------------------------------
+//
+// Calculate the maximum radius of the camera. This is ment for GUI layout.
+//
 void MGeomCam::CalcMaxRadius()
 {

trunk/MagicSoft/Mars/mgui/MGeomCam.h

@@ -5 +5 @@
 #include "MAGIC.h"
 #endif
-#ifndef ROOT_TObjArray
-#include <TObjArray.h>
-#endif
 #ifndef MPARCONTAINER_H
 #include "MParContainer.h"
 #endif
-#ifndef MGEOMPIX_H
-#include "MGeomPix.h"
-#endif
+
+class MGeomPix;
+class TObjArray;
 
 class MGeomCam : public MParContainer
@@ -30 +27 @@
     MGeomCam(UInt_t npix, const char *name=NULL, const char *title=NULL);
 
-    virtual ~MGeomCam() { delete fPixels; }
+    virtual ~MGeomCam();
 
     UInt_t  GetNumPixels() const { return fNumPixels; }
     Float_t GetMaxRadius() const { return fMaxRadius; }
 
-    MGeomPix &operator[](Int_t i)       { return *(MGeomPix*)fPixels->At(i); }
-    MGeomPix &operator[](Int_t i) const { return *(MGeomPix*)fPixels->At(i); }
+    MGeomPix &operator[](Int_t i);
+    MGeomPix &operator[](Int_t i) const;
 
     virtual void Print(Option_t *opt=NULL);

trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc

@@ -38 +38 @@
 
 #include <math.h>     // floor
+
 #include "TCanvas.h"
 
 #include "MLog.h"
+#include "MGeomPix.h"
 
 ClassImp(MGeomCamCT1);

trunk/MagicSoft/Mars/mgui/MGeomCamMagic.cc

@@ -38 +38 @@
 
 #include "MLog.h"
+#include "MGeomPix.h"
 
 ClassImp(MGeomCamMagic)