Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 6304)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 6313)
@@ -1801,8 +1801,9 @@
       fTimeExtractor = &timehigh;
 
+    const Bool_t istimecharge = fExtractor->InheritsFrom("MExtractTimeAndCharge");
     //
     // Look if the extractor is a pure charge or also a time extractor
     //
-    if (fExtractor->InheritsFrom("MExtractTimeAndCharge"))
+    if (istimecharge)
     {
         if (fExtractorCam.GetSize() == pedcam.GetSize())
@@ -1842,10 +1843,10 @@
 
     MTaskEnv taskenv2("ExtractTime");
-    if (!fExtractor->InheritsFrom("MExtractTimeAndCharge"))
-    {
-        taskenv2.SetDefault(fTimeExtractor);
-   
-        if (IsRelTimes())
-            tlist.AddToList(&taskenv2);
+    if (!istimecharge)
+    {
+      taskenv2.SetDefault(fTimeExtractor);
+      
+      if (IsRelTimes())
+        tlist.AddToList(&taskenv2);
     }
     
@@ -1894,5 +1895,5 @@
     }
 
-    if (!WriteTasks(taskenv.GetTask(), IsRelTimes() ? taskenv2.GetTask() : 0))
+    if (!WriteTasks(taskenv.GetTask(), istimecharge ? 0 : taskenv2.GetTask()))
         return kFALSE;
 
@@ -1900,38 +1901,16 @@
     if (!evtloop.Eventloop())
     {
-      //	DisplayResult(plist);
-      //	WriteResult(plist);
-        *fLog << err << GetDescriptor() << ": Failed." << endl;
-        return kFALSE;
+      DisplayResult(plist);
+      WriteResult(plist);
+      *fLog << err << GetDescriptor() << ": Failed." << endl;
+      return kFALSE;
     }
 
     tlist.PrintStatistics();
 
-    /*
-
-    MHCalibrationRelTimeCam *hcam = (MHCalibrationRelTimeCam*)plist.FindObject("MHCalibrationRelTimeCam");
-    MHCalibrationPix &pix1 = (*hcam)[100];
-    pix1.DrawClone("");
-    gPad->SaveAs("test_time_100.ps");
-
     MHCalibrationChargeCam *hccam = (MHCalibrationChargeCam*)plist.FindObject("MHCalibrationChargeCam");
-    MHCalibrationPix &pix11 = (*hccam)[100];
+    MHCalibrationPix &pix11 = (*hccam)[0];
     pix11.DrawClone("");
-    gPad->SaveAs("test_charge_100.ps");
-
-    MHCalibrationPix &pix2 = (MHCalibrationPix&)(*hcam)[400];
-    pix2.DrawClone("");    
-    gPad->SaveAs("test_time_400.ps");
-
-    MHCalibrationPix &pix22 = (*hccam)[400];
-    pix22.DrawClone("");
-    gPad->SaveAs("test_charge_400.ps");
-
-    *fLog << err << "Blackout 100: " << fRelTimeCam[100].GetNumBlackout() << endl;
-    *fLog << err << "Picup    100: " << fRelTimeCam[100].GetNumPickup  () << endl;    
-    *fLog << err << "Blackout 400: " << fRelTimeCam[400].GetNumBlackout() << endl;
-    *fLog << err << "Picup    400: " << fRelTimeCam[400].GetNumPickup  () << endl;    
-
-    */
+    gPad->SaveAs("test_charge_0.ps");
 
     if (!fCalibrationPINDiode.IsValid())