Changeset 5043 for trunk/MagicSoft

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationBlindCam.cc (modified) (5 diffs)
• mcalib/MCalibrationCam.cc (modified) (27 diffs)
• mcalib/MCalibrationCam.h (modified) (2 diffs)
• mcalib/MCalibrationChargeCam.cc (modified) (4 diffs)
• mcalib/MCalibrationIntensityCam.cc (modified) (16 diffs)
• mcalib/MCalibrationQECam.cc (modified) (4 diffs)
• mcalib/MCalibrationRelTimeCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -61 +61 @@
 
  2004/09/15: Markus Gaug
+
+   * mcalib/MCalibration*Cam.[h,cc]
+     - replace TObjArray by TOrdCollection, otherwise the streamer does not work
 
    * mimage/MHillasCalc.[h,cc]

trunk/MagicSoft/Mars/mcalib/MCalibrationBlindCam.cc

@@ -30 +30 @@
 // the actual values of the MCalibrationBlindPix's. 
 //
-// Contains TObjArrays for the following objects:
-// - fBlindPixels:    Array of classes derived from MCalibrationBlindPix, one entry 
-//                    per blind pixel. 
+// Contains TOrdCollections for the following objects:
+// - fPixels:    Array of classes derived from MCalibrationBlindPix, one entry 
+//               per blind pixel. 
 //
-// All TObjArrays have to enlarged by the corresponding calls to (e.g. in MGeomApply): 
+// All TOrdCollections have to enlarged by the corresponding calls to (e.g. in MGeomApply): 
 // - InitSize()
 //
-// See also: MCalibrationBlindCamOneOldStyle
+// See also: MCalibrationBlindCamOneOldStyle, MCalibrationBlindCamTwoNewStyle
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -43 +43 @@
 #include "MCalibrationBlindPix.h"
 
-#include <TObjArray.h>
+#include <TOrdCollection.h>
 
 #include "MLogManip.h"
@@ -66 +66 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fPixels)[i] = new MCalibrationBlindPix;
+    fPixels->AddAt(new MCalibrationBlindPix,i);
 }
 
@@ -78 +78 @@
   MCalibrationBlindCam &calib = (MCalibrationBlindCam&)object;
   
-  //  MParContainer::Copy(calib);
-  
+  MCalibrationCam::Copy(calib);
+
+  /*  
   const UInt_t n = GetSize();
   if (n != 0)
@@ -87 +88 @@
         (*this)[i].Copy(calib[i]);
     }
+  */
 }
 
 
-// --------------------------------------------------------------------------
-//
-// Expands and creates new MCalibrationPix's. Cannot use ExpandCreate(), because
-// for some reason, the constructor of MCalibrationPix does not initialize the 
-// Arrays correctly, then.
-//
-void MCalibrationBlindCam::InitSize( const UInt_t n) 
-{
-  const UInt_t size = GetSize();
-  fPixels->Expand(n);
-
-  for (UInt_t i=size; i<n; i++)
-    (*fPixels)[i] = new MCalibrationBlindPix;
-
-}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -29 +29 @@
 // Base class for Camera Calibration results. 
 //
-// Contains TObjArrays for the following objects:
+// Contains TOrdCollections 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 TObjArrays have to enlarged by the corresponding calls to (e.g. in MGeomApply): 
+// All TOrdCollections have to enlarged by the corresponding calls to (e.g. in MGeomApply): 
 // - InitSize()
 // - InitAverageAreas()
@@ -50 +50 @@
 #include "MCalibrationCam.h"
 
-#include <TObjArray.h>
+#include <TOrdCollection.h>
 
 #include "MGeomCam.h"
@@ -82 +82 @@
 // - fNumLoGainFADCSlices to 0.
 //
-// Creates a TObjArray of MBadPixelsPix containers for the TObjArray's: 
+// Creates a TOrdCollection of MBadPixelsPix containers for the TOrdCollection's: 
 // - fAverageBadAreas
 // - fAverageBadSectors
