Changeset 5013

Timestamp:

09/14/04 19:04:10 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbadpixels/MBadPixelsIntensityCam.cc (modified) (6 diffs)
• mbadpixels/MBadPixelsIntensityCam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
 
  2004/09/14: Markus Gaug
+
+   * mbadpixels/MBadPixelsIntensityCam.[h,cc]
+   * mcalib/MCalibrationIntensityCam.[h,cc]
+     - replace TClonesArray by TObjArray
 
    * mjobs/MJCalibration.cc

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.cc

@@ -54 +54 @@
 // Default constructor. 
 //
-// Set the following pointer to NULL:
+// Initializes and sets owner of:
 // - fCams
+// - Initializes fCams to entry 
 //
 MBadPixelsIntensityCam::MBadPixelsIntensityCam(const char *name, const char *title)
-    : fCams(NULL)
 {
 
@@ -64 +64 @@
   fTitle = title ? title : "Base container for the Intensity Calibration";
   
-}
-
-// --------------------------------------------------------------------------
-//
-// Deletes the histograms if they exist
+  fCams = new TObjArray;
+  fCams->SetOwner();
+
+  InitSize(1);
+}
+
+// --------------------------------------------------------------------------
+//
+// Deletes the cameras if they exist
 //
 MBadPixelsIntensityCam::~MBadPixelsIntensityCam()
@@ -84 +88 @@
 {
 
-  fCams->ExpandCreate(GetSize()+1);
+  const Int_t size = GetSize();
+  fCams->Expand(size+1);
+
+  (*fCams)[size] = new MBadPixelsCam;
 
   GetCam()->SetName(name);
@@ -141 +148 @@
 void MBadPixelsIntensityCam::InitSize(const UInt_t n)
 {
-  fCams->ExpandCreate(n);
+
+  fCams->Expand(n);
+
+  for (Int_t i=0; i<fCams->GetSize(); i++)
+    (*fCams)[i] = new MBadPixelsCam;
 }
 
@@ -153 +164 @@
   if (GetSize() == 0)
     InitSize(1);
+
   fCams->ForEach(MBadPixelsCam,Init)(geom);
 }
@@ -164 +176 @@
 Int_t MBadPixelsIntensityCam::GetSize() const 
 {
-  return fCams->GetEntriesFast();
+  return fCams->GetEntries();
 }
 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsIntensityCam.h

@@ -12 +12 @@
 #endif
 
-class TClonesArray;
+class TObjArray;
 class MGeomCam;
 class MBadPixelsIntensityCam : public MParContainer, public MCamEvent
@@ -22 +22 @@
 protected:  
 
-  TClonesArray *fCams;        //-> Array of MBadPixelsCams, one per pulse colour and intensity
+  TObjArray *fCams;        //-> Array of MBadPixelsCams, one per pulse colour and intensity
 
 public: