Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2716)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2717)
@@ -12,4 +12,8 @@
    * manalysis/MCalibrationPix.cc
      - introduced error calculation for the F-Factor method
+
+   * manalysis/MCalibrate.cc
+     - replace pix.IsValid by pix.IsBlindPixelMethodValid() which more 
+       what is checked exactly
   
    * macros/calibration.C
Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 2716)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 2717)
@@ -163,7 +163,5 @@
     MHCamera &disp0  = *h.GetHistByName();
     MHCamera disp1   (geomcam, "MCalibrationCam;q", "Fitted Mean Charges");
-    //    MHCamera disp2   (geomcam, "MCalibrationCam;errq", "Error of Fitted Mean Charges");
     MHCamera disp3   (geomcam, "MCalibrationCam;sigmaq", "Sigma of Fitted Mean Charges");
-    //    MHCamera disp4   (geomcam, "MCalibrationCam;errsigmaq", "Error of Sigma of Fitted Mean Charges");
     MHCamera disp5   (geomcam, "MCalibrationCam;probq", "Probability of Fit");
     MHCamera disp6   (geomcam, "MCalibrationCam;t", "Arrival Times");
@@ -177,13 +175,12 @@
     MHCamera disp14  (geomcam, "MCalibrationCam;photons", "Nr. of Photons (Blind Pixel Method)");
     MHCamera disp15  (geomcam, "MCalibrationCam;convphot", "Conversion Factor (Blind Pixel Method)");
-    MHCamera disp16  (geomcam, "MCalibrationCam;sigma/charge", "Sigma^2 per Charge^2");
+    MHCamera disp16  (geomcam, "MCalibrationCam;sigsqchargesq", "Sigma Square per Charges Square");
 
     disp1.SetCamContent(*cam, 0);
     disp1.SetCamError(*cam,1);
-    //    disp2.SetCamContent(*cam, 1);
 
     disp3.SetCamContent(*cam, 2);
     disp3.SetCamError(*cam,3);
-    //    disp4.SetCamContent(*cam, 3);
+
     disp5.SetCamContent(*cam, 4);
 
@@ -200,8 +197,12 @@
 
     disp12.SetCamContent(*cam, 11);
-    disp13.SetCamContent(*cam, 12);
-    disp14.SetCamContent(*cam, 13);
-    disp15.SetCamContent(*cam, 14);
-    disp16.SetCamContent(*cam, 15);
+    disp12.SetCamError(*cam, 12);
+
+    disp13.SetCamContent(*cam, 13);
+    disp13.SetCamError(*cam, 14);
+
+    disp14.SetCamContent(*cam, 15);
+    disp15.SetCamContent(*cam, 16);
+    disp16.SetCamContent(*cam, 17);
 
 
@@ -225,6 +226,6 @@
     MStatusDisplay *d3 = new MStatusDisplay;
  
-    // Set update time to 1s
-    d3->SetUpdateTime(1000);
+    // Set update time to 3s
+    d3->SetUpdateTime(3000);
 
     TCanvas *c1 = &d3->AddTab("Fitted Charges"); 
Index: trunk/MagicSoft/Mars/manalysis/MCalibrate.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCalibrate.cc	(revision 2716)
+++ trunk/MagicSoft/Mars/manalysis/MCalibrate.cc	(revision 2717)
@@ -137,5 +137,5 @@
 	MCalibrationPix &pix = (*fCalibrations)[pixid];
 
-	if (pix.IsValid())
+	if (pix.IsBlindPixelMethodValid())
 	{
 	    MExtractedSignalPix &sig =  (*fSignals)[pixid];
Index: trunk/MagicSoft/Mars/mhist/MHCalibrationBlindPixel.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCalibrationBlindPixel.cc	(revision 2716)
+++ trunk/MagicSoft/Mars/mhist/MHCalibrationBlindPixel.cc	(revision 2717)
@@ -420,9 +420,4 @@
 {
 
-  //
-  // The number 100 is necessary because it is the internal binning
-  // of ROOT functions. A call to SetNpx() does NOT help
-  // If you find another solution which WORKS!!, please tell me!!
-  //
   Int_t nbins = 50;