Index: trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C
===================================================================
--- trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C	(revision 3860)
+++ trunk/MagicSoft/Mars/macros/bootcampstandardanalysis.C	(revision 3862)
@@ -60,4 +60,6 @@
 {
 
+  MExtractSlidingWindow extractor;
+
   MRunIter pruns;
   MRunIter cruns;
@@ -118,8 +120,5 @@
   MJCalibration     calloop;
   calloop.SetInput(&cruns);
-  //
-  // Use as signal extractor MExtractSignal:
-  //
-  calloop.SetExtractorLevel(1);
+  calloop.SetExtractor(&extractor);
   //
   // Set the corr. cams:
@@ -186,5 +185,4 @@
   static_cast<MRead&>(read3).AddFiles(pruns);  
 
-  MExtractSignal   extsig;
   MCalibrate       photcalc;
   photcalc.SetCalibrationMode(MCalibrate::kFfactor);
@@ -193,5 +191,5 @@
   tlist3.AddToList(&read3);
   tlist3.AddToList(&geomapl);
-  tlist3.AddToList(&extsig);
+  tlist3.AddToList(&extractor);
   tlist3.AddToList(&photcalc);
   //    tlist3.AddToList(&photrmscalc);
@@ -252,5 +250,5 @@
   tlist4.AddToList(&read4);
   tlist4.AddToList(&geomapl);
-  tlist4.AddToList(&extsig);
+  tlist4.AddToList(&extractor);
   tlist4.AddToList(&timecalc);
   tlist4.AddToList(&photcalc);
@@ -264,5 +262,4 @@
 
   if (!evtloop4.PreProcess())
-
     return;
   
Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 3860)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 3862)
@@ -63,4 +63,5 @@
 {
 
+  MExtractFixedWindowPeakSearch extractor;
   
   MRunIter pruns;
@@ -120,4 +121,5 @@
   //
   //  calloop.SetRelTimeCalibration();
+  calloop.SetExtractor(&extractor);
   calloop.SetInput(&cruns);
   calloop.SetDisplay(display);
@@ -134,4 +136,5 @@
   MJExtractCalibTest testloop;
 
+  testloop.SetExtractor(&extractor);
   testloop.SetInput(&cruns);
   testloop.SetDisplay(display);
Index: trunk/MagicSoft/Mars/macros/pedphotcalc.C
===================================================================
--- trunk/MagicSoft/Mars/macros/pedphotcalc.C	(revision 3860)
+++ trunk/MagicSoft/Mars/macros/pedphotcalc.C	(revision 3862)
@@ -65,5 +65,6 @@
 #include "MCalibrationQEPix.h"
 #include "MExtractedSignalCam.h"
-#include "MExtractSignal.h" 
+#include "MExtractSlidingWindow.h" 
+#include "MExtractFixedWindow.h" 
 #include "MCerPhotEvt.h"
 #include "MCalibrate.h"
@@ -210,4 +211,6 @@
                  )
 {
+
+  MExtractFixedWindow extractor;
   
   MRunIter pruns;
@@ -266,5 +269,5 @@
   // Use as signal extractor MExtractSignal:
   //
-  calloop.SetExtractorLevel(1);
+  calloop.SetExtractor(&extractor);
   //
   // The next two commands are for the display:
@@ -313,5 +316,4 @@
   static_cast<MRead&>(read3).AddFiles(pruns);  
 
-  MExtractSignal  sigcalc;
   MCalibrate      photcalc;
   photcalc.SetCalibrationMode(MCalibrate::kFfactor);
@@ -320,5 +322,5 @@
   tlist3.AddToList(&read3);
   tlist3.AddToList(&geomapl);
-  tlist3.AddToList(&sigcalc);
+  tlist3.AddToList(&extractor);
   tlist3.AddToList(&photcalc);
   tlist3.AddToList(&pedphotcalc);