@@ -94 +94 @@
 {
 
-  fPixels = new TObjArray;
+  fPixels = new TOrdCollection;
   fPixels->SetOwner();
 
-  fAverageAreas = new TObjArray;
+  fAverageAreas = new TOrdCollection;
   fAverageAreas->SetOwner();
   
-  fAverageSectors = new TObjArray;
+  fAverageSectors = new TOrdCollection;
   fAverageSectors->SetOwner();
 
-  fAverageBadAreas = new TObjArray;
+  fAverageBadAreas = new TOrdCollection;
   fAverageBadAreas->SetOwner();
   
-  fAverageBadSectors = new TObjArray;
+  fAverageBadSectors = new TOrdCollection;
   fAverageBadSectors->SetOwner();
 
@@ -221 +221 @@
 // -------------------------------------------------------------------
 //
-// Calls TObjArray::ExpandCreate() for fPixels
 //
 void MCalibrationCam::InitSize(const UInt_t i)
@@ -231 +230 @@
     return;
   
-  fPixels->Expand(i);
+  // Pixels->Expand(i);
 
   if (i>save)
@@ -240 +239 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fPixels)[i] = new MCalibrationPix;
+    fPixels->AddAt(new MCalibrationPix,i);
 }
 
@@ -246 +245 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fAverageAreas)[i] = new MCalibrationPix;
+    fAverageAreas->AddAt(new MCalibrationPix,i);
 }
 
@@ -252 +251 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fAverageSectors)[i] = new MCalibrationPix;
+    fAverageSectors->AddAt(new MCalibrationPix,i);
 }
 
@@ -270 +269 @@
     return;
   
-  fAverageAreas->Expand(i);
-  fAverageBadAreas->Expand(i);
+  //fAverageAreas->Expand(i);
+  //fAverageBadAreas->Expand(i);
 
   fNumUnsuitable.Set(i);
@@ -282 +281 @@
 
   for (UInt_t j=save; j<i; j++)
-    (*fAverageBadAreas)[j] = new MBadPixelsPix;
+    fAverageBadAreas->AddAt(new MBadPixelsPix,j);
   
   AddArea(save,i);
@@ -305 +304 @@
     return;
   
-  fAverageSectors->Expand(i);
-  fAverageBadSectors->Expand(i);
+  //fAverageSectors->Expand(i);
+  //fAverageBadSectors->Expand(i);
 
   if (i < save)
@@ -312 +311 @@
 
   for (UInt_t j=save; j<i; j++)
-    (*fAverageBadSectors)[j] = new MBadPixelsPix;
+    fAverageBadSectors->AddAt(new MBadPixelsPix,j);
   
   AddSector(save,i);
@@ -405 +404 @@
 const Int_t MCalibrationCam::GetAverageAreas() const
 {
-  return fAverageAreas->GetEntriesFast();
+  return fAverageAreas->GetSize();
 }
 
@@ -415 +414 @@
 const Int_t MCalibrationCam::GetAverageSectors() const
 {
-  return fAverageSectors->GetEntriesFast();
+  return fAverageSectors->GetSize();
 }
 
@@ -425 +424 @@
 MCalibrationPix &MCalibrationCam::operator[](UInt_t i)
 {
-  return *static_cast<MCalibrationPix*>(fPixels->UncheckedAt(i));
+  return *static_cast<MCalibrationPix*>(fPixels->At(i));
 }
 
@@ -434 +433 @@
 const MCalibrationPix &MCalibrationCam::operator[](UInt_t i) const
 {
-  return *static_cast<MCalibrationPix*>(fPixels->UncheckedAt(i));
+  return *static_cast<MCalibrationPix*>(fPixels->At(i));
 }
 
@@ -444 +443 @@
 const Int_t MCalibrationCam::GetSize() const
 {
-  return fPixels->GetEntriesFast();
+  return fPixels->GetSize();
 }
 
@@ -453 +452 @@
 MCalibrationPix &MCalibrationCam::GetAverageArea(const UInt_t i)
 {
-  return *static_cast<MCalibrationPix*>(fAverageAreas->UncheckedAt(i));
+  return *static_cast<MCalibrationPix*>(fAverageAreas->At(i));
 }
 
