Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 7181)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 7188)
@@ -760,5 +760,5 @@
       gPad->SetBorderMode(0);
       if (geomcam.InheritsFrom("MGeomCamMagic"))
-        DisplayDoubleProject(&disp35, "noisy", "dead");
+        DisplayDoubleProject(&disp37, "noisy", "dead");
 
       //
@@ -842,5 +842,5 @@
       // for the datacheck, fix the ranges!!
       //
-      const Double_t max = 12.;
+      const Double_t max = 10.;
       obj8->SetMinimum(0.);
       obj8->SetMaximum(max);
@@ -863,48 +863,44 @@
       t1->SetTextColor(gStyle->GetColorPalette(Int_t(1./max*numcol)));
       t1->SetTextAlign(12);
-      TText *t2 = pave->AddText(Form("%s%3i%s","Signal Rel. error too large:                          ",
-                                       CountBadPixels(&disp24,2)," pixels"));
-      t2->SetTextColor(gStyle->GetColorPalette(Int_t(2./max*numcol)));
-      t2->SetTextAlign(12);
       TText *t4 = pave->AddText(Form("Low Gain Saturation:                                   %3i pixels",
-                                       CountBadPixels(&disp24,3)));
-      t4->SetTextColor(gStyle->GetColorPalette(Int_t(3./max*numcol)));
+                                       CountBadPixels(&disp24,2)));
+      t4->SetTextColor(gStyle->GetColorPalette(Int_t(2./max*numcol)));
       t4->SetTextAlign(12);
       TText *t5 = pave->AddText(Form("Mean Arr. Time In First Extraction Bin:      %3i pixels",
-                                       CountBadPixels(&disp24,4)));
-      t5->SetTextColor(gStyle->GetColorPalette(Int_t(4./max*numcol)));
+                                       CountBadPixels(&disp24,3)));
+      t5->SetTextColor(gStyle->GetColorPalette(Int_t(3./max*numcol)));
       t5->SetTextAlign(12);
       TText *t6 = pave->AddText(Form("Mean Arr. Time In Last 2 Extraction Bins:  %3i pixels",
-                                       CountBadPixels(&disp24,5)));
-      t6->SetTextColor(gStyle->GetColorPalette(Int_t(5./max*numcol)));
+                                       CountBadPixels(&disp24,4)));
+      t6->SetTextColor(gStyle->GetColorPalette(Int_t(4./max*numcol)));
       t6->SetTextAlign(12);
-      TText *t9 = pave->AddText(Form("Deviating Number of Photons:                    %3i pixels",
-                                       CountBadPixels(&disp24,6)));
-      t9->SetTextColor(gStyle->GetColorPalette(Int_t(6./max*numcol)));
-      t9->SetTextAlign(12);
       TText *t10= pave->AddText(Form("High-Gain Histogram Overflow:                  %3i pixels",
-                                       CountBadPixels(&disp24,7 )));
-      t10->SetTextColor(gStyle->GetColorPalette(Int_t(7./max*numcol)));
+                                       CountBadPixels(&disp24,5 )));
+      t10->SetTextColor(gStyle->GetColorPalette(Int_t(5./max*numcol)));
       t10->SetTextAlign(12);
       TText *t11= pave->AddText(Form("Low-Gain Histogram Overflow:                   %3i pixels",
-                                       CountBadPixels(&disp24,8 )));
-      t11->SetTextColor(gStyle->GetColorPalette(Int_t(8./max*numcol)));
+                                       CountBadPixels(&disp24,6 )));
+      t11->SetTextColor(gStyle->GetColorPalette(Int_t(6./max*numcol)));
       t11->SetTextAlign(12);
       TText *t12= pave->AddText(Form("Presumably dead from Ped. Rms:              %3i pixels",
-                                       CountBadPixels(&disp24,9 )));
-      t12->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol)));
+                                       CountBadPixels(&disp24,7 )));
+      t12->SetTextColor(gStyle->GetColorPalette(Int_t(7./max*numcol)));
       t12->SetTextAlign(12);
       TText *t13= pave->AddText(Form("Fluctuating Pulse Arrival Times:                 %3i pixels",
-                                       CountBadPixels(&disp24,10)));
-      t13->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol)));
+                                       CountBadPixels(&disp24,8 )));
+      t13->SetTextColor(gStyle->GetColorPalette(Int_t(8./max*numcol)));
       t13->SetTextAlign(12);
       TText *t17 = pave->AddText(Form("Deviating Number of Photo-electrons:       %3i pixels",
-                                       CountBadPixels(&disp24,11)));
-      t17->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol)));
+                                       CountBadPixels(&disp24,9 )));
+      t17->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol)));
       t17->SetTextAlign(12);
       TText *t14= pave->AddText(Form("Previously Excluded:                                   %3i pixels",
-                                       CountBadPixels(&disp24,12)));
-      t14->SetTextColor(gStyle->GetColorPalette(Int_t(12./max*numcol)));
+                                       CountBadPixels(&disp24,10)));
+      t14->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol)));
       t14->SetTextAlign(12);
