Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 6357)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 6362)
@@ -149,5 +149,5 @@
 // to the extractor-TDAS
 // 
-static Int_t extractorflag = 34;
+static Int_t extractorflag = 35;
 //
 Int_t calibration(const UInt_t extflag=extractorflag, const Int_t prun=pedrun, 
@@ -475,5 +475,8 @@
     gLog << "     31:          SetNameWeightsFile('msignal/cosmics_weights_logain4.dat')" << endl;
     gLog << "     32:          SetNameWeightsFile('msignal/calibration_weights_UV.dat')" << endl;
-    gLog << "     33:          Use calibration weights for calibration events and cosmics weights for data events" << endl;
+    gLog << "     33:          SetNameWeightsFile('msignal/calibration_weights_UV_logain.dat')" << endl;
+    gLog << "     34:          SetNameWeightsFile('msignal/MC_weights.dat')" << endl;
+    gLog << "      MExtractTimeAndChargeDigitalFilterPeakSearch" << endl;
+    gLog << "     35:          SetNameWeightsFile('msignal/calibration_weights_UV.dat')" << endl;
     gLog << endl;
     gLog << "     --inpath=#          Find the data in inpath"                      << endl;
Index: trunk/MagicSoft/Mars/macros/getExtractor.C
===================================================================
--- trunk/MagicSoft/Mars/macros/getExtractor.C	(revision 6357)
+++ trunk/MagicSoft/Mars/macros/getExtractor.C	(revision 6362)
@@ -83,5 +83,7 @@
 //       32:          SetNameWeightsFile('msignal/calibration_weights_UV.dat') 
 //       33:          SetNameWeightsFile('msignal/calibration_weights_UV_logain.dat') 
-//       34:  Real Fit: (not yet implemented) 
+//       34:          SetNameWeightsFile('msignal/MC_weights.dat') 
+//        MExtractTimeAndChargeDigitalFilterPeakSearch 
+//       35:          SetNameWeightsFile('msignal/calibration_weights_UV.dat') 
 // 
 // The extractor will also carry a meaningful name, storing all information about its 
@@ -94,4 +96,5 @@
 #include "MExtractFixedWindowSpline.h"
 #include "MExtractTimeAndChargeDigitalFilter.h"
+#include "MExtractTimeAndChargeDigitalFilterPeakSearch.h"
 #include "MExtractTimeAndChargeSlidingWindow.h"
 #include "MExtractTimeAndChargeSpline.h"
@@ -182,9 +185,14 @@
     case 32:
     case 33:
-      extractor = new MExtractTimeAndChargeDigitalFilter;
-      extractor->SetRange(0,18,3,14);
+    case 34:
+      extractor = new MExtractTimeAndChargeDigitalFilter();
+      extractor->SetRange(0,14,3,14);
+      break;
+    case 35:
+      extractor = new MExtractTimeAndChargeDigitalFilterPeakSearch();
+      extractor->SetRange(0,20,3,14);
       break;
     default:
-      gLog << "No valid extractor flag chosen, cannot run..." << endl;
+      gLog << "No valid extractor flag chosen, cannot run..." << flag << endl;
       return NULL;
       break;
@@ -313,4 +321,10 @@
     case 33:
       ((MExtractTimeAndChargeDigitalFilter*)extractor)->SetNameWeightsFile("msignal/calibration_weights_UV_logaintest.dat");
+      break;
+    case 34:
+      ((MExtractTimeAndChargeDigitalFilter*)extractor)->SetNameWeightsFile("msignal/MC_weights.dat");
+      break;
+    case 35:
+      ((MExtractTimeAndChargeDigitalFilter*)extractor)->SetNameWeightsFile("msignal/calibration_weights_UV.dat");
       break;
     default: