Index: trunk/MagicSoft/Mars/macros/getExtractor.C
===================================================================
--- trunk/MagicSoft/Mars/macros/getExtractor.C	(revision 5507)
+++ trunk/MagicSoft/Mars/macros/getExtractor.C	(revision 5508)
@@ -87,4 +87,22 @@
 //       36:  Real Fit: (not yet implemented)" << endl;
 // 
+// The extractor will also carry a meaningful name, storing all information about its 
+// initialization there.
+//
+//////////////////////////////////////////////////////////////////////////////////////////
+#include "MExtractor.h"
+#include "MExtractFixedWindowPeakSearch.h"
+#include "MExtractFixedWindow.h"
+#include "MExtractFixedWindowSpline.h"
+#include "MExtractTimeAndChargeDigitalFilter.h"
+#include "MExtractTimeAndChargeSlidingWindow.h"
+#include "MExtractTimeAndChargeSpline.h"
+#include "MLog.h"
+
+#include <TSystem.h>
+#include <fstream>
+
+using namespace std;
+
 MExtractor *getExtractor(const UInt_t flag)
 {
@@ -174,5 +192,5 @@
     case 35:
       extractor = new MExtractTimeAndChargeDigitalFilter;
-      extractor->SetRange(0,18,2,14);
+      extractor->SetRange(0,14,2,14);
       useTimeAndCharge = kTRUE;
       break;
@@ -309,5 +327,5 @@
       break;
     default:
-      cout << "No valid extractor flag chosen, cannot run..." << endl;
+      gLog << "No valid extractor flag chosen, cannot run..." << endl;
       return NULL;
       break;
@@ -370,5 +388,5 @@
       break;
     default:
-      cout << "No valid extractor flag chosen, cannot run..." << endl;
+      gLog << "No valid extractor flag chosen, cannot run..." << endl;
       return NULL;
       break;