Changeset 5015 for trunk/MagicSoft

Timestamp:

09/14/04 19:46:40 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationIntensityBlindCam.cc (modified) (3 diffs)
• mcalib/MCalibrationIntensityBlindCam.h (modified) (1 diff)
• mcalib/MCalibrationIntensityCam.cc (modified) (8 diffs)
• mcalib/MCalibrationIntensityCam.h (modified) (2 diffs)
• mcalib/MCalibrationIntensityChargeCam.cc (modified) (3 diffs)
• mcalib/MCalibrationIntensityChargeCam.h (modified) (1 diff)
• mcalib/MCalibrationIntensityQECam.cc (modified) (3 diffs)
• mcalib/MCalibrationIntensityQECam.h (modified) (1 diff)
• mcalib/MCalibrationIntensityRelTimeCam.cc (modified) (3 diffs)
• mcalib/MCalibrationIntensityRelTimeCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
 
    * mbadpixels/MBadPixelsIntensityCam.[h,cc]
-   * mcalib/MCalibrationIntensityCam.[h,cc]
+   * mcalib/MCalibrationIntensity*Cam.[h,cc]
      - replace TClonesArray by TObjArray
 

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityBlindCam.cc

@@ -39 +39 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MCalibrationIntensityBlindCam.h"
+#include "MCalibrationBlindCam.h"
 
-#include <TClonesArray.h>
+#include <TObjArray.h>
 
 ClassImp(MCalibrationIntensityBlindCam);
@@ -50 +51 @@
 // Default constructor. 
 //
-// Sets all pointers to 0
-// 
-// Creates a TClonesArray of MCalibrationBlindCam containers, initialized to 1 entry, destinated 
-// to hold one container per camera. 
-//
 MCalibrationIntensityBlindCam::MCalibrationIntensityBlindCam(const char *name, const char *title)
 {
@@ -60 +56 @@
   fName  = name  ? name  : "MCalibrationIntensityBlindCam";
   fTitle = title ? title : "Results of the Intensity Calibration";
+
+}
+
+// --------------------------------------------------------------------------
+//
+// Calls TObjArray::Expand() for fCams and initialze one MCalibrationBlindCam
+// and copy the entries
+// 
+void MCalibrationIntensityBlindCam::InitSize(const UInt_t n)
+{
+
+  MCalibrationBlindCam *oldcam = NULL;
+
+  if (n>1)
+    oldcam = (MCalibrationBlindCam*)GetCam();
+
+  MCalibrationIntensityCam::InitSize(n);
+  (*fCams)[n-1] = new MCalibrationBlindCam;
+
+  MCalibrationBlindCam *newcam = (MCalibrationBlindCam*)GetCam();  
   
-  fCams = new TClonesArray("MCalibrationBlindCam",1);
-  
+  if (oldcam)
+    oldcam->Copy(*newcam);
 }
+

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityBlindCam.h

@@ -16 +16 @@
   MCalibrationIntensityBlindCam(const char *name=NULL, const char *title=NULL);
 
+  void InitSize( const UInt_t n );  
+  
   ClassDef(MCalibrationIntensityBlindCam, 1) // Container Intensity Blind Calibration Results Camera
 };

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc

@@ -28 +28 @@
 // Base class for intensity calibration results 
 //
-// Contains TClonesArrays for the following objects:
+// Contains TObjArrays 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 <TClonesArray.h>
+#include <TObjArray.h>
 
 #include "MGeomCam.h"
@@ -59 +59 @@
 //
 MCalibrationIntensityCam::MCalibrationIntensityCam(const char *name, const char *title)
-    : fCams(NULL)
 {
 
   fName  = name  ? name  : "MCalibrationIntensityCam";
   fTitle = title ? title : "Base container for the Intensity Calibration";
-  
+
+  fCams = new TObjArray;
+  fCams->SetOwner();
+
+  InitSize(1);
 }
 
@@ -73 +76 @@
 MCalibrationIntensityCam::~MCalibrationIntensityCam()
 {
-    if (fCams)
-        delete fCams;
+  if (fCams)
+    delete fCams;
 }
 
@@ -84 +87 @@
 void MCalibrationIntensityCam::AddToList( const char* name, const MGeomCam &geom) 
 {
-
-  fCams->ExpandCreate(GetSize()+1);
-
+  InitSize(GetSize()+1);
   GetCam()->SetName(name);
   GetCam()->Init(geom);
@@ -187 +188 @@
 // -------------------------------------------------------------------
 //
-// Calls TClonesArray::ExpandCreate() for fCams
+// Calls TObjArray::Expand() for fCams
 //
 void MCalibrationIntensityCam::InitSize(const UInt_t n)
 {
-  fCams->ExpandCreate(n);
+  fCams->Expand(n);
 }
 
@@ -203 +204 @@
   if (GetSize() == 0)
     InitSize(1);
+
   fCams->ForEach(MCalibrationCam,Init)(geom);
 }
@@ -209 +211 @@
 // --------------------------------------------------------------------------
 //
