Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 5995)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 5996)
@@ -98,9 +98,8 @@
       if (IsUncalibrated( kMeanTimeInFirstBin  )) return 4;
       if (IsUncalibrated( kMeanTimeInLast2Bins )) return 5;
-      if (IsUncalibrated( kDeviatingNumPhes    )) return 6;
-      if (IsUncalibrated( kDeviatingNumPhots   )) return 7;
-      if (IsUncalibrated( kHiGainOverFlow      )) return 8;
-      if (IsUncalibrated( kLoGainOverFlow      )) return 9;
-      return 10;
+      if (IsUncalibrated( kDeviatingNumPhots   )) return 6;
+      if (IsUncalibrated( kHiGainOverFlow      )) return 7;
+      if (IsUncalibrated( kLoGainOverFlow      )) return 8;
+      return 9;
     }
     
@@ -108,12 +107,13 @@
       if (!IsUnreliable() || IsUnsuitable())      return 0;
       if (IsUncalibrated( kChargeSigmaNotValid )) return 1;
-      if (IsUncalibrated( kHiGainNotFitted     )) return 2;
-      if (IsUncalibrated( kLoGainNotFitted     )) return 3;
-      if (IsUncalibrated( kRelTimeNotFitted    )) return 4;
-      if (IsUncalibrated( kHiGainOscillating   )) return 5;
-      if (IsUncalibrated( kLoGainOscillating   )) return 6;
-      if (IsUncalibrated( kRelTimeOscillating  )) return 7;
-      if (IsUncalibrated( kDeviatingFFactor    )) return 8;
-      return 9;
+      if (IsUncalibrated( kDeviatingNumPhes    )) return 2;
+      if (IsUncalibrated( kHiGainNotFitted     )) return 3;
+      if (IsUncalibrated( kLoGainNotFitted     )) return 4;
+      if (IsUncalibrated( kRelTimeNotFitted    )) return 5;
+      if (IsUncalibrated( kHiGainOscillating   )) return 6;
+      if (IsUncalibrated( kLoGainOscillating   )) return 7;
+      if (IsUncalibrated( kRelTimeOscillating  )) return 8;
+      if (IsUncalibrated( kDeviatingFFactor    )) return 9;
+      return 10;
     }
     
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 5995)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 5996)
@@ -857,23 +857,19 @@
       t6->SetTextColor(gStyle->GetColorPalette(Int_t(5./max*numcol + 1.)));
       t6->SetTextAlign(12);
-      TText *t7 = pave->AddText(Form("Deviating Number of Photo-electrons:      %3i pixels",
+      TText *t9 = pave->AddText(Form("Deviating Number of Photons:                    %3i pixels",
                                        CountBadPixels(&disp24,6)));
-      t7->SetTextColor(gStyle->GetColorPalette(Int_t(6./max*numcol + 1.)));
-      t7->SetTextAlign(12);
-      TText *t9 = pave->AddText(Form("Deviating Number of Photons:                    %3i pixels",
-                                       CountBadPixels(&disp24,7)));
-      t9->SetTextColor(gStyle->GetColorPalette(Int_t(7./max*numcol + 1.)));
+      t9->SetTextColor(gStyle->GetColorPalette(Int_t(6./max*numcol + 1.)));
       t9->SetTextAlign(12);
       TText *t10= pave->AddText(Form("High-Gain Histogram Overflow:                  %3i pixels",
-                                       CountBadPixels(&disp24,8 )));
-      t10->SetTextColor(gStyle->GetColorPalette(Int_t(8./max*numcol + 1.)));
+                                       CountBadPixels(&disp24,7 )));
+      t10->SetTextColor(gStyle->GetColorPalette(Int_t(7./max*numcol + 1.)));
       t10->SetTextAlign(12);
       TText *t11= pave->AddText(Form("Low-Gain Histogram Overflow:                   %3i pixels",
-                                       CountBadPixels(&disp24,9 )));
-      t11->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol + 1.)));
+                                       CountBadPixels(&disp24,8 )));
+      t11->SetTextColor(gStyle->GetColorPalette(Int_t(8./max*numcol + 1.)));
       t11->SetTextAlign(12);
       TText *t12= pave->AddText(Form("Previously Excluded:                                    %3i pixels",
-                                       CountBadPixels(&disp24,10)));
-      t12->SetTextColor(gStyle->GetColorPalette(Int_t(10./max*numcol + 1.)));
+                                       CountBadPixels(&disp24,9)));
+      t12->SetTextColor(gStyle->GetColorPalette(Int_t(9./max*numcol + 1.)));
       t12->SetTextAlign(12);
       pave->Draw();
