Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 4119)
+++ trunk/MagicSoft/Mars/Changelog	(revision 4120)
@@ -20,4 +20,9 @@
 
  2004/05/22: Abelardo Moralejo
+
+   * macros/calibrate_data.C
+     - removed wrong call to MPedCalcPedRun::SetExtractor, which does
+       not exist (should use MJPedestal like calibration.C, instead of 
+       a normal loop)
 
    * msignal/MExtractFixedWindowPeakSearch.[h,cc]
Index: trunk/MagicSoft/Mars/macros/calibrate_data.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibrate_data.C	(revision 4119)
+++ trunk/MagicSoft/Mars/macros/calibrate_data.C	(revision 4120)
@@ -24,10 +24,10 @@
 \* ======================================================================== */
 
-const TString defpath = "/home/rootdata/Calib/2004_04_16/";
+const TString defpath = "./";
 const TString defrout = "output_test.root";
 
-const Int_t defpedr [] = {22265};
-const Int_t defcalr [] = {22300};
-const Int_t defdatar[] = {22300};
+const Int_t defpedr [] = {20122};
+const Int_t defcalr [] = {20125};
+const Int_t defdatar[] = {20122};
 
 void calibrate_data(const TString inpath=defpath, 
@@ -39,5 +39,7 @@
 {
 
-  MExtractSlidingWindow extractor;
+//  MExtractSlidingWindow extractor;
+
+  MExtractFixedWindowPeakSearch extractor;
   MExtractTimeFastSpline timeext;
 
@@ -94,5 +96,4 @@
   MGeomApply     geomapl;
   MPedCalcPedRun pedcalc;
-  pedcalc.SetExtractor(&extractor);
   MGeomCamMagic  geomcam;