Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3862)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3863)
@@ -34,4 +34,11 @@
    * msignal/MExtractFixedWindowPeakSearch.[h,cc]
      - replacements for MExtractSignal, MExtractSignal2, MExtractSignal3
+
+
+   * macros/calibration.C
+   * macros/calibrate_data.C
+   * macros/pedphotcalc.C
+   * macros/bootcampstandardanalysis.C
+     - adapted to new extractors
 
 
Index: /trunk/MagicSoft/Mars/macros/calibrate_data.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/calibrate_data.C	(revision 3862)
+++ /trunk/MagicSoft/Mars/macros/calibrate_data.C	(revision 3863)
@@ -39,4 +39,6 @@
 {
 
+  MExtractSlidingWindow extractor;
+
   MRunIter pruns;
   MRunIter cruns;
@@ -122,7 +124,5 @@
   //  calloop.SetFullDisplay();
   //
-  // Use as signal extractor MExtractSignal2:
-  //
-  calloop.SetExtractorLevel(2);
+  calloop.SetExtractor(&extractor);
   //
   // Set the corr. cams:
@@ -195,5 +195,4 @@
   static_cast<MRead&>(read3).AddFiles(druns);
 
-  MExtractSignal2     sigcalc;
   MArrivalTimeCalc2   timecalc;
   MCalibrateData      photcalc;     
@@ -204,5 +203,5 @@
   tlist3.AddToList(&read3);
   tlist3.AddToList(&geomapl);
-  tlist3.AddToList(&sigcalc);
+  tlist3.AddToList(&extractor);
   tlist3.AddToList(&timecalc);
   //  tlist3.AddToList(&cerphotcalc); // already done by MCalibrate Data