@@ -915,31 +911,37 @@
       t3->SetTextColor(gStyle->GetColorPalette(Int_t(1./max*numcol + 1.)));
       t3->SetTextAlign(12);
+
+      TText *t7 = pave2->AddText(Form("Deviating Number of Photo-electrons:     %3i pixels",
+                                       CountBadPixels(&disp25,2)));
+      t7->SetTextColor(gStyle->GetColorPalette(Int_t(2./max*numcol + 1.)));
+      t7->SetTextAlign(12);
+
       TText *tt1 = pave2->AddText(Form("High Gain Signals could not be fitted:   %3i pixels",
-                                       CountBadPixels(&disp25,2)));
-      tt1->SetTextColor(gStyle->GetColorPalette(Int_t(2./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,3)));
+      tt1->SetTextColor(gStyle->GetColorPalette(Int_t(3./max2*numcol + 1.)));
       tt1->SetTextAlign(12);
       TText *tt2 = pave2->AddText(Form("Low  Gain Signals could not be fitted:   %3i pixels",
-                                       CountBadPixels(&disp25,3)));
-      tt2->SetTextColor(gStyle->GetColorPalette(Int_t(3./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,4)));
+      tt2->SetTextColor(gStyle->GetColorPalette(Int_t(4./max2*numcol + 1.)));
       tt2->SetTextAlign(12);
       TText *tt3 = pave2->AddText(Form("Relative Arr. Times could not be fitted:  %3i pixels",
-                                       CountBadPixels(&disp25,4)));
-      tt3->SetTextColor(gStyle->GetColorPalette(Int_t(4./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,5)));
+      tt3->SetTextColor(gStyle->GetColorPalette(Int_t(5./max2*numcol + 1.)));
       tt3->SetTextAlign(12);
       TText *tt4 = pave2->AddText(Form("High Gain Signals Oscillation:                %3i pixels",
-                                       CountBadPixels(&disp25,5)));
-      tt4->SetTextColor(gStyle->GetColorPalette(Int_t(5./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,6)));
+      tt4->SetTextColor(gStyle->GetColorPalette(Int_t(6./max2*numcol + 1.)));
       tt4->SetTextAlign(12);
       TText *tt5 = pave2->AddText(Form("Low  Gain Signals Oscillation:                %3i pixels",
-                                       CountBadPixels(&disp25,6)));
-      tt5->SetTextColor(gStyle->GetColorPalette(Int_t(6./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,7)));
+      tt5->SetTextColor(gStyle->GetColorPalette(Int_t(7./max2*numcol + 1.)));
       tt5->SetTextAlign(12); 
       TText *tt6 = pave2->AddText(Form("Relative Arr. Times Oscillation:               %3i pixels",
-                                       CountBadPixels(&disp25,7)));
-      tt6->SetTextColor(gStyle->GetColorPalette(Int_t(7./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,8)));
+      tt6->SetTextColor(gStyle->GetColorPalette(Int_t(8./max2*numcol + 1.)));
       tt6->SetTextAlign(12);
       TText *tt8 = pave2->AddText(Form("Deviating global F-Factor:                        %3i pixels",
-                                       CountBadPixels(&disp25,8)));
-      tt8->SetTextColor(gStyle->GetColorPalette(Int_t(8./max2*numcol + 1.)));
+                                       CountBadPixels(&disp25,9)));
+      tt8->SetTextColor(gStyle->GetColorPalette(Int_t(9./max2*numcol + 1.)));
       tt8->SetTextAlign(12);
       pave2->Draw();