Changeset 2929 for trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

Timestamp:

01/27/04 19:33:39 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -55 +55 @@
     fArray = new TClonesArray("MPedestalPix", 1);
 
-//    for (int i=0; i<577; i++)
-//        new ((*fArray)[i]) MPedestalPix;
 }
 
@@ -79 +77 @@
 // --------------------------------------------------------------------------
 //
+// Check if position i is inside bounds
+//
+Bool_t MPedestalCam::CheckBounds(Int_t i) const
+{
+  return i < GetSize();
+} 
+
+// --------------------------------------------------------------------------
+//
+// This function returns the current size of the TClonesArray 
+// independently if the MPedestalPix is filled with values or not.
+//
 // Get the size of the MPedestalCam
 //
@@ -92 +102 @@
 MPedestalPix &MPedestalCam::operator[](Int_t i)
 {
-    return *static_cast<MPedestalPix*>(fArray->UncheckedAt(i));
+  if (!CheckBounds(i))
+    return *static_cast<MPedestalPix*>(NULL);
+
+  return *static_cast<MPedestalPix*>(fArray->UncheckedAt(i));
 }
 
@@ -101 +114 @@
 MPedestalPix &MPedestalCam::operator[](Int_t i) const
 {
-    return *static_cast<MPedestalPix*>(fArray->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Check if position i is inside bounds
-//
-Bool_t MPedestalCam::CheckBounds(Int_t i)
-{
-    return i < fArray->GetEntriesFast();
-} 
+  if (!CheckBounds(i))
+    return *static_cast<MPedestalPix*>(NULL);
+
+  return *static_cast<MPedestalPix*>(fArray->UncheckedAt(i));
+}
 
 void MPedestalCam::Clear(Option_t *o)