Changeset 5018 for trunk/MagicSoft

Timestamp:

09/14/04 20:56:15 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationBlindCam.h (modified) (2 diffs)
• mcalib/MCalibrationCam.cc (modified) (13 diffs)
• mcalib/MCalibrationQECam.cc (modified) (3 diffs)
• mcalib/MCalibrationQECam.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

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

trunk/MagicSoft/Mars/mcalib/MCalibrationBlindCam.h

@@ -8 +8 @@
 class MCalibrationBlindCam : public MCalibrationCam
 {
-public:
+private:
+
+  void Add(const UInt_t a, const UInt_t b);
+
+ public:
 
   MCalibrationBlindCam(Int_t nblind=1,const char *name=NULL, const char *title=NULL);
@@ -18 +22 @@
   void  InitSize ( const UInt_t n );
   
-  ClassDef(MCalibrationBlindCam, 1) // Container Blind Pixels Calibration Results Camera
+  ClassDef(MCalibrationBlindCam, 2) // Container Blind Pixels Calibration Results Camera
 };
 

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -29 +29 @@
 // Base class for Camera Calibration results. 
 //
-// Contains TClonesArrays for the following objects:
+// Contains TObjArrays for the following objects:
 // - fPixels:         Array of classes derived from MCalibrationPix, one entry 
 //                    per pixel. Has to be created
@@ -42 +42 @@
 //                    per camera SECTOR. Is created automatically.
 //
-// All TClonesArrays have to enlarged by the corresponding calls to (e.g. in MGeomApply): 
+// All TObjArrays have to enlarged by the corresponding calls to (e.g. in MGeomApply): 
 // - InitSize()
 // - InitAverageAreas()
@@ -50 +50 @@
 #include "MCalibrationCam.h"
 
-#include <TClonesArray.h>
+#include <TObjArray.h>
 
 #include "MGeomCam.h"
@@ -79 +79 @@
 // - fNumLoGainFADCSlices to 0.
 //
-// Creates a TClonesArray of MBadPixelsPix containers for the TClonesArray's: 
+// Creates a TObjArray of MBadPixelsPix containers for the TObjArray's: 
 // - fAverageBadAreas
 // - fAverageBadSectors
@@ -88 +88 @@
 //
 MCalibrationCam::MCalibrationCam(const char *name, const char *title)
