Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 5686)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 5687)
@@ -161,4 +161,5 @@
 const Axis_t  MHCalibrationChargeCam::fgChargeLoGainFirst = -350.5;
 const Axis_t  MHCalibrationChargeCam::fgChargeLoGainLast  =  2049.5;
+const Float_t MHCalibrationChargeCam::fgProbLimit         = 0.00001;
 const TString MHCalibrationChargeCam::gsHistName          = "Charge";
 const TString MHCalibrationChargeCam::gsHistTitle         = "Signals";
@@ -225,4 +226,6 @@
   SetLast (fgChargeHiGainLast );
 
+  SetProbLimit(fgProbLimit);
+
   SetLoGainNbins(fgChargeLoGainNbins);
   SetLoGainFirst(fgChargeLoGainFirst);
@@ -464,6 +467,6 @@
       for (Int_t i=0; i<npixels; i++)
       {
-        fHiGainArray->AddAt(new MHCalibrationChargePix(Form("%s%s%4i",fHistName.Data(),"HiGainPix",i),
-                                                       Form("%s%s%4i",fHistTitle.Data()," High Gain Pixel",i)),i);
+        fHiGainArray->AddAt(new MHCalibrationChargePix(Form("%sHiGainPix%04d",fHistName.Data(),i),
+                                                       Form("%s High Gain Pixel%04d",fHistTitle.Data(),i)),i);
 
         MHCalibrationChargePix &pix = (MHCalibrationChargePix&)(*this)[i];
@@ -473,17 +476,18 @@
         pix.SetLast (fLast);
 
+        pix.SetProbLimit(fProbLimit);
+
         pix.SetAbsTimeNbins(higainsamples);
         pix.SetAbsTimeFirst(-0.5);
         pix.SetAbsTimeLast(higainsamples-0.5);
 
+        InitHists(pix,fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i],i);
+
         h = pix.GetHAbsTime();
 
-        h->SetName (Form("%s%s%s%4i","H",fAbsHistName.Data(),"HiGainPix",i));
-        h->SetTitle(Form("%s%s%4i",fAbsHistTitle.Data()," High Gain Pixel ",i));
+        h->SetName (Form("H%sHiGainPix%04d",fAbsHistName.Data(),i));
+        h->SetTitle(Form("%s High Gain Pixel %04d",fAbsHistTitle.Data(),i));
         h->SetXTitle(fAbsHistXTitle.Data());
         h->SetYTitle(fAbsHistYTitle.Data());
-
-        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
-        InitHists((*this)[i],bad,i);
       }
   }
