Changeset 5052 for trunk/MagicSoft

Timestamp:

09/15/04 23:18:04 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbadpixels/MBadPixelsIntensityCam.cc (modified) (8 diffs)
• mbadpixels/MBadPixelsIntensityCam.h (modified) (2 diffs)
• mcalib/MCalibrationIntensityCam.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.cc

@@ -43 +43 @@
 #include "MBadPixelsIntensityCam.h"
 
-#include <TClonesArray.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();
 
@@ -139 +139 @@
 // -------------------------------------------------------------------
 //
-// Calls TClonesArray::ExpandCreate() for fCams
-//
-void MBadPixelsIntensityCam::InitSize(const UInt_t n)
-{
-
-  fCams->Expand(n);
-
-  for (Int_t i=0; i<fCams->GetSize(); i++)
-    (*fCams)[i] = new MBadPixelsCam;
-}
+// Initialize the objects inside the TOrdCollection using the 
+// 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 MBadPixelsIntensityCam::InitSize(const UInt_t i)
+{
+
+  const UInt_t save = GetSize();
+
+  if (i==save)
+    return;
+  
+  if (i>save)
+    Add(save,i);
+}
+
+// -------------------------------------------------------------------
+//
+// Add MBadPixelsCams in the ranges from - to. In order to initialize
+// from MBadPixelsCam derived containers, overwrite this function
+//
+void MBadPixelsIntensityCam::Add(const UInt_t from, const UInt_t to)
+{
+  for (UInt_t i=from; i<to; i++)
+    fCams->AddAt(new MBadPixelsCam,i);
+}
+
 
 // -------------------------------------------------------------------
@@ -166 +187 @@
 // --------------------------------------------------------------------------
 //
-// Returns the current size of the TClonesArray fCams 
+// Returns the current size of the TOrdCollection fCams 
 // independently if the MBadPixelsCam is filled with values or not.
 //
 Int_t MBadPixelsIntensityCam::GetSize() const 
 {
-  return fCams->GetEntries();
+  return fCams->GetSize();
 }
 
@@ -180 +201 @@
 MBadPixelsPix &MBadPixelsIntensityCam::operator[](Int_t i)
 {
-  return (*GetCam(GetSize()-1))[i];
+  return (*GetCam())[i];
 }
 
@@ -189 +210 @@
 const MBadPixelsPix &MBadPixelsIntensityCam::operator[](Int_t i) const 
 {
-  return (*GetCam(GetSize()-1))[i];
+  return (*GetCam())[i];
 }
 
@@ -199 +220 @@
 MBadPixelsCam *MBadPixelsIntensityCam::GetCam(Int_t i)
 {
-  return static_cast<MBadPixelsCam*>(fCams->UncheckedAt(i==-1 ? GetSize()-1 : i));
+  return static_cast<MBadPixelsCam*>(i==-1 ? fCams->Last() : fCams->At(i));
 }
 
@@ -208 +229 @@
 const MBadPixelsCam *MBadPixelsIntensityCam::GetCam(Int_t i) const 
 {
-  return static_cast<MBadPixelsCam*>(fCams->UncheckedAt(i==-1 ? GetSize()-1 : i));
+  return static_cast<MBadPixelsCam*>(i==-1 ? fCams->Last() : fCams->At(i));
 }
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.h

@@ -12 +12 @@
 #endif
 
-class TObjArray;
+class TOrdCollection;
 class MGeomCam;
 class MBadPixelsIntensityCam : public MParContainer, public MCamEvent
 {
 private:
+
+  TOrdCollection *fCams;        //-> Array of MBadPixelsCams, one per pulse colour and intensity
+
+  void Add(const UInt_t from, const UInt_t to);
   
-  void InitSize( const UInt_t n );
-  
-protected:  
-
-  TObjArray *fCams;        //-> Array of MBadPixelsCams, one per pulse colour and intensity
-
 public:
 
@@ -70 +68 @@
   
   // Inits
-  void  Init   ( const MGeomCam &geom );
+  void Init   ( const MGeomCam &geom );
+  void InitSize( const UInt_t i );
 
   Bool_t GetPixelContent ( Double_t &val, Int_t idx, const MGeomCam &cam,Int_t type=0) const;

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc

@@ -359 +359 @@
 MCalibrationCam *MCalibrationIntensityCam::GetCam(Int_t i)
 {
-  return static_cast<MCalibrationCam*>(fCams->Last());
+  return static_cast<MCalibrationCam*>(i==-1 ? fCams->Last() : fCams->At(i));
 }
 
@@ -368 +368 @@
 const MCalibrationCam *MCalibrationIntensityCam::GetCam(Int_t i) const 
 {
-  return static_cast<MCalibrationCam*>(fCams->Last());
+  return static_cast<MCalibrationCam*>(i==-1 ? fCams->Last() : fCams->At(i));
 }