Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3344)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3345)
@@ -20,4 +20,7 @@
        ago).
 
+   * mmain/Makefile
+     - Added mcalib to list of include directories.
+
    * manalysis/MMcCalibrationUpdate.[h,cc]
      - Added member variable Bool_t fOuterPixelsScaling, which is 
@@ -27,7 +30,4 @@
        pixels electronic chain. This option was necessary to allow for
        the change in the camera display (see above).
-
-   * manalysis/Makefile
-     - Added mcalib to list of include directories.
 
    * macros/starmc.C
Index: /trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h	(revision 3344)
+++ /trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.h	(revision 3345)
@@ -30,4 +30,5 @@
 
     Bool_t  fFillCalibrationCam;
+    Bool_t  fOuterPixelsGainScaling;
 
     Float_t fAmplitude;      // FADC parameters from camera simulation (see camera manual)
@@ -35,7 +36,9 @@
     Float_t fConversionHiLo; // Ratio of high to low gain.
 
-
 public:
     MMcCalibrationUpdate(const char *name=NULL, const char *title=NULL);
+
+    void SetOuterPixelsGainScaling(Bool_t tf) 
+      { fOuterPixelsGainScaling = tf; }
 
     ClassDef(MMcCalibrationUpdate, 0)   // Task which obtains, for MC files, the pedestal mean and rms, and the calibration factor from ADC counts to photons. 
Index: /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
===================================================================
--- /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 3344)
+++ /trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 3345)
@@ -58,17 +58,20 @@
 // Tasks
 //
-#include "MReadMarsFile.h"       // MReadMarsFile
-#include "MGeomApply.h"          // MGeomApply
-#include "MFDataMember.h"        // MFDataMember
-#include "MMcPedestalCopy.h"     // MMcPedestalCopy
-#include "MMcPedestalNSBAdd.h"   // MMcPedestalNSBAdd
-#include "MCerPhotCalc.h"        // MCerPhotCalc
-#include "MCerPhotAnal2.h"       // MCerPhotAnal2
-#include "MImgCleanStd.h"        // MImgCleanStd
-#include "MHillasCalc.h"         // MHillasCalc
-#include "MHillasSrcCalc.h"      // MHillasSrcCalc
-#include "MBlindPixelCalc.h"     // MBlindPixelCalc
-#include "MArrivalTimeCalc.h"    // MArrivalTimeCalc
-#include "MFillH.h"              // MFillH
+#include "MReadMarsFile.h"        // MReadMarsFile
+#include "MGeomApply.h"           // MGeomApply
+#include "MFDataMember.h"         // MFDataMember
+#include "MMcPedestalCopy.h"      // MMcPedestalCopy
+#include "MMcPedestalNSBAdd.h"    // MMcPedestalNSBAdd
+
+#include "MCerPhotAnal2.h"        // MCerPhotAnal2
+#include "MImgCleanStd.h"         // MImgCleanStd
+#include "MHillasCalc.h"          // MHillasCalc
+#include "MHillasSrcCalc.h"       // MHillasSrcCalc
+#include "MBlindPixelCalc.h"      // MBlindPixelCalc
+#include "MArrivalTimeCalc.h"     // MArrivalTimeCalc
+#include "MFillH.h"               // MFillH
+#include "MExtractSignal.h"       // MExtractsignal
+#include "MMcCalibrationUpdate.h" // MMcCalibrationUpdate
+#include "MCalibrate.h"           // MCalibrate
 
 //
@@ -186,5 +189,4 @@
     MMcPedestalCopy   *pcopy = new MMcPedestalCopy;
     MMcPedestalNSBAdd *pdnsb = new MMcPedestalNSBAdd;
-    MCerPhotCalc      *ncalc = new MCerPhotCalc;
     MCerPhotAnal2     *nanal = new MCerPhotAnal2;
     MFillH            *fill1 = new MFillH(evt1, "MCerPhotEvt", "MFillH1");
@@ -207,5 +209,17 @@
     f2->SetName("MFRealData");
 
-    ncalc->SetFilter(f1);
+    MExtractSignal* sigextract = new MExtractSignal();
+    sigextract->SetRange(5, 9, 5, 9);
+
+    MMcCalibrationUpdate* mccalibupdate = new MMcCalibrationUpdate;
+    mccalibupdate->SetOuterPixelsGainScaling(kFALSE);
+    MCalibrate* mccalib = new MCalibrate;
+
+    // MC
+    sigextract->SetFilter(f1);
+    mccalibupdate->SetFilter(f1);
+    mccalib->SetFilter(f1);
+
+    // Data
     nanal->SetFilter(f2);
 
@@ -213,7 +227,12 @@
     tlist->AddToList(f2);
     tlist->AddToList(pcopy);
-    tlist->AddToList(ncalc);
     tlist->AddToList(pdnsb);
+
+    tlist->AddToList(sigextract);
+    tlist->AddToList(mccalibupdate);
+    tlist->AddToList(mccalib);
+
     tlist->AddToList(nanal);
+
     tlist->AddToList(fill1);
     tlist->AddToList(clean);
Index: /trunk/MagicSoft/Mars/mmain/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mmain/Makefile	(revision 3344)
+++ /trunk/MagicSoft/Mars/mmain/Makefile	(revision 3345)
@@ -25,5 +25,5 @@
 	   -I../mgui -I../mgeom -I../mhbase -I../mhist -I../mmontecarlo   \
            -I../mfileio -I../mimage -I../mhistmc -I../mgbase -I../mfbase \
-           -I../mdata -I../msignal
+           -I../mdata -I../msignal -I../mcalib
 
 #------------------------------------------------------------------------------