Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 4227)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 4228)
@@ -1373,7 +1373,9 @@
       if (fBlindPixel->IsFluxInsidePlexiglassAvailable())
         {
+
           const Float_t photons = fBlindPixel->GetFluxInsidePlexiglass() * (*fGeom)[0].GetA()
                                / fQECam->GetPlexiglassQE();
-          fCam->SetNumPhotonsBlindPixelMethod   (photons);
+          fCam->SetNumPhotonsBlindPixelMethod(photons);
+
           const Float_t photrelvar = fBlindPixel->GetFluxInsidePlexiglassRelVar() 
                                    + fQECam->GetPlexiglassQERelVar();
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc	(revision 4227)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.cc	(revision 4228)
@@ -704,9 +704,9 @@
       fSinglePheFit->SetParLimits(1,0.,0.05); 
       fSinglePheFit->SetParLimits(2,0.,fSinglePheCut);    
-      fSinglePheFit->SetParLimits(3,fSinglePheCut,5500.);    
-      fSinglePheFit->SetParLimits(4,1500.,3500.);    
-      fSinglePheFit->SetParLimits(5,0.,fSinglePheCut);    
-      fSinglePheFit->SetParLimits(6,500.,1000.);    
-      fSinglePheFit->SetParLimits(7,300.,1500.);    
+      fSinglePheFit->SetParLimits(3,1500.,5500.);    
+      fSinglePheFit->SetParLimits(4,fSinglePheCut,1500.);    
+      fSinglePheFit->SetParLimits(5,0.1,fSinglePheCut/1.25);    
+      fSinglePheFit->SetParLimits(6,fSinglePheCut/1.25,1000.);    
+      fSinglePheFit->SetParLimits(7,1000.,1500.);    
       fSinglePheFit->SetParLimits(8,norm/1.1,norm*1.1);
       fSinglePheFit->SetParLimits(9,0.,1.);
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.h	(revision 4227)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeBlindPix.h	(revision 4228)
@@ -202,7 +202,4 @@
         return FLT_MAX;
 
-      if (sigma1cat < sigma1dyn)
-        return FLT_MAX;
-      
       Double_t mu2cat = (2.*mu1cat)-mu0;  
       Double_t mu2dyn = (2.*mu1dyn)-mu0;