@@ -462 +461 @@
 const MCalibrationPix &MCalibrationCam::GetAverageArea(const UInt_t i) const 
 {
-  return *static_cast<MCalibrationPix*>(fAverageAreas->UncheckedAt(i));
+  return *static_cast<MCalibrationPix*>(fAverageAreas->At(i));
 }
 
@@ -471 +470 @@
 MCalibrationPix &MCalibrationCam::GetAverageSector(const UInt_t i)
 {
-  return *static_cast<MCalibrationPix*>(fAverageSectors->UncheckedAt(i));
+  return *static_cast<MCalibrationPix*>(fAverageSectors->At(i));
 }
 
@@ -480 +479 @@
 const MCalibrationPix &MCalibrationCam::GetAverageSector(const UInt_t i) const 
 {
-  return *static_cast<MCalibrationPix*>(fAverageSectors->UncheckedAt(i));
+  return *static_cast<MCalibrationPix*>(fAverageSectors->At(i));
 }
 
@@ -489 +488 @@
 MBadPixelsPix &MCalibrationCam::GetAverageBadArea(const UInt_t i)
 {
-  return *static_cast<MBadPixelsPix*>(fAverageBadAreas->UncheckedAt(i));
+  return *static_cast<MBadPixelsPix*>(fAverageBadAreas->At(i));
 }
 
@@ -498 +497 @@
 const MBadPixelsPix &MCalibrationCam::GetAverageBadArea(const UInt_t i) const 
 {
-  return *static_cast<MBadPixelsPix*>(fAverageBadAreas->UncheckedAt(i));
+  return *static_cast<MBadPixelsPix*>(fAverageBadAreas->At(i));
 }
 
@@ -507 +506 @@
 MBadPixelsPix &MCalibrationCam::GetAverageBadSector(const UInt_t i)
 {
-  return *static_cast<MBadPixelsPix*>(fAverageBadSectors->UncheckedAt(i));
+  return *static_cast<MBadPixelsPix*>(fAverageBadSectors->At(i));
 }
 