@@ -494,6 +498,6 @@
     for (Int_t j=0; j<nareas; j++)
       {
-        fAverageHiGainAreas->AddAt(new MHCalibrationChargePix(Form("%s%s%d",fHistName.Data(),"HiGainArea",j),
-                                                  Form("%s%s%d",fHistTitle.Data()," High Gain Area Idx ",j)),j);
+        fAverageHiGainAreas->AddAt(new MHCalibrationChargePix(Form("%sHiGainArea%d",fHistName.Data(),j),
+                                                  Form("%s High Gain Area Idx %d",fHistTitle.Data(),j)),j);
         
         MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageHiGainArea(j);
@@ -511,5 +515,5 @@
         h =  pix.GetHAbsTime();
         
-        h->SetName (Form("%s%s%s%d","H",fAbsHistName.Data(),"HiGainArea",j));
+        h->SetName (Form("H%sHiGainArea%d",fAbsHistName.Data(),j));
         h->SetTitle(Form("%s%s%d",fAbsHistTitle.Data(),
                          " averaged on event-by-event basis High Gain Area Idx ",j));
@@ -523,6 +527,6 @@
       for (Int_t j=0; j<nsectors; j++)
         {
-	  fAverageHiGainSectors->AddAt(new MHCalibrationChargePix(Form("%s%s%2i",fHistName.Data(),"HiGainSector",j),
-                                                      Form("%s%s%2i",fHistTitle.Data()," High Gain Sector ",j)),j);
+	  fAverageHiGainSectors->AddAt(new MHCalibrationChargePix(Form("%sHiGainSector%02d",fHistName.Data(),j),
+                                                      Form("%s High Gain Sector %02d",fHistTitle.Data(),j)),j);
 
           MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageHiGainSector(j);
@@ -536,13 +540,13 @@
           pix.SetAbsTimeLast(higainsamples-0.5);
           
+          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+
           h =  pix.GetHAbsTime();
           
-          h->SetName (Form("%s%s%s%2i","H",fAbsHistName.Data(),"HiGainSector",j));
-          h->SetTitle(Form("%s%s%2i",fAbsHistTitle.Data(),
+          h->SetName (Form("H%sHiGainSector%02d",fAbsHistName.Data(),j));
+          h->SetTitle(Form("%s%s%02d",fAbsHistTitle.Data(),
                            " averaged on event-by-event basis High Gain Area Sector ",j));
           h->SetXTitle(fAbsHistXTitle.Data());
           h->SetYTitle(fAbsHistYTitle.Data());
-          
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
       }
   }
@@ -582,6 +586,6 @@
       for (Int_t i=0; i<npixels; i++)
         {
-          fLoGainArray->AddAt(new MHCalibrationChargePix(Form("%s%s%4i",fHistName.Data(),"LoGainPix",i),
-                                       Form("%s%s%4i",fHistTitle.Data()," Low Gain Pixel",i)),i);
+          fLoGainArray->AddAt(new MHCalibrationChargePix(Form("%sLoGainPix%04d",fHistName.Data(),i),
+                                       Form("%s Low Gain Pixel %04d",fHistTitle.Data(),i)),i);
 
           MHCalibrationChargePix &pix = (MHCalibrationChargePix&)(*this)(i);
@@ -591,17 +595,18 @@
           pix.SetLast (fLoGainLast);
           
+          pix.SetProbLimit(fProbLimit);
+
           pix.SetAbsTimeNbins(logainsamples);
           pix.SetAbsTimeFirst(-0.5);
           pix.SetAbsTimeLast(logainsamples-0.5);
           
+          InitHists(pix,fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i],i);
+
           h = pix.GetHAbsTime();
           
-          h->SetName (Form("%s%s%s%4i","H",fAbsHistName.Data(),"HiGainPix",i));
-          h->SetTitle(Form("%s%s%4i",fAbsHistTitle.Data()," High Gain Pixel ",i));
+          h->SetName (Form("H%sLoGainPix%04d",fAbsHistName.Data(),i));
+          h->SetTitle(Form("%s Low Gain Pixel %04d",fAbsHistTitle.Data(),i));
           h->SetXTitle(fAbsHistXTitle.Data());
           h->SetYTitle(fAbsHistYTitle.Data());
-
-          MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
-          InitHists(pix,bad,i);
       }
   }