-    : fPulserColor(kNONE), 
-      fPixels(NULL), fAverageAreas(NULL), fAverageSectors(NULL),
-      fAverageBadAreas(NULL), fAverageBadSectors(NULL)
-{
+    : fPulserColor(kNONE)
+{
+
+  fPixels = new TObjArray;
+  fPixels->SetOwner();
+
+  fAverageAreas = new TObjArray;
+  fAverageAreas->SetOwner();
+  
+  fAverageSectors = new TObjArray;
+  fAverageSectors->SetOwner();
+
+  fAverageBadAreas = new TObjArray;
+  fAverageBadAreas->SetOwner();
+  
+  fAverageBadSectors = new TObjArray;
+  fAverageBadSectors->SetOwner();
+
 
   fNumHiGainFADCSlices.Set(1);
@@ -99 +113 @@
 // --------------------------------------------------------------------------
 //
-// Deletes the following TClonesArray's of MCalibrationPix containers (if exist):
+// Deletes the following TObjArray's of MCalibrationPix containers (if exist):
 // - fPixels
 // - fAverageAreas
 // - fAverageSectors
 //  
-// Deletes the following TClonesArray's of MBadPixelsPix containers (if exist):
+// Deletes the following TObjArray's of MBadPixelsPix containers (if exist):
 // - fAverageBadAreas
 // - fAverageBadSectors
@@ -133 +147 @@
 // --------------------------------------
 //
-// Calls the ForEach macro for the TClonesArray fPixels with the argument Clear()
+// Calls the ForEach macro for the TObjArray fPixels with the argument Clear()
 // 
 // Loops over the fAverageAreas, calling the function Clear() for 
@@ -205 +219 @@
 // -------------------------------------------------------------------
 //
-// Calls TClonesArray::ExpandCreate() for fPixels
+// Calls TObjArray::ExpandCreate() for fPixels
 //
 void MCalibrationCam::InitSize(const UInt_t i)
 {
-  fPixels->ExpandCreate(i);
-}
+
+  const UInt_t save = GetSize();
+  
+  if (i==save)
+    return;
+  
+  fPixels->Expand(i);
+
+  if (i>save)
+    Add(save,i);
+}
+
+void MCalibrationCam::Add(const UInt_t a, const UInt_t b)
+{
+  for (UInt_t i=a; i<b; i++)
+    (*fPixels)[i] = new MCalibrationPix;
+}
+
+void MCalibrationCam::AddArea(const UInt_t a, const UInt_t b)
+{
+  for (UInt_t i=a; i<b; i++)
+    (*fAverageAreas)[i] = new MCalibrationPix;
+}
+
+void MCalibrationCam::AddSector(const UInt_t a, const UInt_t b)
+{
+  for (UInt_t i=a; i<b; i++)
+    (*fAverageSectors)[i] = new MCalibrationPix;
+}
+
 
 // -------------------------------------------------------------------
 //
-// Calls TClonesArray::ExpandCreate() for:
+// Calls TObjArray::ExpandCreate() for:
 // - fAverageAreas
 // - fAverageBadAreas
@@ -220 +262 @@
 void MCalibrationCam::InitAverageAreas(const UInt_t i)
 {
-  fAverageAreas->ExpandCreate(i);
-  fAverageBadAreas->ExpandCreate(i);
-
-  for (UInt_t j=0; j<i; j++)
-    GetAverageArea(j).SetPixId(j);
-  
+
+  const UInt_t save = GetAverageAreas();
+
+  if (i==save)
+    return;
+  
+  fAverageAreas->Expand(i);
+  fAverageBadAreas->Expand(i);
+
   fNumUnsuitable.Set(i);
   fNumUnreliable.Set(i);
   fNumHiGainFADCSlices.Set(i);
   fNumLoGainFADCSlices.Set(i);
+
+  if (i < save)
+    return;
+
+  for (UInt_t j=save; j<i; j++)
+    (*fAverageBadAreas)[j] = new MBadPixelsPix;
+  
+  AddArea(save,i);
+
+  for (UInt_t j=save; j<i; j++)
+    GetAverageArea(j).SetPixId(j);
+
 }
 
 // -------------------------------------------------------------------
 //
-// Calls TClonesArray::ExpandCreate() for:
+// Calls TObjArray::ExpandCreate() for:
 // - fAverageSectors
 // - fAverageBadSectors
@@ -240 +297 @@
 void MCalibrationCam::InitAverageSectors(const UInt_t i)
 {
-  fAverageSectors->ExpandCreate(i);
-  fAverageBadSectors->ExpandCreate(i);
-
-  for (UInt_t j=0; j<i; j++)
+
+  const UInt_t save = GetAverageSectors();
+
+  if (i==save)
+    return;
+  
+  fAverageSectors->Expand(i);
+  fAverageBadSectors->Expand(i);
+
+  if (i < save)
+    return;
+
+  for (UInt_t j=save; j<i; j++)
+    (*fAverageBadSectors)[j] = new MBadPixelsPix;
+  
+  AddSector(save,i);
+
+  for (UInt_t j=save; j<i; j++)
     GetAverageSector(j).SetPixId(j);
-
 }
 
@@ -328 +398 @@
 // --------------------------------------------------------------------------
 //
-// Returns the current size of the TClonesArray fAverageAreas
+// Returns the current size of the TObjArray fAverageAreas
 // independently if the MCalibrationPix is filled with values or not.
 //
@@ -338 +408 @@
 // --------------------------------------------------------------------------
 //
-// Returns the current size of the TClonesArray fAverageSectors
+// Returns the current size of the TObjArray fAverageSectors
 // independently if the MCalibrationPix is filled with values or not.
 //
@@ -367 +437 @@
 // --------------------------------------------------------------------------
 //
-// Returns the current size of the TClonesArray fPixels 
+// Returns the current size of the TObjArray fPixels 
 // independently if the MCalibrationPix is filled with values or not.
 //
 const Int_t MCalibrationCam::GetSize() const
 {
-  return fPixels->GetEntriesFast();
+  return fPixels->GetEntries();
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.cc

@@ -75 +75 @@
 #include "MCalibrationQECam.h"
 
-#include <TClonesArray.h>
+#include <TObjArray.h>
 
 #include "MLog.h"
@@ -93 +93 @@
 // Default constructor. 
 //
-// Creates a TClonesArray of MCalibrationQEPix containers, initialized to 1 entry, destinated 
-// to hold one container per pixel. Later, a call to MCalibrationQECam::InitSize() 
-// has to be performed (in MGeomApply). 
-//
-// Creates a TClonesArray of MCalibrationQEPix containers, initialized to 1 entry, destinated 
-// to hold one container per pixel AREA. Later, a call to MCalibrationQECam::InitAreas() 
-// has to be performed (in MGeomApply). 
-//
-// Creates a TClonesArray of MCalibrationQEPix containers, initialized to 1 entry, destinated
-// to hold one container per camera SECTOR. Later, a call to MCalibrationQECam::InitSectors() 
-// has to be performed (in MGeomApply). 
-//
 MCalibrationQECam::MCalibrationQECam(const char *name, const char *title)
 {
@@ -110 +98 @@
     fTitle = title ? title : "Storage container for the calibrated Quantum Efficiency of the camera";
 
-    fPixels             = new TClonesArray("MCalibrationQEPix",1);
-    fAverageAreas       = new TClonesArray("MCalibrationQEPix",1);
-    fAverageSectors     = new TClonesArray("MCalibrationQEPix",1);
-    fAverageBadAreas    = new TClonesArray("MBadPixelsPix",1);
-    fAverageBadSectors  = new TClonesArray("MBadPixelsPix",1);
-
     fFlags.Set(MCalibrationCam::gkNumPulserColors);
 
     Clear();
+}
+
+void MCalibrationQECam::Add(const UInt_t a, const UInt_t b)
+{
+  for (UInt_t i=a; i<b; i++)
+    (*fPixels)[i] = new MCalibrationQEPix;
+}
+
+void MCalibrationQECam::AddArea(const UInt_t a, const UInt_t b)
+{
+  for (UInt_t i=a; i<b; i++)
+    (*fAverageAreas)[i] = new MCalibrationQEPix;
+}
+
+void MCalibrationQECam::AddSector(const UInt_t a, const UInt_t b)
+{
+  for (UInt_t i=a; i<b; i++)
+    (*fAverageSectors)[i] = new MCalibrationQEPix;
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.h

@@ -26 +26 @@
          kPINDiodeMethodValid, kCombinedMethodValid }; // Possible validity bits
 
+  void Add(const UInt_t a, const UInt_t b);
+  void AddArea(const UInt_t a, const UInt_t b);
+  void AddSector(const UInt_t a, const UInt_t b);
+
+  
 protected:
 
@@ -71 +76 @@
   void    SetPINDiodeMethodValid   ( const Bool_t  b, MCalibrationCam::PulserColor_t col);  
 
-  ClassDef(MCalibrationQECam, 1) // Container Quantum Efficieny Calibration Results Camera
+  ClassDef(MCalibrationQECam, 2) // Container Quantum Efficieny Calibration Results Camera
 };