@@ -516 +515 @@
 const MBadPixelsPix &MCalibrationCam::GetAverageBadSector(const UInt_t i) const 
 {
-  return *static_cast<MBadPixelsPix*>(fAverageBadSectors->UncheckedAt(i));
+  return *static_cast<MBadPixelsPix*>(fAverageBadSectors->At(i));
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -15 +15 @@
 #endif
 
-class TObjArray;
+class TOrdCollection;
 
 class MCalibrationPix;
@@ -44 +44 @@
   PulserColor_t fPulserColor;        // Colour of the pulsed LEDs
 
-  TObjArray *fPixels;                // Array of MCalibrationPix, one per pixel
-  TObjArray *fAverageAreas;          // Array of MCalibrationPix, one per pixel area
-  TObjArray *fAverageSectors;        // Array of MCalibrationPix, one per camera sector
-  TObjArray *fAverageBadAreas;       // Array of MBadPixelsPix,   one per pixel area
-  TObjArray *fAverageBadSectors;     // Array of MBadPixelsPix,   one per camera sector
+  TOrdCollection *fPixels;            // Array of MCalibrationPix, one per pixel
+  TOrdCollection *fAverageAreas;      // Array of MCalibrationPix, one per pixel area
+  TOrdCollection *fAverageSectors;    // Array of MCalibrationPix, one per camera sector
+  TOrdCollection *fAverageBadAreas;   // Array of MBadPixelsPix,   one per pixel area
+  TOrdCollection *fAverageBadSectors; // Array of MBadPixelsPix,   one per camera sector
 
   virtual void Add(const UInt_t a, const UInt_t b);

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -82 +82 @@
 #include "MCalibrationChargeCam.h"
 
-#include <TObjArray.h>
+#include <TOrdCollection.h>
 
 #include "MLog.h"
@@ -118 +118 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Creates new MCalibrationCam only for the averaged areas:
+// the rest has to be retrieved directly, e.g. via: 
+//
+TObject *MCalibrationChargeCam::Clone(const char *) const
+{
+
+  //
+  // FIXME, this might be done faster and more elegant, by direct copy.
+  //
+  MCalibrationChargeCam *cam = new MCalibrationChargeCam(fName,fTitle);
+
+  cam->fNumUnsuitable        = fNumUnsuitable;
+  cam->fNumUnreliable        = fNumUnreliable;
+  cam->fNumHiGainFADCSlices  = fNumHiGainFADCSlices;
+  cam->fNumLoGainFADCSlices  = fNumLoGainFADCSlices;
+  cam->fPulserColor          = fPulserColor;
+
+  cam->fFlags                = fFlags;
+
+  cam->fNumPhotonsBlindPixelMethod      = fNumPhotonsBlindPixelMethod;
+  cam->fNumPhotonsFFactorMethod         = fNumPhotonsFFactorMethod;
+  cam->fNumPhotonsPINDiodeMethod        = fNumPhotonsPINDiodeMethod;
+  cam->fNumPhotonsBlindPixelMethodErr   = fNumPhotonsBlindPixelMethodErr;
+  cam->fNumPhotonsFFactorMethodErr      = fNumPhotonsFFactorMethodErr;
+  cam->fNumPhotonsPINDiodeMethodErr     = fNumPhotonsPINDiodeMethodErr;
+
+  for (Int_t i=0; i<GetSize(); i++)
+    cam->fPixels->AddAt((*this)[i].Clone(),i);
+  
+  for (Int_t i=0; i<GetAverageAreas(); i++)
+    {
+      cam->fAverageAreas->AddAt(GetAverageArea(i).Clone(),i);
+      cam->fAverageBadAreas->AddAt(GetAverageBadArea(i).Clone(),i);
+    }
+  for (Int_t i=0; i<GetAverageSectors(); i++)
+    {
+      cam->fAverageSectors->AddAt(GetAverageSector(i).Clone(),i);
+      cam->fAverageBadSectors->AddAt(GetAverageBadSector(i).Clone(),i);
+    }
+
+  return cam;
+}
+
 
 void MCalibrationChargeCam::Add(const UInt_t a, const UInt_t b)
 {
   for (UInt_t i=a; i<b; i++)
-    (*fPixels)[i] = new MCalibrationChargePix;
+    fPixels->AddAt(new MCalibrationChargePix,i);
 }
 
@@ -129 +174 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fAverageAreas)[i] = new MCalibrationChargePix;
+    fAverageAreas->AddAt(new MCalibrationChargePix,i);
 }
 
@@ -135 +180 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fAverageSectors)[i] = new MCalibrationChargePix;
+    fAverageSectors->AddAt(new MCalibrationChargePix,i);
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityCam.cc

@@ -66 +66 @@
   fCams = new TObjArray;
   fCams->SetOwner();
-}
+  
+}
+
 
 // --------------------------------------------------------------------------
@@ -214 +216 @@
 const Int_t MCalibrationIntensityCam::GetSize() const 
 {
-  return fCams->GetEntries();
+  return fCams->GetEntriesFast();
 }
 
@@ -223 +225 @@
 MCalibrationPix &MCalibrationIntensityCam::operator[](UInt_t i)
 {
-  return (*GetCam(GetSize()-1))[i];
+  return (*GetCam())[i];
 }
 
@@ -232 +234 @@
 const MCalibrationPix &MCalibrationIntensityCam::operator[](UInt_t i) const 
 {
-  return (*GetCam(GetSize()-1))[i];
+  return (*GetCam())[i];
 }
 
@@ -242 +244 @@
 const Int_t MCalibrationIntensityCam::GetAverageAreas() const
 {
-  return GetCam(GetSize()-1)->GetAverageAreas();
+  return GetCam()->GetAverageAreas();
 }
 
@@ -251 +253 @@
 MCalibrationPix  &MCalibrationIntensityCam::GetAverageArea(UInt_t i)
 {
-  return GetCam(GetSize()-1)->GetAverageArea(i);
+  return GetCam()->GetAverageArea(i);
 }
 
@@ -260 +262 @@
 const MCalibrationPix  &MCalibrationIntensityCam::GetAverageArea(UInt_t i) const
 {
-  return GetCam(GetSize()-1)->GetAverageArea(i);
+  return GetCam()->GetAverageArea(i);
 }
 
