Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5480)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5481)
@@ -81,4 +81,7 @@
    * mpedestal/MPedCalcFromLoGain.[h,cc]
      - derives from MExtractPedestal now 
+
+   * manalysis/Makefile
+     - removed inclusion of directory mhcalib/
 
  2004/11/23: Markus Gaug
Index: trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- trunk/MagicSoft/Mars/manalysis/Makefile	(revision 5480)
+++ trunk/MagicSoft/Mars/manalysis/Makefile	(revision 5481)
@@ -21,5 +21,5 @@
 INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \
 	   -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
-           -I../mhistmc -I../mfileio -I../mmain -I../mhcalib -I../mcalib \
+           -I../mhistmc -I../mfileio -I../mmain -I../mcalib \
            -I../msignal -I../mpointing -I../mtools -I../mfbase       \
            -I../mbadpixels -I../mastro -I../mpedestal -I../mtemp/mucm/classes
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 5480)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h	(revision 5481)
@@ -97,9 +97,8 @@
       if (IsUncalibrated( kMeanTimeInLast2Bins )) return 5;
       if (IsUncalibrated( kDeviatingNumPhes    )) return 6;
-      if (IsUncalibrated( kDeviatingFFactor    )) return 7;
-      if (IsUncalibrated( kDeviatingNumPhots   )) return 8;
-      if (IsUncalibrated( kHiGainOverFlow      )) return 9;
-      if (IsUncalibrated( kLoGainOverFlow      )) return 10;
-      return 11;
+      if (IsUncalibrated( kDeviatingNumPhots   )) return 7;
+      if (IsUncalibrated( kHiGainOverFlow      )) return 8;
+      if (IsUncalibrated( kLoGainOverFlow      )) return 9;
+      return 10;
     }
     
@@ -113,5 +112,6 @@
       if (IsUncalibrated( kLoGainOscillating   )) return 6;
       if (IsUncalibrated( kRelTimeOscillating  )) return 7;
-      return 8;
+      if (IsUncalibrated( kDeviatingFFactor    )) return 8;
+      return 9;
     }
     
Index: trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc	(revision 5480)
+++ trunk/MagicSoft/Mars/mcalib/MCalibColorSteer.cc	(revision 5481)
@@ -62,4 +62,5 @@
 #include "MCalibrationRelTimeCalc.h"
 
+#include "MRawRunHeader.h"
 #include "MRawEvtHeader.h"
 
@@ -99,4 +100,11 @@
     {
       *fLog << err << "MRawEvtHeader not found... abort." << endl;
+      return kFALSE;
+    }
+
+  fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+  if (!fHeader)
+    {
+      *fLog << err << "MRawRunHeader not found... abort." << endl;
       return kFALSE;
     }