+      TText *t15= pave->AddText(Form("Too many Low-Gain Blackout Events              %3i pixels",
+                                       CountBadPixels(&disp24,25 )));
+      t15->SetTextColor(gStyle->GetColorPalette(Int_t(11./max*numcol)));
+      t15->SetTextAlign(12);
       pave->Draw();
 
@@ -1514,6 +1510,7 @@
       const MCalibrationHiLoPix &pix = (MCalibrationHiLoPix&)hilocam[i];
 
-      const Float_t ratio = pix.GetHiLoChargeRatio();
-      const Float_t sigma = pix.GetHiLoChargeRatioSigma();
+      const Float_t ratio  = pix.GetHiLoChargeRatio();
+      const Float_t raterr = pix.GetHiLoChargeRatioErr();
+      const Float_t sigma  = pix.GetHiLoChargeRatioSigma();
 
       if (ratio < 0.)
@@ -1526,5 +1523,6 @@
       
       cpix.SetConversionHiLo(ratio);
-      cpix.SetConversionHiLoErr(sigma);      
+      cpix.SetConversionHiLoErr(raterr);
+      cpix.SetConversionHiLoSigma(sigma);
     }
 
@@ -1943,6 +1941,4 @@
       tlist.AddToList(&steer);
 
-    tlist.AddToList(&fillcam);
-
     if (IsRelTimes())
     {
@@ -1950,4 +1946,6 @@
         tlist.AddToList(&timecalc);
     }
+
+    tlist.AddToList(&fillcam);
 
     if (IsUseBlindPixel())
@@ -1999,6 +1997,6 @@
     if (fIsPixelCheck)
     {
-        chargecam[fCheckedPixId].DrawClone("");
-        chargecam(fCheckedPixId).DrawClone("");
+        chargecam[fCheckedPixId].DrawClone("datacheck");
+        chargecam(fCheckedPixId).DrawClone("datacheck");
 
         if (IsRelTimes())
Index: trunk/MagicSoft/Mars/mjobs/MJPedestal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJPedestal.cc	(revision 7181)
+++ trunk/MagicSoft/Mars/mjobs/MJPedestal.cc	(revision 7188)
@@ -786,4 +786,10 @@
     fDeadPixelCheck = GetEnv("DeadPixelsCheck", fDeadPixelCheck);
 
+    fBadPixelsFile = GetEnv("BadPixelsFile",fBadPixelsFile.Data());
+    fReferenceFile = GetEnv("ReferenceFile",fReferenceFile.Data());
+    ReadReferenceFile();
+
+    // ------------- Do not put simple resource below --------------
+
     // Setup an environment task
     MTaskEnv tenv("ExtractSignal");
@@ -810,8 +816,4 @@
     // ..and store it
     SetExtractor((MExtractor*)tenv.GetTask());
-
-    fBadPixelsFile = GetEnv("BadPixelsFile",fBadPixelsFile.Data());
-    fReferenceFile = GetEnv("ReferenceFile",fReferenceFile.Data());
-    ReadReferenceFile();
 
     return kTRUE;
@@ -1119,8 +1121,9 @@
     fcalib.SetInverted();
 
+    tlist.AddToList(&decode);
+
     if (fIsPulsePosCheck)
     {
         fillpul.SetFilter(&fcalib);
-        tlist.AddToList(&decode);
 	tlist.AddToList(&fcalib);
         tlist.AddToList(&fillpul);