Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3980)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 3982)
@@ -228,5 +228,5 @@
 const Float_t MCalibrationChargeCalc::fgLambdaErrLimit         = 0.2;
 const Float_t MCalibrationChargeCalc::fgLambdaCheckLimit       = 0.2;
-const Float_t MCalibrationChargeCalc::fgPheErrLimit            = 4.;
+const Float_t MCalibrationChargeCalc::fgPheErrLimit            = 5.;
 const Float_t MCalibrationChargeCalc::fgFFactorErrLimit        = 3.;
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc	(revision 3980)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc	(revision 3982)
@@ -72,5 +72,5 @@
 using namespace std;
 
-const Float_t MCalibrationRelTimeCalc::fgRelTimeRelErrLimit      = 7.5;
+const Float_t MCalibrationRelTimeCalc::fgRelTimeRelErrLimit      = 10.;
 // --------------------------------------------------------------------------
 //
@@ -343,5 +343,5 @@
       areasum2[aidx] /= (numareavalid[aidx]-1.);
       areasum [aidx] /= numareavalid[aidx];
-      lowlim  [aidx]  = areasum [aidx] - fRelTimeRelErrLimit*areasum2[aidx];
+      lowlim  [aidx]  = 0.;
       upplim  [aidx]  = areasum [aidx] + fRelTimeRelErrLimit*areasum2[aidx];
       
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.cc	(revision 3980)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.cc	(revision 3982)
@@ -115,4 +115,5 @@
   fTitle = title ? title : "Histogram class for testing the calibration";
   
+  SetAverageNbins(5000);
 }
 
@@ -165,10 +166,5 @@
 	  (*fHiGainArray)[i] = new MHCalibrationTestPix("Calibrated Events",
                                                 "Test Calibration Pixel");
-          if (!(*fBadPixels)[i].IsOK())
-            (*this)[i].SetExcluded();
-
-          (*this)[i].InitBins();
-          (*this)[i].ChangeHistId(i);
-          (*this)[i].SetEventFrequency(fPulserFrequency);
+          InitHists((*this)[i],(*fBadPixels)[i],i);
       }
   }
@@ -181,10 +177,5 @@
 	  (*fLoGainArray)[i] = new MHCalibrationTestPix("Calibrated Events",
                                                 "Test Calibration Pixel");
-          if (!(*fBadPixels)[i].IsOK())
-            (*this)[i].SetExcluded();
-
-          (*this)[i].InitBins();
-          (*this)[i].ChangeHistId(i);
-          (*this)[i].SetEventFrequency(fPulserFrequency);
+          InitHists((*this)(i),(*fBadPixels)[i],i);
       }
   }
@@ -207,4 +198,6 @@
         GetAverageHiGainArea(j).SetEventFrequency(fPulserFrequency);
 
+        TH1F *h =  GetAverageHiGainArea(j).GetHGausHist();
+        h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
       }
   }
@@ -245,4 +238,8 @@
           GetAverageHiGainSector(j).ChangeHistId(j);
           GetAverageHiGainSector(j).SetEventFrequency(fPulserFrequency);
+
+          TH1F *h =  GetAverageHiGainSector(j).GetHGausHist();
+          h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
+
       }
   }
@@ -307,4 +304,6 @@
   memset(sumareahi,   0, nareas * sizeof(Float_t));
   memset(sumsectorhi, 0, nsectors*sizeof(Float_t));
+  memset(numareahi,   0, nareas * sizeof(Int_t));
+  memset(numsectorhi, 0, nsectors*sizeof(Int_t));
   
   for (Int_t i=0; i<npixels; i++)
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationTestPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationTestPix.cc	(revision 3980)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationTestPix.cc	(revision 3982)
@@ -81,6 +81,6 @@
 
   fHGausHist.SetName("HCalibrationTest");
-  fHGausHist.SetTitle("Distribution of calibrated Summed FADC slices Pixel");  
-  fHGausHist.SetXTitle("Sum FADC Slices");
+  fHGausHist.SetTitle("Distribution of calibrated Photons Pixel");  
+  fHGausHist.SetXTitle("Nr. Photons");
   fHGausHist.SetYTitle("Nr. of events");
 
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationTestTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationTestTimeCam.cc	(revision 3980)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationTestTimeCam.cc	(revision 3982)
@@ -113,5 +113,6 @@
   fName  = name  ? name  : "MHCalibrationTestTimeCam";
   fTitle = title ? title : "Histogram class for testing the calibration of arrival times";
-  
+
+  SetAverageNbins(5000);
 }
 
@@ -195,4 +196,8 @@
         GetAverageHiGainArea(j).SetEventFrequency(fPulserFrequency);
 
+        TH1F *h =  GetAverageHiGainArea(j).GetHGausHist();
+        h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
+
+
       }
   }
@@ -233,4 +238,8 @@
           GetAverageHiGainSector(j).ChangeHistId(j);
           GetAverageHiGainSector(j).SetEventFrequency(fPulserFrequency);
+          TH1F *h =  GetAverageHiGainSector(j).GetHGausHist();
+          h->SetTitle( Form("%s%s", h->GetTitle()," Runs: "));
+
+
       }
   }
@@ -295,4 +304,6 @@
   memset(sumareahi,   0, nareas * sizeof(Float_t));
   memset(sumsectorhi, 0, nsectors*sizeof(Float_t));
+  memset(numareahi,   0, nareas * sizeof(Int_t));
+  memset(numsectorhi, 0, nsectors*sizeof(Int_t));
   
   for (Int_t i=0; i<npixels; i++)