Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3252)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3253)
@@ -30,4 +30,5 @@
    * mcalib/MMcCalibrationCalc.[h,cc]
    * mjobs/MJCalibration.[h,cc]
+   * mjobs/MJExtractSignal.[h,cc]
    * manalysis/MGeomApply.cc
    * mcalib/Makefile
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3252)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3253)
@@ -47,5 +47,6 @@
 
 #include "MPedestalCam.h"
-#include "MCalibrationCam.h"
+#include "MCalibrationChargeCam.h"
+#include "MCalibrationChargePINDiode.h"
 
 #include "MReadMarsFile.h"
@@ -56,5 +57,5 @@
 #include "MExtractBlindPixel.h"
 #include "MExtractSignal2.h"
-#include "MCalibrationCalc.h"
+#include "MCalibrationChargeCalc.h"
 #include "MFCosmics.h"
 #include "MContinue.h"
@@ -476,19 +477,29 @@
     static_cast<MRead&>(read).AddFiles(*fRuns);
 
+    MCalibrationChargePINDiode pindiode;
+    pindiode.SetColor(MCalibrationChargePINDiode::kECT1);
+
+    //
+    // As long, as we don't have digital modules, 
+    // we have to set the color of the pulser LED by hand
+    //
+    fCalibrationCam.SetColor(MCalibrationChargeCam::kECT1);
+
     // Setup Tasklist
     MParList plist;
     plist.AddToList(&pedcam);
     plist.AddToList(&fCalibrationCam);
+    plist.AddToList(&pindiode);
 
     MTaskList tlist;
     plist.AddToList(&tlist);
 
-    MGeomApply       apply;
-    MBadPixelsMerge  merge(&fBadPixels);
+    MGeomApply              apply;
+    MBadPixelsMerge         merge(&fBadPixels);
     // MExtractSignal   extract; // Do not use this at the moment...
-    MExtractPINDiode   pinext;
-    MExtractBlindPixel blindext;
-    MExtractSignal2    extract;
-    MCalibrationCalc   calcalc;
+    MExtractPINDiode         pinext;
+    MExtractBlindPixel       blindext;
+    MExtractSignal2          extract;
+    MCalibrationChargeCalc   calcalc;
 
     MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
@@ -501,9 +512,4 @@
     MContinue cont(&cosmics);
 
-    //
-    // As long, as we don't have digital modules, 
-    // we have to set the color of the pulser LED by hand
-    //
-    calcalc.SetPulserColor(MCalibrationCalc::kECT1);
     //calcalc.SkipBlindPixelFit();
 
@@ -515,6 +521,6 @@
     tlist.AddToList(&blindext);
     tlist.AddToList(&cont);
+    tlist.AddToList(&fillpin);
     tlist.AddToList(&calcalc);
-    tlist.AddToList(&fillpin);
 
     // Create and setup the eventloop
Index: trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h	(revision 3252)
+++ trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h	(revision 3253)
@@ -15,5 +15,5 @@
 class MParList;
 class MPedestalCam;
-class MCalibrationCam;
+class MCalibrationChargeCam;
 
 class MJExtractSignal : public MParContainer
@@ -33,5 +33,5 @@
 
     Bool_t ProcessFileD(MPedestalCam &pedcam);
-    Bool_t ProcessFileP(MPedestalCam &pedcam, MCalibrationCam &calcam);
+    Bool_t ProcessFileP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam);
 
 public:
@@ -50,5 +50,5 @@
 
     Bool_t ProcessD(MPedestalCam &pedcam);
-    Bool_t ProcessP(MPedestalCam &pedcam, MCalibrationCam &calcam);
+    Bool_t ProcessP(MPedestalCam &pedcam, MCalibrationChargeCam &calcam);
 
     ClassDef(MJExtractSignal, 0) // Tool to create a pedestal file (MPedestalCam)