Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 6869)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 6870)
@@ -178,5 +178,5 @@
 const Int_t MJCalibration::gkThirdBlindPixelInstallation   = 43308;
 const TString MJCalibration::fgReferenceFile = "mjobs/calibrationref.rc";
-const TString MJCalibration::fgHiLoCalibFile = "mjobs/hilocalib_df4.root";
+const TString MJCalibration::fgHiLoCalibFile = "mjobs/hilocalib_df46.root";
 
 // --------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mjobs/MJPedestal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJPedestal.cc	(revision 6869)
+++ trunk/MagicSoft/Mars/mjobs/MJPedestal.cc	(revision 6870)
@@ -33,4 +33,7 @@
 #include "MJPedestal.h"
 
+// C/C++ includes
+#include <fstream>
+
 // root classes
 #include <TF1.h>
@@ -86,6 +89,4 @@
 #include "MFTriggerPattern.h"
 
-#include <fstream>
-
 ClassImp(MJPedestal);
 
@@ -94,6 +95,7 @@
 const TString  MJPedestal::fgReferenceFile   = "mjobs/pedestalref.rc";
 const TString  MJPedestal::fgBadPixelsFile   = "mjobs/badpixels_0_559.rc";
-const Float_t  MJPedestal::fgExtractWinLeft  = 2.5;
-const Float_t  MJPedestal::fgExtractWinRight = 5.0;
+const Float_t  MJPedestal::fgExtractWinLeft  = 3.5;
+const Float_t  MJPedestal::fgExtractWinRight = 4.5;
+
 // --------------------------------------------------------------------------
 //
@@ -1291,5 +1293,5 @@
         // Get the ranges for the new extractor setting
         //
-        const Int_t newfirst = (Int_t)(meanpulsetime-fExtractWinLeft);
+        const Int_t newfirst = TMath::Nint(meanpulsetime-fExtractWinLeft);
         Int_t wshigain = fExtractor->InheritsFrom("MExtractTimeAndCharge") 
           ?  ((MExtractTimeAndCharge*)fExtractor)->GetWindowSizeHiGain()
@@ -1302,8 +1304,8 @@
           ? ((MExtractTimeAndCharge*)fExtractor)->GetWindowSizeLoGain()
           : 6;
-        if (wslogain > 6)
-          wslogain = 6;
-
-        const Int_t newlast  = (Int_t)(meanpulsetime+fExtractWinRight);
+        if (wslogain > 4)
+          wslogain = 4;
+
+        const Int_t newlast  = TMath::Nint(meanpulsetime+fExtractWinRight);
 
         *fLog << all << underline 
@@ -1331,5 +1333,5 @@
             *fLog << "Try to use a different extractor (e.g. with a window size of only 4 sl.) or:" << endl;
             *fLog << "Set the limit to a lower value (callisto.rc: line 329): " << endl;
-            *fLog << "    MJPedestalY2:ExtractWinRight: 5.0           " << endl;
+            *fLog << "    MJPedestalY2:ExtractWinRight: 4.5           " << endl;
             *fLog << "(ATTENTION, you will lose late cosmics pulses!)" << endl;
             *fLog << endl;