@@ -611,6 +616,6 @@
       for (Int_t j=0; j<nareas; j++)
         {
-	  fAverageLoGainAreas->AddAt(new MHCalibrationChargePix(Form("%s%s%d",fHistName.Data(),"LoGainArea",j),
-                                       Form("%s%s%d",fHistTitle.Data()," Low Gain Area Idx ",j)),j);
+	  fAverageLoGainAreas->AddAt(new MHCalibrationChargePix(Form("%sLoGainArea%d",fHistName.Data(),j),
+                                       Form("%s Low Gain Area Idx %d",fHistTitle.Data(),j)),j);
         
           MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageLoGainArea(j);
@@ -624,13 +629,13 @@
           pix.SetAbsTimeLast(logainsamples-0.5);
           
+          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+
           h =  pix.GetHAbsTime();
           
-          h->SetName (Form("%s%s%s%2i","H",fAbsHistName.Data(),"LoGainArea",j));
-          h->SetTitle(Form("%s%s%2i",fAbsHistTitle.Data(),
+          h->SetName (Form("H%sLoGainArea%02d",fAbsHistName.Data(),j));
+          h->SetTitle(Form("%s%s%02d",fAbsHistTitle.Data(),
                            " averaged on event-by-event basis Low Gain Area Idx ",j));
           h->SetXTitle(fAbsHistXTitle.Data());
           h->SetYTitle(fAbsHistYTitle.Data());
-          
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
         }
     }
@@ -641,6 +646,6 @@
     for (Int_t j=0; j<nsectors; j++)
       {
-        fAverageLoGainSectors->AddAt(new MHCalibrationChargePix(Form("%s%s%2i",fHistName.Data(),"LoGainSector",j),
-                                                        Form("%s%s%2i",fHistTitle.Data()," Low Gain Sector ",j)),j);
+        fAverageLoGainSectors->AddAt(new MHCalibrationChargePix(Form("%sLoGainSector%02d",fHistName.Data(),j),
+                                                        Form("%s Low Gain Sector %02d",fHistTitle.Data(),j)),j);
         
         MHCalibrationChargePix &pix = (MHCalibrationChargePix&)GetAverageLoGainSector(j);
@@ -654,13 +659,13 @@
         pix.SetAbsTimeLast(logainsamples-0.5);
         
+        InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+
         h =  pix.GetHAbsTime();
         
-        h->SetName (Form("%s%s%s%2i","H",fAbsHistName.Data(),"LoGainSector",j));
-        h->SetTitle(Form("%s%s%2i",fAbsHistTitle.Data(),
+        h->SetName (Form("H%sLoGainSector%02d",fAbsHistName.Data(),j));
+        h->SetTitle(Form("%s%s%02d",fAbsHistTitle.Data(),
                            " averaged on event-by-event basis Low Gain Area Sector ",j));
         h->SetXTitle(fAbsHistXTitle.Data());
         h->SetYTitle(fAbsHistYTitle.Data());
-
-        InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
       }
   }
@@ -897,5 +902,4 @@
   MBadPixelsCam   *badcam    = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
 
-
   for (Int_t i=0; i<fHiGainArray->GetSize(); i++)
     {
@@ -1110,6 +1114,6 @@
     {
       *fLog << warn
-            << Form("%s%3.1f%s%2.1f%s%2.0f%s%s","Mean ArrivalTime: ",mean," < ",fTimeLowerLimit,
-                    " slices from lower edge: ",lowerlimit," in pixel ",hist.GetName()) << endl;
+            << Form("Mean ArrivalTime: %3.1f < %2.1f slices from lower edge: %2i in pixel %s",
+                    mean,fTimeLowerLimit,(Int_t)first,hist.GetName()) << endl;
       bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInFirstBin );
     }
@@ -1118,6 +1122,6 @@
     {
       *fLog << warn
-            << Form("%s%3.1f%s%2.1f%s%2.0f%s%s","Mean ArrivalTime: ",mean," > ",fTimeUpperLimit,
-                    " slices from upper edge: ",upperlimit," in pixel ",hist.GetName()) << endl;
+            << Form("Mean ArrivalTime: %3.1f > %2.1f slices from upper edge: %2i in pixel %s",
+                    mean,fTimeUpperLimit,(Int_t)last,hist.GetName()) << endl;
       bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInLast2Bins );
     }
@@ -1226,5 +1230,4 @@
        // Ask for Hi-Gain saturation
        //
-       *fLog << err << hipix.GetSaturated() << "   " << fNumHiGainSaturationLimit*hipix.GetHGausHist()->GetEntries() <<  endl;
        if (hipix.GetSaturated() > fNumHiGainSaturationLimit*hipix.GetHGausHist()->GetEntries() && IsLoGain())
          {