Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 7072)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 7073)
@@ -204,37 +204,5 @@
     return ReadContainer(cont);
 }
-/*
-Bool_t MJCalibrateSignal::ReadExtractorCosmics(MExtractor* &ext1) const
-{
-
-  const TString fname = Form("pedy%08d.root",fSequence.GetSequence());
-
-  *fLog << inf << "Reading from file: " << fname << endl;
-
-  TFile file(fname, "READ");
-  if (!file.IsOpen())
-    {
-      *fLog << warn << "Could not find or open file " << fname << endl;
-      return kFALSE;
-    }
-
-  TObject *o = file.Get("ExtractSignal");
-  if (o && !o->InheritsFrom(MExtractor::Class()))
-    {
-      *fLog << err << dbginf << "ERROR - ExtractSignal read from " << fname << " doesn't inherit from MExtractor!" << endl;
-      return kFALSE;
-    }
-  if (o)
-    {
-      delete ext1;
-      ext1 = (MExtractor*)o->Clone();
-    }
-  else
-    *fLog << warn << "No signal extractor found in " << fname << endl;
-
-  file.Close();
-  return kTRUE;
-}
-*/
+
 // --------------------------------------------------------------------------
 //
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 7072)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 7073)
@@ -1991,18 +1991,11 @@
     if (fIsPixelCheck)
     {
-        MHCalibrationChargeCam *hcam = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
-        MHCalibrationChargePix &pix1 = (MHCalibrationChargePix&)(*hcam)[fCheckedPixId];
-        pix1.DrawClone("");
-
-        MHCalibrationChargePix &pix2 = (MHCalibrationChargePix&)(*hcam)(fCheckedPixId);
-        pix2.DrawClone("");
+        chargecam[fCheckedPixId].DrawClone("");
+        chargecam(fCheckedPixId).DrawClone("");
 
         if (IsRelTimes())
         {
-            MHCalibrationRelTimeCam *hccam = (MHCalibrationRelTimeCam*)plist.FindObject("MHCalibrationRelTimeCam");
-            MHCalibrationPix &pix11 = (*hccam)[fCheckedPixId];
-            pix11.DrawClone("");
-            MHCalibrationPix &pix12 = (*hccam)(fCheckedPixId);
-            pix12.DrawClone("");
+            reltimecam[fCheckedPixId].DrawClone("");
+            reltimecam(fCheckedPixId).DrawClone("");
         }
     }