Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 8503)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 8504)
@@ -20,4 +20,7 @@
  2007/05/14 Thomas Bretz
 
+   * callisto_mux.rc:
+     - cleanup of some comments
+
    * mjobs/MJCalibration.cc:
      - fixed the unintentionally removed setting of pedestal 
@@ -30,4 +33,21 @@
      - according to the last changes the version number has been 
        increased to 9
+
+   * mcalib/MCalibrationCam.cc:
+     - added code to GetPixelContent from MCalibrationPedCam
+
+   * mcalib/Makefile, mcalib/CalibLinkDef.h:
+     - removed obsolete MCalibrationPedCam
+
+   * mhcalib/MHPedestalCam.cc:
+     - Removed references to MCalibrationPedCam use a MCalibrationCam
+       with the name MCalibrationPedCam instead
+
+   * mjobs/MJCalibration.cc:
+     - changed background color in Defects to be able to read
+       the yellow text color
+
+   * mjobs/MJPedestal.cc:
+     - removed obsolete include of MCalibrationPedCam
 
 
Index: /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h	(revision 8503)
+++ /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h	(revision 8504)
@@ -23,5 +23,4 @@
 #pragma link C++ class MCalibrationRelTimePix+;
 #pragma link C++ class MCalibrationPulseTimeCam+;
-#pragma link C++ class MCalibrationPedCam+;
 #pragma link C++ class MCalibrationQECamMagic+;
 #pragma link C++ class MCalibrationQECam+;
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 8503)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc	(revision 8504)
@@ -538,12 +538,52 @@
 // --------------------------------------------------------------------------
 //
-// Dummy needed for compilation with MCamEvent
-//
 Bool_t MCalibrationCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
 {
-  return kTRUE;
-}
-
-
+    if (idx > GetSize())
+        return kFALSE;
+
+    const Float_t area = cam[idx].GetA();
+
+    if (area == 0)
+        return kFALSE;
+
+    if ((*this)[idx].IsExcluded())
+        return kFALSE;
+
+    switch (type)
+    {
+    case 0:
+        val = (*this)[idx].GetHiGainMean();
+        break;
+    case 1:
+        val = (*this)[idx].GetHiGainMeanErr();
+        break;
+    case 2:
+        val = (*this)[idx].GetHiGainSigma();
+        break;
+    case 3:
+        val = (*this)[idx].GetHiGainSigmaErr();
+        break;
+    case 4:
+        val = (*this)[idx].GetHiGainProb();
+        break;
+    case 5:
+        val = (*this)[idx].GetLoGainMean();
+        break;
+    case 6:
+        val = (*this)[idx].GetLoGainMeanErr();
+        break;
+    case 7:
+        val = (*this)[idx].GetLoGainSigma();
+        break;
+    case 8:
+        val = (*this)[idx].GetLoGainSigmaErr();
+        break;
+    default:
+        return kFALSE;
+    }
+
+    return val!=-1.;
+}
 
 // --------------------------------------------------------------------------
Index: /trunk/MagicSoft/Mars/mcalib/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/Makefile	(revision 8503)
+++ /trunk/MagicSoft/Mars/mcalib/Makefile	(revision 8504)
@@ -48,5 +48,4 @@
            MCalibrationQECam.cc \
            MCalibrationQEPix.cc  \
-           MCalibrationPedCam.cc \
 	   MCalibrationTestCalc.cc \
 	   MCalibrationTestCam.cc \
Index: /trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc	(revision 8503)
+++ /trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc	(revision 8504)
@@ -108,6 +108,4 @@
 #include "MGeomPix.h"
 
-#include "MCalibrationPedCam.h"
-
 #include <TH1F.h>
 #include <TOrdCollection.h>
@@ -291,8 +289,8 @@
   const Int_t nareas   = fGeom->GetNumAreas();
 
-  fCam = (MCalibrationCam*)pList->FindObject("MCalibrationPedCam");
+  fCam = (MCalibrationCam*)pList->FindObject("MCalibrationPedCam", "MCalibrationCam");
   if (!fCam)
   {
-      fCam = (MCalibrationCam*)pList->FindCreateObj(AddSerialNumber("MCalibrationPedCam"));
+      fCam = (MCalibrationCam*)pList->FindCreateObj("MCalibrationCam", AddSerialNumber("MCalibrationPedCam"));
       if (!fCam)
           return kFALSE;
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 8503)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 8504)
@@ -845,4 +845,5 @@
       pave->ConvertNDCtoPad();
       pave->SetTextSize(0.045);
+      pave->SetFillColor(14);
       pave->AddText("  ");
       DrawBadPixel(*pave, disp24,  1, f, "Signal smaller 4.5 Pedestal RMS:               ");
@@ -888,4 +889,5 @@
       pave2->ConvertNDCtoPad();
       pave2->SetTextSize(0.05);
+      pave2->SetFillColor(14);
       pave2->AddText("  ");
       DrawBadPixel(*pave2, disp25,  1, f2, "Signal Sigma smaller Pedestal RMS:      ");
Index: /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc	(revision 8503)
+++ /trunk/MagicSoft/Mars/mjobs/MJPedestal.cc	(revision 8504)
@@ -71,5 +71,4 @@
 #include "MPedestalPix.h"
 
-#include "MCalibrationPedCam.h"
 #include "MCalibrationPix.h"
 #include "MHPedestalPix.h"
@@ -1055,5 +1054,5 @@
     plist.AddToList(&fPedestalCamOut);
     plist.AddToList(&fBadPixels);
-    
+
     MGeomApply geomapl;
     MBadPixelsMerge merge(&fBadPixels);