Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 5818)
+++ trunk/MagicSoft/Mars/Changelog	(revision 5819)
@@ -20,4 +20,11 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/01/13 Abelardo Moralejo
+
+   * macros/starmc.C
+     - Added (commented) lines for the case of gamma MC source off-axis 
+       (wobble mode). Changed default extractor to 
+       MExtractFixedWindowPeakSearch.
 
  2005/01/13 Raquel de los Reyes
Index: trunk/MagicSoft/Mars/macros/starmc.C
===================================================================
--- trunk/MagicSoft/Mars/macros/starmc.C	(revision 5818)
+++ trunk/MagicSoft/Mars/macros/starmc.C	(revision 5819)
@@ -52,5 +52,5 @@
   // differences in gain of outer pixels)
   //
-  CalibrationFilename = new TString("/data1/MAGIC/Period016/mcdata/fullmirror_spot_default/standard/gammas_nonoise/Gamma_zbin0_90_*.root");
+  CalibrationFilename = new TString("/data1/magic/mc_data/root/Period021_0.73_mirror/gammas_nonoise/Gamma_zbin0_*.root");
   // File to be used in the calibration (must be a camera file without added noise)
 
@@ -64,5 +64,5 @@
 
   OutFilename1 = new TString("star_train.root");   // Output file name 1 (test)
-  //  OutFilename2 = new TString("star_test.root"); // Output file name 2 (train)
+  OutFilename2 = new TString("star_test.root"); // Output file name 2 (train)
   //
   // Fraction of events (taken at random) which one wants to process from the 
@@ -72,8 +72,23 @@
   Float_t accepted_fraction = 1.;
 
-  Float_t CleanLev[2] = {4., 3.}; // Tail cuts for image analysis
-
-  Int_t BinsHigh[2] = {5, 10}; // First and last FADC bin of the range to be integrated,
-  Int_t BinsLow[2]  = {5, 10}; // for high and low gain respectively.
+  Float_t CleanLev[2] = {3., 2.}; // Tail cuts for image analysis
+
+  //  Int_t BinsHigh[2] = {5, 10}; // First and last FADC bin of the range to be integrated,
+  //  Int_t BinsLow[2]  = {5, 10}; // for high and low gain respectively.
+  //  MExtractSignal    sigextract;
+  //  sigextract.SetSaturationLimit(240);
+  // Define ADC slices to be integrated in high and low gain:
+  //  sigextract.SetRange(BinsHigh[0], BinsHigh[1], BinsLow[0], BinsLow[1]);
+
+  MExtractFixedWindowPeakSearch sigextract;
+  sigextract.SetWindows(6, 6, 4);
+
+  MSrcPosCam src;
+  //
+  // WOBBLE MODE!!
+  //   src.SetX(120.);  // units: mm
+
+  src.SetReadyToSave();
+
 
   // -------------------------------------------
@@ -89,5 +104,4 @@
   plist.AddToList(&tlist);
 
-  MSrcPosCam src;
   src.SetReadyToSave();
   plist.AddToList(&src);
@@ -113,9 +127,4 @@
   MMcPedestalCopy   pcopy; 
   // Copies pedestal data from the MC file run fadc header to the MPedestalCam container.
-
-  MExtractSignal    sigextract;
-  sigextract.SetSaturationLimit(240);
-  // Define ADC slices to be integrated in high and low gain:
-  sigextract.SetRange(BinsHigh[0], BinsHigh[1], BinsLow[0], BinsLow[1]);
 
   MPointingPosCalc pointcalc;