@@ -269 +271 @@
 MBadPixelsPix  &MCalibrationIntensityCam::GetAverageBadArea(UInt_t i)
 {
-  return GetCam(GetSize()-1)->GetAverageBadArea(i);
+  return GetCam()->GetAverageBadArea(i);
 }
 
@@ -278 +280 @@
 const MBadPixelsPix  &MCalibrationIntensityCam::GetAverageBadArea(UInt_t i) const
 {
-  return GetCam(GetSize()-1)->GetAverageBadArea(i);
+  return GetCam()->GetAverageBadArea(i);
 }
 
@@ -287 +289 @@
 const Int_t MCalibrationIntensityCam::GetAverageSectors() const
 {
-  return GetCam(GetSize()-1)->GetAverageSectors();
+  return GetCam()->GetAverageSectors();
 }
 
@@ -296 +298 @@
 MCalibrationPix  &MCalibrationIntensityCam::GetAverageSector(UInt_t i)
 {
-  return GetCam(GetSize()-1)->GetAverageSector(i);
+  return GetCam()->GetAverageSector(i);
 }
 
@@ -305 +307 @@
 const MCalibrationPix  &MCalibrationIntensityCam::GetAverageSector(UInt_t i) const
 {
-  return GetCam(GetSize()-1)->GetAverageSector(i);
+  return GetCam()->GetAverageSector(i);
 }
 
@@ -314 +316 @@
 MBadPixelsPix  &MCalibrationIntensityCam::GetAverageBadSector(UInt_t i)
 {
-  return GetCam(GetSize()-1)->GetAverageBadSector(i);
+  return GetCam()->GetAverageBadSector(i);
 }
 
@@ -323 +325 @@
 const MBadPixelsPix  &MCalibrationIntensityCam::GetAverageBadSector(UInt_t i) const
 {
-  return GetCam(GetSize()-1)->GetAverageBadSector(i);
+  return GetCam()->GetAverageBadSector(i);
 }
 
@@ -333 +335 @@
 MCalibrationCam *MCalibrationIntensityCam::GetCam(Int_t i)
 {
-  return static_cast<MCalibrationCam*>(fCams->UncheckedAt(i==-1 ? GetSize()-1 : i));
+  return static_cast<MCalibrationCam*>(fCams->Last());
 }
 
@@ -342 +344 @@
 const MCalibrationCam *MCalibrationIntensityCam::GetCam(Int_t i) const 
 {
-  return static_cast<MCalibrationCam*>(fCams->UncheckedAt(i==-1 ? GetSize()-1 : i));
+  return static_cast<MCalibrationCam*>(fCams->Last());
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationQECam.cc

@@ -75 +75 @@
 #include "MCalibrationQECam.h"
 
-#include <TObjArray.h>
+#include <TOrdCollection.h>
 
 #include "MLog.h"
@@ -106 +106 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fPixels)[i] = new MCalibrationQEPix;
+    fPixels->AddAt(new MCalibrationQEPix,i);
 }
 
@@ -112 +112 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fAverageAreas)[i] = new MCalibrationQEPix;
+    fAverageAreas->AddAt(new MCalibrationQEPix,i);
 }
 
@@ -118 +118 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fAverageSectors)[i] = new MCalibrationQEPix;
+    fAverageSectors->AddAt(new MCalibrationQEPix,i);
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCam.cc

@@ -76 +76 @@
 #include "MCalibrationCam.h"
 
-#include <TObjArray.h>
+#include <TOrdCollection.h>
 
 #include "MLog.h"
@@ -105 +105 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fPixels)[i] = new MCalibrationRelTimePix;
+    fPixels->AddAt(new MCalibrationRelTimePix,i);
 }
 
@@ -112 +112 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fAverageAreas)[i] = new MCalibrationRelTimePix;
+    fAverageAreas->AddAt(new MCalibrationRelTimePix,i);
 }
 
@@ -118 +118 @@
 {
   for (UInt_t i=a; i<b; i++)
-    (*fAverageSectors)[i] = new MCalibrationRelTimePix;
+    fAverageSectors->AddAt(new MCalibrationRelTimePix,i);
 }