Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 5561)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 5562)
@@ -55,16 +55,10 @@
 #include "MBadPixelsCam.h"
 
-#include "MCalibrationChargePINDiode.h"
-
 #include "MCalibrationQECam.h"
 #include "MCalibrationBlindCam.h"
 #include "MCalibrationChargeCam.h"
 #include "MCalibrationRelTimeCam.h"
-/*
-#include "MCalibrationIntensityQECam.h"
-#include "MCalibrationIntensityBlindCam.h"
-#include "MCalibrationIntensityChargeCam.h"
-#include "MCalibrationIntensityRelTimeCam.h"
-*/
+#include "MCalibrationChargePINDiode.h"
+
 #include "MReadReports.h"
 #include "MReadMarsFile.h"
@@ -126,5 +120,5 @@
 }
 
-Bool_t MJCalibrateSignal::ReadCalibration(TObjArray &l, MBadPixelsCam &cam, MTask* &ext1, MTask* &ext2, TString &geom) const
+Bool_t MJCalibrateSignal::ReadCalibration(TObjArray &l, MBadPixelsCam &cam, MExtractor* &ext1, MExtractor* &ext2, TString &geom) const
 {
     const TString fname = Form("%s/calib%06d.root", fPathIn.Data(), fSequence.GetSequence());
@@ -145,5 +139,5 @@
         return kFALSE;
     }
-    ext1 = o ? (MTask*)o->Clone() : NULL;
+    ext1 = o ? (MExtractor*)o->Clone() : NULL;
 
     o = file.Get("ExtractTime");
@@ -153,5 +147,5 @@
         return kFALSE;
     }
-    ext2 = o ? (MTask*)o->Clone() : NULL;
+    ext2 = o ? (MExtractor*)o->Clone() : NULL;
     if (!ext1 && !ext2)
     {
@@ -176,12 +170,5 @@
 //
 // MJCalibration allows to setup several option by a resource file:
-//   MJCalibration.Display: full, datacheck, normal
-//   MJCalibration.RelTimeCalibration: yes,no
-//   MJCalibration.DataCheck: yes,no
-//   MJCalibration.Debug: yes,no
-//   MJCalibration.Intensity: yes,no
-//   MJCalibration.UseBlindPixel: yes,no
-//   MJCalibration.UsePINDiode: yes,no
-//   MJCalibration.Geometry: MGeomCamMagic, MGeomCamECO1000
+//   MJCalibrateSignal.DataCheck: yes,no
 //
 // For more details see the class description and the corresponding Getters
@@ -244,6 +231,6 @@
     MBadPixelsCam              badpix;
 
-    MTask *extractor1=0;
-    MTask *extractor2=0;
+    MExtractor *extractor1=0;
+    MExtractor *extractor2=0;
     TString geom;
 
@@ -281,4 +268,12 @@
     else
         *fLog << inf << "No Camera geometry found using default <MGeomCamMagic>" << endl;
+
+    //
+    // Switch off noise calculation
+    //
+    if (extractor1)
+        extractor1->SetNoiseCalculation(kFALSE);
+    if (extractor2)
+        extractor2->SetNoiseCalculation(kFALSE);
 
     // This is necessary for the case in which it is not in the files
@@ -335,7 +330,11 @@
     MPedCalcFromLoGain     pedlo;
     pedlo.SetPedestalUpdate(kTRUE);
-    // FIXME: How to get the fixed value 15 automatically?
-    const Float_t win = static_cast<MExtractor*>(extractor1)->GetNumHiGainSamples();
-    pedlo.SetExtractWindow(15, (UShort_t)TMath::Nint(win));
+
+    if (extractor1)
+    {
+        // FIXME: How to get the fixed value 15 automatically?
+        const Float_t win = extractor1->GetNumHiGainSamples();
+        pedlo.SetExtractWindow(15, (UShort_t)TMath::Nint(win));
+    }
 
     MMcPedestalCopy        pcopy;
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h	(revision 5561)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h	(revision 5562)
@@ -13,4 +13,5 @@
 class MGeomCam;
 class MSequence;
+class MExtractor;
 class MPedestalCam;
 class MBadPixelsCam;
@@ -25,5 +26,5 @@
     Bool_t WriteResult();
     Bool_t ReadCalibration(TObjArray &o, MBadPixelsCam &bpix,
-                           MTask* &ext1, MTask* &ext2, TString &geom) const;
+                           MExtractor* &ext1, MExtractor* &ext2, TString &geom) const;
 
     Bool_t IsDataCheck() const { return fIsDataCheck; }
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 5561)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 5562)
@@ -17,5 +17,5 @@
 !
 !   Author(s): Thomas Bretz, 1/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
-!              Markus Gaug, 02/2004 <mailto:markus@ifae.es>
+!   Author(s): Markus Gaug, 02/2004 <mailto:markus@ifae.es>
 !
 !   Copyright: MAGIC Software Development, 2000-2004