Changeset 5137 for trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

Timestamp:

09/25/04 14:01:50 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc (modified) (40 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc

@@ -26 +26 @@
 // MHCalibrationCam                                               
 //
-// Base class for camera calibration classes. Incorporates the TObjArray's:
+// Base class for camera calibration classes. Incorporates the TOrdCollection's:
 // - fHiGainArray (for calibrated High Gains per pixel)
 // - fLoGainArray (for calibrated Low Gains per pixel) 
@@ -33 +33 @@
 // - fAverageHiGainSectors (for averaged High Gains events per camera sector )
 // - fAverageLoGainSectors (for averaged High Gains events per camera sector )
-// These TObjArray's are called by their default constructors, thus no objects 
+// These TOrdCollection's are called by their default constructors, thus no objects 
 // are created, until the derived class does so. 
 //
@@ -61 +61 @@
 #include <TText.h>
 #include <TPaveText.h>
+#include <TOrdCollection.h>
+#include <TROOT.h>
 
 #include "MLog.h"
@@ -117 +119 @@
 {
 
-    fHiGainArray = new TObjArray;
+    fHiGainArray = new TOrdCollection;
     fHiGainArray->SetOwner();
-    
-    fLoGainArray = new TObjArray;
+
+    fLoGainArray = new TOrdCollection;
     fLoGainArray->SetOwner();
 
-    fAverageHiGainAreas = new TObjArray;
+    fAverageHiGainAreas = new TOrdCollection;
     fAverageHiGainAreas->SetOwner();
 
-    fAverageLoGainAreas = new TObjArray;
+    fAverageLoGainAreas = new TOrdCollection;
     fAverageLoGainAreas->SetOwner();
 
-    fAverageHiGainSectors = new TObjArray;
+    fAverageHiGainSectors = new TOrdCollection;
     fAverageHiGainSectors->SetOwner();
 
-    fAverageLoGainSectors = new TObjArray;
+    fAverageLoGainSectors = new TOrdCollection;
     fAverageLoGainSectors->SetOwner();
 
@@ -146 +148 @@
 // --------------------------------------------------------------------------
 //
-// Returns size of fHiGainArray
-//
-const Int_t MHCalibrationCam::GetSize() const
-{
-  return fHiGainArray->GetSize();
-}
-
-// --------------------------------------------------------------------------
-//
-// Deletes the TClonesArray of:
+// Deletes the TOrdCollection of:
 // - fHiGainArray, fLoGainArray
 // - fAverageHiGainAreas, fAverageLoGainAreas
@@ -171 +164 @@
   delete fAverageHiGainSectors;
   delete fAverageLoGainSectors;
-}
-
-// --------------------------------------------------------------------------
+  /*
+
+  Remove ( fHiGainArray );
+  Remove ( fLoGainArray );
+
+  Remove ( fAverageHiGainAreas );
+  Remove ( fAverageLoGainAreas );
+
+  Remove ( fAverageHiGainSectors );
+  Remove ( fAverageLoGainSectors );
+  */
+
+}
+
+void MHCalibrationCam::Remove(TOrdCollection *col)
+{
+
+  if (!col)
+    return;
+
+  TOrdCollectionIter Next(col);
+  
+  Int_t count = 0;
+
+  while (MHCalibrationPix *obj = (MHCalibrationPix*)Next())
+    {
+      *fLog << ++count << " " << obj << flush;
+      if (obj && obj->IsOnHeap())
+        {
+          obj->Draw();
+          delete obj;
+        }
+    }
+  
+  delete col;
+}
+
+// --------------------------------------------------------------------------
+//
+// Returns size of fHiGainArray
+//
+const Int_t MHCalibrationCam::GetSize() const
+{
+  return fHiGainArray->GetSize();
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th High Gain pixel (pixel number)
+//
+MHCalibrationPix &MHCalibrationCam::operator[](UInt_t i)
+{
+  return *static_cast<MHCalibrationPix*>(fHiGainArray->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th High Gain pixel (pixel number)
+//
+const MHCalibrationPix &MHCalibrationCam::operator[](UInt_t i) const
+{
+  return *static_cast<MHCalibrationPix*>(fHiGainArray->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th Low Gain pixel (pixel number)
+//
+MHCalibrationPix  &MHCalibrationCam::operator()(UInt_t i)
+{
+  return *static_cast<MHCalibrationPix*>(fLoGainArray->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th Low Gain pixel (pixel number)
+//
+const MHCalibrationPix  &MHCalibrationCam::operator()(UInt_t i) const
+{
+  return *static_cast<MHCalibrationPix*>(fLoGainArray->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Returns the current size of the TOrdCollection fAverageHiGainAreas
+// independently if the MHCalibrationPix is filled with values or not.
+//
+const Int_t MHCalibrationCam::GetAverageAreas() const
+{
+  return fAverageHiGainAreas->GetSize();
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th High Gain pixel Area (area number)
+//
+MHCalibrationPix  &MHCalibrationCam::GetAverageHiGainArea(UInt_t i)
+{
+  return *static_cast<MHCalibrationPix*>(fAverageHiGainAreas->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th High Gain pixel Area (area number)
+//
+const MHCalibrationPix  &MHCalibrationCam::GetAverageHiGainArea(UInt_t i) const
+{
+  return *static_cast<MHCalibrationPix *>(fAverageHiGainAreas->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th Low Gain pixel Area (area number)
+//
+MHCalibrationPix  &MHCalibrationCam::GetAverageLoGainArea(UInt_t i)
+{
+  return *static_cast<MHCalibrationPix*>(fAverageLoGainAreas->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th Low Gain pixel Area (area number)
+//
+const MHCalibrationPix  &MHCalibrationCam::GetAverageLoGainArea(UInt_t i) const
+{
+  return *static_cast<MHCalibrationPix*>(fAverageLoGainAreas->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Returns the current size of the TOrdCollection fAverageHiGainSectors
+// independently if the MHCalibrationPix is filled with values or not.
+//
+const Int_t MHCalibrationCam::GetAverageSectors() const
+{
+  return fAverageHiGainSectors->GetSize();
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th High Gain Sector (sector number)
+//
+MHCalibrationPix  &MHCalibrationCam::GetAverageHiGainSector(UInt_t i)
+{
+  return *static_cast<MHCalibrationPix*>(fAverageHiGainSectors->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th High Gain Sector (sector number)
+//
+const MHCalibrationPix  &MHCalibrationCam::GetAverageHiGainSector(UInt_t i) const
+{
+  return *static_cast<MHCalibrationPix*>(fAverageHiGainSectors->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th Low Gain Sector (sector number)
+//
+MHCalibrationPix  &MHCalibrationCam::GetAverageLoGainSector(UInt_t i)
+{
+  return *static_cast<MHCalibrationPix*>(fAverageLoGainSectors->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Get i-th Low Gain Sector (sector number)
+//
+const MHCalibrationPix  &MHCalibrationCam::GetAverageLoGainSector(UInt_t i) const
+{
+  return *static_cast<MHCalibrationPix*>(fAverageLoGainSectors->At(i));
+}
+
+// --------------------------------------------------------------------------
+//
+// Calls ResetHistTitles()
 //
 // Calls Reset() for each entry in:
@@ -183 +350 @@
 {
   
+  ResetHistTitles();
+
   if (fHiGainArray)
     { fHiGainArray->ForEach(MHCalibrationPix,Reset)();  }
+
   if (IsAverageing())
     {
@@ -209 +379 @@
 // --------------------------------------------------------------------------
 //
-// Get i-th High Gain pixel (pixel number)
-//
-MHCalibrationPix &MHCalibrationCam::operator[](UInt_t i)
-{
-  return *static_cast<MHCalibrationPix*>(fHiGainArray->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th High Gain pixel (pixel number)
-//
-const MHCalibrationPix &MHCalibrationCam::operator[](UInt_t i) const
-{
-  return *static_cast<MHCalibrationPix*>(fHiGainArray->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th Low Gain pixel (pixel number)
-//
-MHCalibrationPix  &MHCalibrationCam::operator()(UInt_t i)
-{
-  return *static_cast<MHCalibrationPix*>(fLoGainArray->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th Low Gain pixel (pixel number)
-//
-const MHCalibrationPix  &MHCalibrationCam::operator()(UInt_t i) const
-{
-  return *static_cast<MHCalibrationPix*>(fLoGainArray->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Returns the current size of the TObjArray fAverageHiGainAreas
-// independently if the MHCalibrationPix is filled with values or not.
-//
-const Int_t MHCalibrationCam::GetAverageAreas() const
-{
-  return fAverageHiGainAreas->GetEntries();
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th High Gain pixel Area (area number)
-//
-MHCalibrationPix  &MHCalibrationCam::GetAverageHiGainArea(UInt_t i)
-{
-  return *static_cast<MHCalibrationPix*>(fAverageHiGainAreas->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th High Gain pixel Area (area number)
-//
-const MHCalibrationPix  &MHCalibrationCam::GetAverageHiGainArea(UInt_t i) const
-{
-  return *static_cast<MHCalibrationPix *>(fAverageHiGainAreas->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th Low Gain pixel Area (area number)
-//
-MHCalibrationPix  &MHCalibrationCam::GetAverageLoGainArea(UInt_t i)
-{
-  return *static_cast<MHCalibrationPix*>(fAverageLoGainAreas->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th Low Gain pixel Area (area number)
-//
-const MHCalibrationPix  &MHCalibrationCam::GetAverageLoGainArea(UInt_t i) const
-{
-  return *static_cast<MHCalibrationPix*>(fAverageLoGainAreas->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Returns the current size of the TObjArray fAverageHiGainSectors
-// independently if the MHCalibrationPix is filled with values or not.
-//
-const Int_t MHCalibrationCam::GetAverageSectors() const
-{
-  return fAverageHiGainSectors->GetEntries();
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th High Gain Sector (sector number)
-//
-MHCalibrationPix  &MHCalibrationCam::GetAverageHiGainSector(UInt_t i)
-{
-  return *static_cast<MHCalibrationPix*>(fAverageHiGainSectors->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th High Gain Sector (sector number)
-//
-const MHCalibrationPix  &MHCalibrationCam::GetAverageHiGainSector(UInt_t i) const
-{
-  return *static_cast<MHCalibrationPix*>(fAverageHiGainSectors->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th Low Gain Sector (sector number)
-//
-MHCalibrationPix  &MHCalibrationCam::GetAverageLoGainSector(UInt_t i)
-{
-  return *static_cast<MHCalibrationPix*>(fAverageLoGainSectors->UncheckedAt(i));
-}
-
-// --------------------------------------------------------------------------
-//
-// Get i-th Low Gain Sector (sector number)
-//
-const MHCalibrationPix  &MHCalibrationCam::GetAverageLoGainSector(UInt_t i) const
-{
-  return *static_cast<MHCalibrationPix*>(fAverageLoGainSectors->UncheckedAt(i));
+// Resets the histogram titles for each entry in:
+// - fHiGainArray, fLoGainArray
+// - fAverageHiGainAreas, fAverageLoGainAreas
+// - fAverageHiGainSectors, fAverageLoGainSectors
+//
+void MHCalibrationCam::ResetHistTitles()
+{
+  
+  TH1F *h;
+
+  if (fHiGainArray)
+    for (Int_t i=0;i<fHiGainArray->GetSize(); i++)
+      {
+        MHCalibrationPix &pix = (*this)[i];        
+        h = pix.GetHGausHist();
+        h->SetName (Form("%s%s%s%4i","H",fHistName.Data(),"HiGainPix",i));
+        h->SetTitle(Form("%s%s%4i%s",fHistTitle.Data()," High Gain Pixel ",i," Runs: "));  
+        h->SetXTitle(fHistXTitle.Data());
+        h->SetYTitle(fHistYTitle.Data());
+      }
+  
+  if (IsAverageing())
+    {
+      if (fAverageHiGainAreas)
+        for (Int_t j=0; j<fAverageHiGainAreas->GetSize(); j++)
+          {
+            MHCalibrationPix &pix = GetAverageHiGainArea(j);        
+            h = pix.GetHGausHist();
+            h->SetName (Form("%s%s%s%d","H",fHistName.Data(),"HiGainArea",j));
+            h->SetXTitle(fHistXTitle.Data());
+            h->SetYTitle(fHistYTitle.Data());
+            if (fGeom->InheritsFrom("MGeomCamMagic"))
+              h->SetTitle(Form("%s%s%s%s",fHistTitle.Data()," averaged on event-by-event basis ",
+                               j==0 ? "Inner Pixels " : "Outer Pixels ","High Gain Runs: "));
+            else
+              h->SetTitle(Form("%s%s%d%s",fHistTitle.Data(),
+                               " averaged on event-by-event basis High Gain Area Idx ",j," Runs: "));
+          }
+      
+      if (fAverageHiGainSectors)
+        for (Int_t j=0; j<fAverageHiGainSectors->GetSize(); j++)
+          {
+            MHCalibrationPix &pix = GetAverageHiGainSector(j);        
+            h = pix.GetHGausHist();
+            h->SetName (Form("%s%s%s%2i","H",fHistName.Data(),"HiGainSector",j));
+            h->SetTitle(Form("%s%s%2i%s",fHistTitle.Data(),
+                             " averaged on event-by-event basis High Gain Sector ",j," Runs: "));
+            h->SetXTitle(fHistXTitle.Data());
+            h->SetYTitle(fHistYTitle.Data());
+          }
+    }
+  
+  if (!IsLoGain())
+    return;
+  
+  if (fLoGainArray)
+    for (Int_t i=0;i<fLoGainArray->GetSize(); i++)
+      {
+        MHCalibrationPix &pix = (*this)(i);        
+        h = pix.GetHGausHist();
+        h->SetName (Form("%s%s%s%4i","H",fHistName.Data(),"LoGainPix",i));
+        h->SetTitle(Form("%s%s%4i%s",fHistTitle.Data()," Low Gain Pixel ",i," Runs: "));  
+        h->SetXTitle(fHistXTitle.Data());
+        h->SetYTitle(fHistYTitle.Data());
+      }
+  
+  if (IsAverageing())
+    {
+      if (fAverageLoGainAreas)
+        for (Int_t j=0; j<fAverageLoGainAreas->GetSize(); j++)
+          {
+            MHCalibrationPix &pix = GetAverageLoGainArea(j);        
+            h = pix.GetHGausHist();
+            h->SetName (Form("%s%s%s%d","H",fHistName.Data(),"LoGainArea",j));
+            h->SetXTitle(fHistXTitle.Data());
+            h->SetYTitle(fHistYTitle.Data());
+            if (fGeom->InheritsFrom("MGeomCamMagic"))
+              h->SetTitle(Form("%s%s%s%s",fHistTitle.Data()," averaged on event-by-event basis ",
+                               j==0 ? "Inner Pixels " : "Outer Pixels ","Low Gain Runs: "));
+            else
+              h->SetTitle(Form("%s%s%d%s",fHistTitle.Data(),
+                               " averaged on event-by-event basis Low Gain Area Idx ",j," Runs: "));
+          }
+      
+      if (fAverageLoGainSectors)
+        for (Int_t j=0; j<fAverageLoGainSectors->GetSize(); j++)
+          {
+            MHCalibrationPix &pix = GetAverageLoGainSector(j);        
+            h = pix.GetHGausHist();
+            h->SetName (Form("%s%s%s%2i","H",fHistName.Data(),"LoGainSector",j));
+            h->SetTitle(Form("%s%s%2i%s",fHistTitle.Data(),
+                             " averaged on event-by-event basis Low Gain Sector ",j," Runs: "));
+            h->SetXTitle(fHistXTitle.Data());
+            h->SetYTitle(fHistYTitle.Data());
+          }
+    }
 }
 
@@ -381 +523 @@
 
 // --------------------------------------------------------------------------
+//
+// Searches MRawEvtHeader to find the correct pulser colour
 //
 // Gets or creates the pointers to:
@@ -487 +631 @@
     return kFALSE;
 
+  ResetHistTitles();
+
   if (!fRunHeader)
     return kTRUE;
   
-  for (Int_t i=0; i<fHiGainArray->GetEntries(); i++)
+  for (Int_t i=0; i<fHiGainArray->GetSize(); i++)
     {
       TH1F *h = (*this)[i].GetHGausHist();
@@ -497 +643 @@
 
   if (IsLoGain())
-    for (Int_t i=0; i<fLoGainArray->GetEntries(); i++)
+    for (Int_t i=0; i<fLoGainArray->GetSize(); i++)
       {
         TH1F *h = (*this)(i).GetHGausHist();
@@ -538 +684 @@
 //
 // Initializes the High Gain Arrays:
-//
-// - Expand fHiGainArrays to npixels
-// - Expand fAverageHiGainAreas to nareas
-// - Expand fAverageHiGainSectors to nsectors
 // 
 // - For every entry in the expanded arrays: 
@@ -553 +695 @@
 {
 
-  if (fHiGainArray->GetEntries()==0)
+  if (fHiGainArray->GetSize()==0)
   {
-      fHiGainArray->Expand(npixels);
       for (Int_t i=0; i<npixels; i++)
       {
-        (*fHiGainArray)[i] = new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainPix"),
-                                                  Form("%s%s",fHistTitle.Data()," High Gain Pixel"));
+        fHiGainArray->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainPix"),
+                                                 Form("%s%s",fHistTitle.Data()," High Gain Pixel")),i);
         
         MHCalibrationPix &pix = (*this)[i];          
@@ -566 +707 @@
         pix.SetLast (fLast);
         
-        TH1F *h =  pix.GetHGausHist();
-        
-        h->SetName (Form("%s%s%s","H",fHistName.Data(),"HiGainPix"));
-        h->SetTitle(Form("%s%s",fHistTitle.Data()," High Gain Pixel "));  
-        h->SetXTitle(fHistXTitle.Data());
-        h->SetYTitle(fHistYTitle.Data());
-        
         MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
         InitHists(pix,bad,i);
@@ -581 +715 @@
     return;
 
-  if (fAverageHiGainAreas->GetEntries()==0)
+  if (fAverageHiGainAreas->GetSize()==0)
   {
-    fAverageHiGainAreas->Expand(nareas);
-    
     for (Int_t j=0; j<nareas; j++)
       {
-        (*fAverageHiGainAreas)[j] = new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainArea"),
-                                                         Form("%s%s",fHistTitle.Data()," High Gain Area Idx "));
+        fAverageHiGainAreas->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainArea"),
+                                                        Form("%s%s",fHistTitle.Data()," High Gain Area Idx ")),j);
         
         MHCalibrationPix &pix = GetAverageHiGainArea(j);
@@ -595 +727 @@
         pix.SetFirst(fFirst);
         pix.SetLast (fLast);
-        
-        TH1F *h =  pix.GetHGausHist();
-
-        h->SetName (Form("%s%s%s","H",fHistName.Data(),"HiGainArea"));
-        h->SetXTitle(fHistXTitle.Data());
-        h->SetYTitle(fHistYTitle.Data());
 
         if (fGeom && fGeom->InheritsFrom("MGeomCamMagic"))
           {
-            h->SetTitle(Form("%s%s%s%s",fHistTitle.Data()," averaged on event-by-event basis ",
-                             j==0 ? "Inner Pixels " : "Outer Pixels ","High Gain Runs: "));
             pix.InitBins();
             pix.SetEventFrequency(fPulserFrequency);
           }
         else
-          {
-            h->SetTitle(Form("%s%s",fHistTitle.Data()," averaged on event-by-event basis High Gain Area Idx ")); 
-            InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
-          }
+          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
       }
   }
 
-  if (fAverageHiGainSectors->GetEntries()==0)
-    {
-      fAverageHiGainSectors->Expand(nsectors);
-
+  if (fAverageHiGainSectors->GetSize()==0)
+    {
       for (Int_t j=0; j<nsectors; j++)
         {
-          (*fAverageHiGainSectors)[j] = new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainSector"),
-                                                             Form("%s%s",fHistTitle.Data()," High Gain Sector "));
+          fAverageHiGainSectors->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"HiGainSector"),
+                                                            Form("%s%s",fHistTitle.Data()," High Gain Sector ")),j);
           MHCalibrationPix &pix = GetAverageHiGainSector(j);
 
@@ -631 +750 @@
           pix.SetLast (fLast);
           
-          TH1F *h =  pix.GetHGausHist();
-
-          h->SetName (Form("%s%s%s","H",fHistName.Data(),"HiGainSector"));
-          h->SetTitle(Form("%s%s",fHistTitle.Data()," High Gain Sector "));  
-          h->SetXTitle(fHistXTitle.Data());
-          h->SetYTitle(fHistYTitle.Data());
-
           InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
       }
@@ -649 +761 @@
 // Initializes the Low Gain Arrays:
 //
-// - Expand fLoGainArrays to npixels
-// - Expand fAverageLoGainAreas to nareas
-// - Expand fAverageLoGainSectors to nsectors
-// 
 // - For every entry in the expanded arrays: 
 //   * Initialize an MHCalibrationPix
@@ -666 +774 @@
     return;
 
-  if (fLoGainArray->GetEntries()==0)
+  if (fLoGainArray->GetSize()==0)
   {
-      fLoGainArray->Expand(npixels);
       for (Int_t i=0; i<npixels; i++)
       {
-        (*fLoGainArray)[i] = new MHCalibrationPix(Form("%s%s",fHistName.Data(),"LoGainPix"),
-                                                  Form("%s%s",fHistTitle.Data()," Low Gain Pixel"));
+        fLoGainArray->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"LoGainPix"),
+                                                 Form("%s%s",fHistTitle.Data()," Low Gain Pixel")),i);
 
           MHCalibrationPix &pix = (*this)[i];          
@@ -679 +786 @@
           pix.SetLast (fLast);
 
-          TH1F *h =  pix.GetHGausHist();
-          
-          h->SetName (Form("%s%s%s","H",fHistName.Data(),"LoGainPix"));
-          h->SetTitle(Form("%s%s",fHistTitle.Data()," Low Gain Pixel "));  
-          h->SetXTitle(fHistXTitle.Data());
-          h->SetYTitle(fHistYTitle.Data());
-
           MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
           InitHists(pix,bad,i);
@@ -694 +794 @@
     return;
 
-  if (fAverageLoGainAreas->GetEntries()==0)
+  if (fAverageLoGainAreas->GetSize()==0)
   {
-    fAverageLoGainAreas->Expand(nareas);
-    
     for (Int_t j=0; j<nareas; j++)
       {
-        (*fAverageLoGainAreas)[j] = new MHCalibrationPix(Form("%s%s",fHistName.Data(),"LoGainArea"),
-                                                         Form("%s%s",fHistTitle.Data()," Low Gain Area Idx "));
+        fAverageLoGainAreas->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"LoGainArea"),
+                                                        Form("%s%s",fHistTitle.Data()," Low Gain Area Idx ")),j);
         
         MHCalibrationPix &pix = GetAverageLoGainArea(j);
@@ -709 +807 @@
         pix.SetLast (fLast);
         
-        TH1F *h =  pix.GetHGausHist();
-
-        h->SetName (Form("%s%s%s","H",fHistName.Data(),"LoGainArea"));
-        h->SetXTitle(fHistXTitle.Data());
-        h->SetYTitle(fHistYTitle.Data());
-
         if (fGeom && fGeom->InheritsFrom("MGeomCamMagic"))
           {
-            h->SetTitle(Form("%s%s%s%s",fHistTitle.Data()," averaged on event-by-event basis ",
-                             j==0 ? "Inner Pixels " : "Outer Pixels ","Low Gain Runs: "));
             pix.InitBins();
             pix.SetEventFrequency(fPulserFrequency);
           }
         else
-          {
-            h->SetTitle(Form("%s%s",fHistTitle.Data()," averaged on event-by-event basis Low Gain Area Idx ")); 
-            InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
-          }
+          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
       }
   }
 
-  if (fAverageLoGainSectors->GetEntries()==0)
-    {
-      fAverageLoGainSectors->Expand(nsectors);
-
+  if (fAverageLoGainSectors->GetSize()==0)
+    {
       for (Int_t j=0; j<nsectors; j++)
         {
-          (*fAverageLoGainSectors)[j] = new MHCalibrationPix(Form("%s%s",fHistName.Data(),"LoGainSector"),
-                                                             Form("%s%s",fHistTitle.Data()," Low Gain Sector "));
+          fAverageLoGainSectors->AddAt(new MHCalibrationPix(Form("%s%s",fHistName.Data(),"LoGainSector"),
+                                                            Form("%s%s",fHistTitle.Data()," Low Gain Sector ")),j);
           MHCalibrationPix &pix = GetAverageLoGainSector(j);
 
@@ -744 +829 @@
           pix.SetLast (fLast);
           
-          TH1F *h =  pix.GetHGausHist();
-
-          h->SetName (Form("%s%s%s","H",fHistName.Data(),"LoGainSector"));
-          h->SetTitle(Form("%s%s",fHistTitle.Data()," Low Gain Sector "));  
-          h->SetXTitle(fHistXTitle.Data());
-          h->SetYTitle(fHistYTitle.Data());
-
           InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
       }
@@ -763 +841 @@
 // - number of sectors
 //
-// Return kFALSE, if sizes of the TObjArrays do not match npixels, nareas or nsectors
+// Return kFALSE, if sizes of the TOrdCollections do not match npixels, nareas or nsectors
 // 
 // Call FillHists()
@@ -778 +856 @@
   
   //
-  // Hi-Gain ObjArrays
+  // Hi-Gain OrdCollections
   //
-  if (fHiGainArray->GetEntries() != npixels)
+  if (fHiGainArray->GetSize() != npixels)
     {
       *fLog << err << "ERROR - Size mismatch in number of pixels... abort." << endl;
@@ -788 +866 @@
   if (IsLoGain())
     {
-      if (fLoGainArray->GetEntries() != npixels)
+      if (fLoGainArray->GetSize() != npixels)
         {
           *fLog << err << "ERROR - Size mismatch in number of pixels... abort." << endl;
@@ -798 +876 @@
     return FillHists(par,w);
 
-  if (fAverageHiGainAreas->GetEntries() != nareas)
+  if (fAverageHiGainAreas->GetSize() != nareas)
     {
       *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl;
@@ -804 +882 @@
     }
   
-  if (fAverageHiGainSectors->GetEntries() != nsectors)
+  if (fAverageHiGainSectors->GetSize() != nsectors)
     {
       *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl;
@@ -813 +891 @@
     {
       
-      if (fAverageLoGainAreas->GetEntries() != nareas)
+      if (fAverageLoGainAreas->GetSize() != nareas)
         {
           *fLog << err << "ERROR - Size mismatch in number of areas ... abort." << endl;
@@ -819 +897 @@
         }
       
-      if (fAverageLoGainSectors->GetEntries() != nsectors)
+      if (fAverageLoGainSectors->GetSize() != nsectors)
         {
           *fLog << err << "ERROR - Size mismatch in number of sectors ... abort." << endl;
@@ -840 +918 @@
 {
 
-  if (fHiGainArray->GetEntries() == 0 && fLoGainArray->GetEntries() == 0)
+  if (fHiGainArray->GetSize() == 0 && fLoGainArray->GetSize() == 0)
     {
       *fLog << err << GetDescriptor() 
@@ -847 +925 @@
     }
   
+  for (Int_t i=0; i<fAverageHiGainAreas->GetSize(); i++)
+    {
+      TH1F *h = GetAverageHiGainArea(i).GetHGausHist();
+      switch (fColor)
+        {
+        case MCalibrationCam::kNONE: 
+          break;
+        case MCalibrationCam::kBLUE: 
+          h->SetTitle( Form("%s%s", h->GetTitle(),"BLUE "));
+          break;
+        case MCalibrationCam::kGREEN: 
+          h->SetTitle( Form("%s%s", h->GetTitle(),"GREEN "));
+          break;
+        case MCalibrationCam::kUV: 
+          h->SetTitle( Form("%s%s", h->GetTitle(),"UV "));
+          break;
+        case MCalibrationCam::kCT1: 
+          h->SetTitle( Form("%s%s", h->GetTitle(),"CT1-Pulser "));
+          break;
+        }
+    }
+
+  for (Int_t i=0; i<fAverageLoGainAreas->GetSize(); i++)
+    {
+      TH1F *h = GetAverageLoGainArea(i).GetHGausHist();
+      switch (fColor)
+        {
+        case MCalibrationCam::kNONE: 
+          break;
+        case MCalibrationCam::kBLUE: 
+          h->SetTitle( Form("%s%s", h->GetTitle(),"BLUE "));
+          break;
+        case MCalibrationCam::kGREEN: 
+          h->SetTitle( Form("%s%s", h->GetTitle(),"GREEN "));
+          break;
+        case MCalibrationCam::kUV: 
+          h->SetTitle( Form("%s%s", h->GetTitle(),"UV "));
+          break;
+        case MCalibrationCam::kCT1: 
+          h->SetTitle( Form("%s%s", h->GetTitle(),"CT1-Pulser "));
+          break;
+        }
+    }
+  
   if (!FinalizeHists())
     return kFALSE;
+
 
   FinalizeBadPixels();
@@ -873 +996 @@
 
   hist.InitBins();
-  hist.ChangeHistId(i);
   hist.SetEventFrequency(fPulserFrequency);
-
-  TH1F *h = hist.GetHGausHist();
-  h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
 }
 
@@ -904 +1023 @@
       
       FitHiGainHists(hist,pix,bad,fittyp,osctyp);
-      
     }
 
@@ -913 +1031 @@
     {
       
-      MHCalibrationPix     &hist = GetAverageHiGainArea(j);      
+      MHCalibrationPix &hist = GetAverageHiGainArea(j);      
       MCalibrationPix  &pix  = calcam.GetAverageArea(j);
       MBadPixelsPix    &bad  = calcam.GetAverageBadArea(j);        
-      
+
       FitHiGainHists(hist,pix,bad,fittyp,osctyp);
   }
   
-
   for (Int_t j=0; j<fAverageHiGainSectors->GetSize(); j++)
     {
-      
-      MHCalibrationPix     &hist = GetAverageHiGainSector(j);      
+      MHCalibrationPix &hist = GetAverageHiGainSector(j);      
       MCalibrationPix  &pix  = calcam.GetAverageSector(j);
       MBadPixelsPix    &bad  = calcam.GetAverageBadSector(j);        
-      
+
       FitHiGainHists(hist,pix,bad,fittyp,osctyp);
     }
-
 }
 
@@ -976 +1091 @@
   }
   
-
   for (Int_t j=0; j<fAverageLoGainSectors->GetSize(); j++)
     {
@@ -1045 +1159 @@
                                       MBadPixelsPix::UncalibratedType_t osctyp)
 {
-
 
   if (hist.IsEmpty() || hist.IsOnlyOverflow() || hist.IsOnlyUnderflow())
@@ -1088 +1201 @@
   if (IsDebug())
     {
-      *fLog << dbginf << GetDescriptor() << ": ID " << hist.GetPixId() 
+      *fLog << dbginf << GetDescriptor() << ": ID " << GetName() 
             << " HiGainSaturation: "   << pix.IsHiGainSaturation() 
             << " HiGainMean: "         << hist.GetMean    ()
@@ -1170 +1283 @@
   if (IsDebug())
     {
-      *fLog << dbginf << GetDescriptor() << "ID: " << hist.GetPixId() 
+      *fLog << dbginf << GetDescriptor() << "ID: " << hist.GetName() 
             << " HiGainSaturation: "   << pix.IsHiGainSaturation() 
             << " LoGainMean: "         << hist.GetMean    ()
@@ -1200 +1313 @@
     return;
 
-  const Int_t nareas = fAverageHiGainAreas->GetEntries();
+  const Int_t nareas = fAverageHiGainAreas->GetSize();
   if (nareas == 0)
     return;