Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 4629)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 4630)
@@ -38,4 +38,8 @@
        and fLoGainArray have not been expanded. 
      - replace two gLog by *fLog
+     - add the pulser color (needed for the datacheck histograms)
+   * mjobs/MJCalibration.[h,cc]
+     - some small modifications in the data-check display, discussed 
+       with Florian
 
 
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc	(revision 4629)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc	(revision 4630)
@@ -90,5 +90,6 @@
 //
 MHCalibrationCam::MHCalibrationCam(const char *name, const char *title)
-    :  fBadPixels(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL), fDebug(kFALSE)
+    :  fColor(MCalibrationCam::kNONE), 
+       fBadPixels(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL), fDebug(kFALSE)
 {
 
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h	(revision 4629)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h	(revision 4630)
@@ -25,4 +25,8 @@
 #endif
 
+#ifndef MARS_MCalibrationCam
+#include "MCalibrationCam.h"
+#endif
+
 class TText;
 class TArrayI;
@@ -45,33 +49,35 @@
 protected:
 
-  Float_t fNumHiGainSaturationLimit;    // Rel. amount sat. higain FADC slices until pixel is called saturated
-  Float_t fNumLoGainSaturationLimit;    // Rel. amount sat. logain FADC slices until pixel is called saturated
+  Float_t fNumHiGainSaturationLimit;     // Rel. amount sat. higain FADC slices until pixel is called saturated
+  Float_t fNumLoGainSaturationLimit;     // Rel. amount sat. logain FADC slices until pixel is called saturated
 
-  TArrayI    fAverageAreaNum;           // Number of pixels in average pixels per area
-  TArrayF    fAverageAreaRelSigma;      // Re-normalized relative sigmas in average pixels per area
-  TArrayF    fAverageAreaRelSigmaVar;   // Variance Re-normalized relative sigmas in average pixels per area
-  TArrayI    fAverageAreaSat;           // Number of saturated slices in average pixels per area
-  TArrayF    fAverageAreaSigma;         // Re-normalized sigmas in average pixels per area
-  TArrayF    fAverageAreaSigmaVar;      // Variance Re-normalized sigmas in average pixels per area
-  Int_t      fAverageNbins;             // Number of bins for the average histograms
-  TObjArray *fAverageHiGainAreas;       //-> Array of calibration pixels, one per pixel area
-  TObjArray *fAverageHiGainSectors;     //-> Array of calibration pixels, one per camera sector
-  TObjArray *fAverageLoGainAreas;       //-> Array of calibration pixels, one per pixel area
-  TObjArray *fAverageLoGainSectors;     //-> Array of calibration pixels, one per camera sector
-  TArrayI    fAverageSectorNum;         // Number of pixels in average pixels per sector 
-  TArrayI    fRunNumbers;               // Numbers of runs used
-  UInt_t     fHiGainOverFlow;           // Number of times overflow occurred in whole run
-  UInt_t     fLoGainOverFlow;           // Number of times overflow occurred in whole run
+  TArrayI    fAverageAreaNum;            // Number of pixels in average pixels per area
+  TArrayF    fAverageAreaRelSigma;       // Re-normalized relative sigmas in average pixels per area
+  TArrayF    fAverageAreaRelSigmaVar;    // Variance Re-normalized relative sigmas in average pixels per area
+  TArrayI    fAverageAreaSat;            // Number of saturated slices in average pixels per area
+  TArrayF    fAverageAreaSigma;          // Re-normalized sigmas in average pixels per area
+  TArrayF    fAverageAreaSigmaVar;       // Variance Re-normalized sigmas in average pixels per area
+  Int_t      fAverageNbins;              // Number of bins for the average histograms
+  TObjArray *fAverageHiGainAreas;        //-> Array of calibration pixels, one per pixel area
+  TObjArray *fAverageHiGainSectors;      //-> Array of calibration pixels, one per camera sector
+  TObjArray *fAverageLoGainAreas;        //-> Array of calibration pixels, one per pixel area
+  TObjArray *fAverageLoGainSectors;      //-> Array of calibration pixels, one per camera sector
+  TArrayI    fAverageSectorNum;          // Number of pixels in average pixels per sector 
+  TArrayI    fRunNumbers;                // Numbers of runs used
+  UInt_t     fHiGainOverFlow;            // Number of times overflow occurred in whole run
+  UInt_t     fLoGainOverFlow;            // Number of times overflow occurred in whole run
+
+  MCalibrationCam::PulserColor_t fColor; // Colour of the pulsed LEDs
   
-  MBadPixelsCam    *fBadPixels;         //!  Bad Pixels storage container
-  MCalibrationCam  *fCam;               //!  Calibration Cam with the results
-  MGeomCam         *fGeom;              //!  Camera geometry
-  MRawRunHeader    *fRunHeader;         //!  Run Header
+  MBadPixelsCam    *fBadPixels;          //! Bad Pixels storage container
+  MCalibrationCam  *fCam;                //! Calibration Cam with the results
+  MGeomCam         *fGeom;               //! Camera geometry
+  MRawRunHeader    *fRunHeader;          //! Run Header
   
-  TObjArray *fHiGainArray;              //-> Array of calibration pixels, one per pixel
-  TObjArray *fLoGainArray;              //-> Array of calibration pixels, one per pixel
+  TObjArray *fHiGainArray;               //-> Array of calibration pixels, one per pixel
+  TObjArray *fLoGainArray;               //-> Array of calibration pixels, one per pixel
 
-  Int_t      fPulserFrequency;          // Light pulser frequency
-  Bool_t     fDebug;                    // Debug option is used?
+  Int_t      fPulserFrequency;           // Light pulser frequency
+  Bool_t     fDebug;                     // Debug option is used?
   
   virtual Bool_t SetupHists(const MParList *pList);
@@ -140,4 +146,5 @@
   const MHGausEvents  &GetAverageLoGainSector(UInt_t i)  const;
   const Int_t          GetAverageSectors     ()          const;
+  const MCalibrationCam::PulserColor_t GetColor   ()     const  { return fColor;                    }
   const Float_t        GetNumHiGainSaturationLimit()     const  { return fNumHiGainSaturationLimit; }
   const Float_t        GetNumLoGainSaturationLimit()     const  { return fNumLoGainSaturationLimit; }
@@ -145,5 +152,5 @@
   const Int_t          GetSize               ()          const  { return fHiGainArray->GetSize();   }
 
-  const Bool_t         IsDebug                ()          const  { return fDebug; }
+  const Bool_t         IsDebug               ()          const  { return fDebug; }
   
         MHGausEvents  &operator[]            (UInt_t i);
@@ -152,9 +159,10 @@
   const MHGausEvents  &operator()            (UInt_t i)  const;
  
-  void SetDebug                (const Bool_t b=kTRUE) { fDebug           = b; }
-  void SetAverageNbins        ( const Int_t bins=fgAverageNbins ) { fAverageNbins = bins; }
-  void SetNumLoGainSaturationLimit( const Float_t lim) { fNumLoGainSaturationLimit = lim; }
-  void SetNumHiGainSaturationLimit( const Float_t lim) { fNumHiGainSaturationLimit = lim; }
-  void SetPulserFrequency      ( const Int_t f=fgPulserFrequency)  { fPulserFrequency = f; }
+  void SetColor               ( const MCalibrationCam::PulserColor_t color ) { fColor   = color; }
+  void SetDebug               ( const Bool_t b=kTRUE )               { fDebug           = b;     }
+  void SetAverageNbins        ( const Int_t bins=fgAverageNbins )    { fAverageNbins    = bins;  }
+  void SetNumLoGainSaturationLimit( const Float_t lim )    { fNumLoGainSaturationLimit  = lim;   }
+  void SetNumHiGainSaturationLimit( const Float_t lim )    { fNumHiGainSaturationLimit  = lim;   }
+  void SetPulserFrequency     ( const Int_t f=fgPulserFrequency )    { fPulserFrequency = f;     }
   
   ClassDef(MHCalibrationCam, 1)	// Base Histogram class for Calibration Camera