Changeset 5046 for trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc

Timestamp:

09/15/04 22:12:28 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc

@@ -28 +28 @@
 // Base class for intensity calibration results 
 //
-// Contains TObjArrays for the following objects:
+// Contains TOrdCollections for the following objects:
 // - fCams:  Array of classes derived from MCalibrationCam, one entry 
 //           per calibration camera result. Has to be created
@@ -43 +43 @@
 #include "MCalibrationIntensityCam.h"
 
-#include <TObjArray.h>
+#include <TOrdCollection.h>
 
 #include "MGeomCam.h"
@@ -64 +64 @@
   fTitle = title ? title : "Base container for the Intensity Calibration";
 
-  fCams = new TObjArray;
+  fCams = new TOrdCollection;
   fCams->SetOwner();
   
@@ -188 +188 @@
 // -------------------------------------------------------------------
 //
-// Calls TObjArray::Expand() for fCams
-//
-void MCalibrationIntensityCam::InitSize(const UInt_t n)
-{
-  fCams->Expand(n);
+// Initialize the objects inside the TOrdCollection using the 
+// virtual function Add().
+//
+// InitSize can only increase the size, but not shrink. 
+// 
+// It can be called more than one time. New Containers are 
+// added only from the current size to the argument i.
+//
+void MCalibrationIntensityCam::InitSize(const UInt_t i)
+{
+
+  const UInt_t save = GetSize();
+
+  if (i==save)
+    return;
+  
+  if (i>save)
+    Add(save,i);
+}
+
+// -------------------------------------------------------------------
+//
+// Add MCalibrationCams in the ranges from - to. In order to initialize
+// from MCalibrationCam derived containers, overwrite this function
+//
+void MCalibrationIntensityCam::Add(const UInt_t from, const UInt_t to)
+{
+  for (UInt_t i=from; i<to; i++)
+    fCams->AddAt(new MCalibrationCam,i);
 }
 
@@ -211 +235 @@
 // --------------------------------------------------------------------------
 //
-// Returns the current size of the TObjArray fCams 
+// Returns the current size of the TOrdCollection fCams 
 // independently if the MCalibrationCam is filled with values or not.
 //
 const Int_t MCalibrationIntensityCam::GetSize() const 
 {
-  return fCams->GetEntriesFast();
+  return fCams->GetSize();
 }
 
@@ -240 +264 @@
 // --------------------------------------------------------------------------
 //
-// Returns the current size of the TObjArray fAverageAreas of the current camera.
+// Returns the current size of the TOrdCollection fAverageAreas of the current camera.
 //
 const Int_t MCalibrationIntensityCam::GetAverageAreas() const
@@ -285 +309 @@
 // --------------------------------------------------------------------------
 //
-// Returns the current size of the TObjArray fAverageSectors or the current camera
+// Returns the current size of the TOrdCollection fAverageSectors or the current camera
 //
 const Int_t MCalibrationIntensityCam::GetAverageSectors() const