-// Returns the current size of the TClonesArray fCams 
+// Returns the current size of the TObjArray fCams 
 // independently if the MCalibrationCam is filled with values or not.
 //
 const Int_t MCalibrationIntensityCam::GetSize() const 
 {
-  return fCams->GetEntriesFast();
+  return fCams->GetEntries();
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.h

@@ -18 +18 @@
 #endif
 
-class TClonesArray;
+class TObjArray;
 class MCalibrationPix;
 class MBadPixelsPix;
@@ -29 +29 @@
   MArrayD fSlopes;            //! Arrays of Higain-vs-LoGain fit result Slopes
 
-  void InitSize( const UInt_t n );
-  
 protected:  
 
-  TClonesArray *fCams;        // Array of MCalibrationCams, one per pulse colour and intensity
+  TObjArray *fCams;        // Array of MCalibrationCams, one per pulse colour and intensity
 
+  virtual void InitSize( const UInt_t n );
+  
 public:
 

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc

@@ -40 +40 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MCalibrationIntensityChargeCam.h"
+#include "MCalibrationChargeCam.h"
 
-#include <TClonesArray.h>
+#include <TObjArray.h>
 
 ClassImp(MCalibrationIntensityChargeCam);
@@ -50 +51 @@
 //
 // Default constructor. 
-//
-// Sets all pointers to 0
 // 
-// Creates a TClonesArray of MCalibrationChargeCam containers, initialized to 1 entry, destinated 
-// to hold one container per camera. 
-//
 MCalibrationIntensityChargeCam::MCalibrationIntensityChargeCam(const char *name, const char *title)
 {
@@ -62 +58 @@
   fTitle = title ? title : "Results of the Intensity Calibration";
   
-  fCams = new TClonesArray("MCalibrationChargeCam",1);
-  
 }
+
+// --------------------------------------------------------------------------
+//
+// Calls TObjArray::Expand() for fCams and initialze one CalibrationChargeCam
+//
+void MCalibrationIntensityChargeCam::InitSize(const UInt_t n)
+{
+  MCalibrationIntensityCam::InitSize(n);
+  (*fCams)[n-1] = new MCalibrationChargeCam;
+}
+

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.h

@@ -15 +15 @@
 
   MCalibrationIntensityChargeCam(const char *name=NULL, const char *title=NULL);
+
+  void InitSize( const UInt_t n );  
 
   // Setters   

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityQECam.cc

@@ -39 +39 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MCalibrationIntensityQECam.h"
+#include "MCalibrationQECam.h"
 
-#include <TClonesArray.h>
+#include <TObjArray.h>
 
 ClassImp(MCalibrationIntensityQECam);
@@ -49 +50 @@
 // Default constructor. 
 //
-// Sets all pointers to 0
-// 
-// Creates a TClonesArray of MCalibrationQECam containers, initialized
-// to 1 entry, destinated to hold one container per camera.
-//
 MCalibrationIntensityQECam::MCalibrationIntensityQECam(const char *name, const char *title)
 {
@@ -60 +56 @@
   fTitle = title ? title : "Results of the Intensity Calibration";
   
-  fCams = new TClonesArray("MCalibrationQECam",1);
+}
 
+// --------------------------------------------------------------------------
+//
+// Calls TObjArray::Expand() for fCams and initialze one MCalibrationQECam
+// and copy the entries
+// 
+void MCalibrationIntensityQECam::InitSize(const UInt_t n)
+{
+
+  MCalibrationQECam *oldcam = NULL;
+
+  if (n>1)
+    oldcam = (MCalibrationQECam*)GetCam();
+
+  MCalibrationIntensityCam::InitSize(n);
+  (*fCams)[n-1] = new MCalibrationQECam;
+
+  MCalibrationQECam *newcam = (MCalibrationQECam*)GetCam();  
+  
+  if (oldcam)
+    oldcam->Copy(*newcam);
 }
+

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityQECam.h

@@ -8 +8 @@
 class MCalibrationIntensityQECam : public MCalibrationIntensityCam
 {
-private:
-  
-
 public:
 
   MCalibrationIntensityQECam(const char *name=NULL, const char *title=NULL);
+
+  void InitSize( const UInt_t n );  
   
   ClassDef(MCalibrationIntensityQECam, 1) // Container Intensity Rel.Times Calibration Results Camera

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityRelTimeCam.cc

@@ -39 +39 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MCalibrationIntensityRelTimeCam.h"
+#include "MCalibrationRelTimeCam.h"
 
-#include <TClonesArray.h>
+#include <TObjArray.h>
 
 ClassImp(MCalibrationIntensityRelTimeCam);
@@ -50 +51 @@
 // Default constructor. 
 //
-// Sets all pointers to 0
-// 
-// Creates a TClonesArray of MCalibrationRelTimeCam containers, initialized to 1 entry, destinated 
-// to hold one container per camera. 
-//
-//
 MCalibrationIntensityRelTimeCam::MCalibrationIntensityRelTimeCam(const char *name, const char *title)
 {
@@ -62 +57 @@
   fTitle = title ? title : "Results of the Intensity Calibration";
   
-  fCams = new TClonesArray("MCalibrationRelTimeCam",1);
+}
 
+
+// --------------------------------------------------------------------------
+//
+// Calls TObjArray::Expand() for fCams and initialze one CalibrationRelTimeCam
+//
+void MCalibrationIntensityRelTimeCam::InitSize(const UInt_t n)
+{
+  MCalibrationIntensityCam::InitSize(n);
+  (*fCams)[n-1] = new MCalibrationRelTimeCam;
 }
+

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityRelTimeCam.h

@@ -8 +8 @@
 class MCalibrationIntensityRelTimeCam : public MCalibrationIntensityCam
 {
-private:
-  
-
 public:
 
   MCalibrationIntensityRelTimeCam(const char *name=NULL, const char *title=NULL);
+
+  void InitSize( const UInt_t n );    
   
   ClassDef(MCalibrationIntensityRelTimeCam, 1) // Container Intensity Rel.Times Calibration Results Camera