Changeset 1048 for trunk/MagicSoft/Mars/mgui

Timestamp:

11/07/01 11:50:28 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgui

Files:

• MGeomCam.cc (modified) (2 diffs)
• MGeomCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mgui/MGeomCam.cc

@@ -36 +36 @@
 #include "MGeomCam.h"
 
-#include <TObjArray.h>
-
 #include "MLog.h"
 #include "MGeomPix.h"
@@ -73 +71 @@
 {
     delete fPixels;
-}
-
-// --------------------------------------------------------------------------
-//
-// Return the i-th pixel object
-//
-MGeomPix &MGeomCam::operator[](Int_t i)
-{
-    return *(MGeomPix*)fPixels->At(i);
-}
-
-// --------------------------------------------------------------------------
-//
-// Return the i-th pixel object
-//
-MGeomPix &MGeomCam::operator[](Int_t i) const
-{
-    return *(MGeomPix*)fPixels->At(i);
 }
 

trunk/MagicSoft/Mars/mgui/MGeomCam.h

@@ -5 +5 @@
 #include "MParContainer.h"
 #endif
+#ifndef ROOT_TObjArray
+#include "TObjArray.h"
+#endif
 
 class MGeomPix;
-class TObjArray;
 
 class MGeomCam : public MParContainer
@@ -29 +31 @@
     Float_t GetMaxRadius() const { return fMaxRadius; }
 
-    MGeomPix &operator[](Int_t i);
-    MGeomPix &operator[](Int_t i) const;
+    MGeomPix &operator[](Int_t i)       { return *(MGeomPix*)fPixels->UncheckedAt(i); }
+    MGeomPix &operator[](Int_t i) const { return *(MGeomPix*)fPixels->UncheckedAt(i); }
 
     virtual void Print(Option_t *opt=NULL) const;