Index: trunk/MagicSoft/Mars/macros/starmc.C
===================================================================
--- trunk/MagicSoft/Mars/macros/starmc.C	(revision 6250)
+++ trunk/MagicSoft/Mars/macros/starmc.C	(revision 6318)
@@ -52,8 +52,10 @@
   // differences in gain of outer pixels)
   //
-  CalibrationFilename = new TString("/data1/magic/mc_data/root/Period021_0.73_mirror/gammas_nonoise/Gamma_zbin0_*.root");
+  CalibrationFilename = new TString("/users/emc/moralejo/mcdata/Period021_0.73_mirror/gammas_nonoise/Gamma_zbin0_*.root");
+
   // File to be used in the calibration (must be a camera file without added noise)
 
-  Char_t* AnalysisFilename = "Gamma_zbin*.root";  // File to be analyzed
+  Char_t* AnalysisFilename = "Gamma_*w0.root";  // File to be analyzed
+  //  Char_t* AnalysisFilename = "Gamma_*1000to1009*w0.root";  // File to be analyzed
 
 
@@ -72,5 +74,7 @@
   Float_t accepted_fraction = 1.;
 
-  Float_t CleanLev[2] = {3., 2.}; // Tail cuts for image analysis
+  Float_t CleanLev[2] = {5.75, 3.84}; // Tail cuts for image analysis
+  MImgCleanStd  clean(CleanLev[0], CleanLev[1]); // Applies tail cuts to image.
+  //  clean.SetMethod(MImgCleanStd::kScaled);
 
   //  Int_t BinsHigh[2] = {5, 10}; // First and last FADC bin of the range to be integrated,
@@ -81,6 +85,11 @@
   //  sigextract.SetRange(BinsHigh[0], BinsHigh[1], BinsLow[0], BinsLow[1]);
 
-  MExtractFixedWindowPeakSearch sigextract;
-  sigextract.SetWindows(6, 6, 4);
+//     MExtractFixedWindowPeakSearch sigextract;
+//     sigextract.SetWindows(6, 6, 4);
+
+   MExtractTimeAndChargeDigitalFilter sigextract;
+   sigextract.SetNameWeightsFile("/users/emc/moralejo/Mars/msignal/MC_weights.dat");
+   sigextract.SetNameWeightsFile("/users/emc/moralejo/Mars/msignal/cosmics_weights.dat");
+   sigextract.SetRange(1, 14, 3, 14);
 
   MSrcPosCam src;
@@ -136,9 +145,8 @@
   MCalibrateData calib; // Transforms signals from ADC counts into photons.
   calib.SetCalibrationMode(MCalibrateData::kFfactor);
+  calib.SetSignalType(MCalibrateData::kPhe);
 
   //    MBlindPixelCalc   blind;
   //    blind.SetUseInterpolation();
-
-  MImgCleanStd      clean(CleanLev[0], CleanLev[1]); // Applies tail cuts to image.
 
   MHillasCalc       hcalc; // Calculates Hillas parameters not dependent on source position.
@@ -223,9 +231,9 @@
   //
 
-  MProgressBar bar;
-  bar.SetWindowName("Calibrating...");
+  //  MProgressBar bar;
+  //  bar.SetWindowName("Calibrating...");
 
   MEvtLoop evtloop;
-  evtloop.SetProgressBar(&bar);
+  //  evtloop.SetProgressBar(&bar);
   evtloop.SetParList(&plist);
 
@@ -261,5 +269,5 @@
   tlist.AddToListBefore(&skip, &sigextract);
 
-  bar.SetWindowName("Analyzing...");
+  //  bar.SetWindowName("Analyzing...");
 
   tlist.RemoveFromList(&mccalibcalc); // Removes calibration task from list.