Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.cc	(revision 2979)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.cc	(revision 2980)
@@ -417,6 +417,6 @@
   
   const Double_t mu_0_guess = maximum_bin;
-  const Double_t si_0_guess = 20.;
-  const Double_t mu_1_guess = mu_0_guess + 50.;
+  const Double_t si_0_guess = 40.;
+  const Double_t mu_1_guess = mu_0_guess + 100.;
   const Double_t si_1_guess = si_0_guess + si_0_guess;
   // Michele
@@ -440,5 +440,5 @@
       
     case kEPoisson4:
-      if (fMeanPedestal && fSigmaPedestal)
+      if ((fMeanPedestal) && (fSigmaPedestal))
         fSinglePheFit->SetParameters(lambda_guess,fMeanPedestal,mu_1_guess,fSigmaPedestal,si_1_guess,norm);
       else
@@ -449,17 +449,21 @@
       fSinglePheFit->SetParLimits(0,0.,1.);
 
-      if (fMeanPedestal && fSigmaPedestal)
-        fSinglePheFit->SetParLimits(1,fMeanPedestal-fMeanPedestalErr,fMeanPedestal+fMeanPedestalErr);
+      if ((fMeanPedestal) && (fSigmaPedestal))
+        fSinglePheFit->SetParLimits(1,
+                                    fMeanPedestal-1.*fMeanPedestalErr,
+                                    fMeanPedestal+1.*fMeanPedestalErr);
       else
         fSinglePheFit->SetParLimits(1,-3.,0.);
 
-      fSinglePheFit->SetParLimits(2,(max-min)/2.,(max-0.05*(max-min)));
-
-      if (fMeanPedestal && fSigmaPedestal)
-        fSinglePheFit->SetParLimits(3,fSigmaPedestal-fSigmaPedestalErr,fSigmaPedestal+fSigmaPedestalErr);
+      fSinglePheFit->SetParLimits(2,(max-min)/2.,max);
+
+      if ((fMeanPedestal) && (fSigmaPedestal))
+        fSinglePheFit->SetParLimits(3,
+                                    fSigmaPedestal-3.*fSigmaPedestalErr,
+                                    fSigmaPedestal+3.*fSigmaPedestalErr);
       else
         fSinglePheFit->SetParLimits(3,1.0,(max-min)/2.0);
 
-      fSinglePheFit->SetParLimits(4,1.0,(max-min)/2.5);
+      fSinglePheFit->SetParLimits(4,1.0,(max-min));
       fSinglePheFit->SetParLimits(5,norm-0.5,norm+0.5);
       break;
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc	(revision 2979)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc	(revision 2980)
@@ -59,5 +59,5 @@
         fChargeNbinsLoGain(1010),
         fTimeNbins(32),
-        fChargevsNbins(1000),
+        fChargevsNbins(5000),
         fTimeFirst(-0.25),
         fTimeLast(15.75),