Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc	(revision 4940)
+++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestCam.cc	(revision 4941)
@@ -175,5 +175,5 @@
       for (Int_t i=0; i<npixels; i++)
       {
-	  (*fHiGainArray)[i] = new MHCalibrationPix("Calibrated Events",
+	  (*fHiGainArray)[i] = new MHCalibrationPix("TestPix",
                                                 "Test Calibration Pixel");
 
@@ -186,6 +186,6 @@
           TH1F *h =  pix.GetHGausHist();
         
-          h->SetName ("HTestHiGainPix");
-          h->SetTitle("Distribution of calibrated Photons Pixel ");  
+          h->SetName ("HTestPix");
+          h->SetTitle("Calibrated Calibration Signals Pixel ");  
           h->SetXTitle("Nr. Photons");
           h->SetYTitle("Nr. of events");
@@ -203,8 +203,45 @@
       {
         (*fAverageHiGainAreas)[j] = 
-          new MHCalibrationPix("MHCalibrationTestAverageArea",
+          new MHCalibrationPix("TestArea",
                            "Average Test Calibrations Area Idx ");
 
         MHCalibrationPix &pix = GetAverageHiGainArea(j);
+
+        pix.SetNbins(fTestNbins*3);
+        pix.SetFirst(fTestFirst);
+        pix.SetLast (fTestLast);
+        
+        pix.InitBins();
+        pix.SetEventFrequency(fPulserFrequency);
+            
+        TH1F *h =  pix.GetHGausHist();
+
+        h->SetName ("HTestArea");
+        h->SetTitle("Calibrated Calibration Signals Area Idx ");
+        h->SetXTitle("Nr. Photons");
+        h->SetYTitle("Nr. of events");
+
+        if (fGeom->InheritsFrom("MGeomCamMagic"))
+          h->SetTitle(Form("%s%s%s","Calibrated Calibration Signals averaged on event-by-event basis ",
+                           j==0 ? "Inner Pixels " : "Outer Pixels Runs: "));
+        else
+          {
+            pix.ChangeHistId(j);
+            h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
+          }
+      }
+  }
+
+  if (fAverageHiGainSectors->GetEntries()==0)
+  {
+      fAverageHiGainSectors->Expand(nsectors);
+
+      for (Int_t j=0; j<nsectors; j++)
+      {
+	  (*fAverageHiGainSectors)[j] = 
+            new MHCalibrationPix("TestSector",
+                                 "Average Test Calibrations Sector ");
+
+        MHCalibrationPix &pix = GetAverageHiGainSector(j);
 
         pix.SetNbins(fTestNbins*3);
@@ -214,38 +251,6 @@
         TH1F *h =  pix.GetHGausHist();
 
-        h->SetName ("HTestPix");
-        h->SetTitle("Test Calibrations Area Idx ");
-        h->SetXTitle("Nr. Photons");
-        h->SetYTitle("Nr. of events");
-
-        pix.InitBins();
-        pix.ChangeHistId(j);
-        pix.SetEventFrequency(fPulserFrequency);
-
-        h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
-      }
-  }
-
-
-  if (fAverageHiGainSectors->GetEntries()==0)
-  {
-      fAverageHiGainSectors->Expand(nsectors);
-
-      for (Int_t j=0; j<nsectors; j++)
-      {
-	  (*fAverageHiGainSectors)[j] = 
-            new MHCalibrationPix("MHCalibrationTestAverageSector",
-                                 "Average Test Calibrations Sector ");
-
-        MHCalibrationPix &pix = GetAverageHiGainSector(j);
-
-        pix.SetNbins(fTestNbins*3);
-        pix.SetFirst(fTestFirst);
-        pix.SetLast (fTestLast);
-        
-        TH1F *h =  pix.GetHGausHist();
-
-        h->SetName ("HTestPix");
-        h->SetTitle("Test Calibrations Sector ");
+        h->SetName ("HTestSector");
+        h->SetTitle("Calibrated Calibration Signals Sector ");
         h->SetXTitle("Nr. Photons");
         h->SetYTitle("Nr. of events");
Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc	(revision 4940)
+++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationTestTimeCam.cc	(revision 4941)
@@ -83,5 +83,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #include "MHCalibrationTestTimeCam.h"
-#include "MHCalibrationTestTimePix.h"
 
 #include "MHCalibrationPix.h"
@@ -211,4 +210,7 @@
         pix.SetLast (fTestLast);
         
+        pix.InitBins();
+        pix.SetEventFrequency(fPulserFrequency);
+            
         TH1F *h =  pix.GetHGausHist();
 
@@ -218,9 +220,12 @@
         h->SetYTitle("Nr. of events");
 
-        pix.InitBins();
-        pix.ChangeHistId(j);
-        pix.SetEventFrequency(fPulserFrequency);
-
-        h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
+        if (fGeom->InheritsFrom("MGeomCamMagic"))
+          h->SetTitle(Form("%s%s%s","Calibrated Rel. Times averaged on event-by-event basis ",
+                           j==0 ? "Inner Pixels " : "Outer Pixels Runs: "));
+        else
+          {
+            pix.ChangeHistId(j);
+            h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
+          }
       }
   }