Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3887)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3888)
@@ -30,4 +30,9 @@
        checks of the range there. Slight differences in every extractor
        because of the floating windows.
+
+
+   * mpedestals/MPedCalcPedRun.[h,cc]
+     - add the possibility to set ranges and extraction windows. Default
+       is what has always been
 
 
Index: /trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h
===================================================================
--- /trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h	(revision 3887)
+++ /trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h	(revision 3888)
@@ -2,6 +2,6 @@
 #define MARS_MPedCalcPedRun
 
-#ifndef MARS_MTask
-#include "MTask.h"
+#ifndef MARS_MExtractor
+#include "MExtractor.h"
 #endif
 
@@ -14,15 +14,19 @@
 #endif
 
-class MRawEvtData;
-class MPedestalCam;
 class MGeomCam;
-class MPedCalcPedRun : public MTask
+class MPedCalcPedRun : public MExtractor
 {
 
-  Byte_t fNumHiGainSamples;
-  UInt_t fNumSamplesTot;
+  static const Byte_t fgHiGainFirst;      // First FADC slice Hi-Gain (currently set to: 3) 
+  static const Byte_t fgHiGainLast;       // Last FADC slice Hi-Gain (currently set to: 14) 
+  static const Byte_t fgLoGainFirst;      // First FADC slice Lo-Gain (currently set to: 3) 
+  static const Byte_t fgLoGainLast;       // Last FADC slice Lo-Gain (currently set to: 14) 
+  static const Byte_t fgHiGainWindowSize; // The extraction window Hi-Gain
+  static const Byte_t fgLoGainWindowSize; // The extraction window Lo-Gain
+
+  UInt_t  fNumSamplesTot;
+  Byte_t  fWindowSizeHiGain;             // Number of Hi Gain slices in window
+  Byte_t  fWindowSizeLoGain;             // Number of Lo Gain slices in window  
   
-  MRawEvtData  *fRawEvt;     // raw event data (time slices)
-  MPedestalCam *fPedestals;  // Pedestals of all pixels in the camera
   MGeomCam     *fGeom;       // Camera geometry
   
@@ -46,5 +50,6 @@
   
   void Clear(const Option_t *o="");
-  void SetNumHiGainSamples(const Byte_t n)      { fNumHiGainSamples = n;   }
+  void SetRange(Byte_t hifirst=0, Byte_t hilast=0, Byte_t lofirst=0, Byte_t lolast=0);
+  void SetWindowSize(Byte_t windowh=0, Byte_t windowl=0);
   
   ClassDef(MPedCalcPedRun, 0)   // Task to calculate pedestals from pedestal runs raw data