Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 5020)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 5021)
@@ -19,4 +19,12 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/09/19: Abelardo Moralejo
+
+   * macros/starmc.C, mccalibrate.C, starmc2.C
+     - adapted to changes in MHillasCalc from August 23. The macros
+       did no longer work, but only today did someone report it... 
+       Sorry!
+
  2004/09/14: Antonio Stamerra
 
Index: /trunk/MagicSoft/Mars/macros/mccalibrate.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/mccalibrate.C	(revision 5020)
+++ /trunk/MagicSoft/Mars/macros/mccalibrate.C	(revision 5021)
@@ -44,7 +44,7 @@
   // ------------- user change -----------------
   TString* CalibrationFilename;
-  CalibrationFilename = new TString("../../gammas_nonoise/Gamma_zbin0_0*.root");  // File to be used for the calibration (must be a camera file without added noise)
-
-  Char_t* AnalysisFilename = "Proton_zbin0_0*.root";  // File to be analyzed
+  CalibrationFilename = new TString("../gammas_nonoise/Gamma_zbin0_0*.root");  // File to be used for the calibration (must be a camera file without added noise)
+
+  Char_t* AnalysisFilename = "Gamma_zbin9_90_7_1740to1749_w0.root";  // File to be analyzed
 
   Char_t* OutFilename      = "calibrated_data.root";  // Output file name
@@ -121,4 +121,5 @@
 
   MHillasCalc hcalc; // Calculates Hillas parameters not dependent on source position.
+  hcalc.Disable(MHillasCalc::kCalcHillasSrc);
 
   MMcCalibrationCalc mccalibcalc; 
Index: /trunk/MagicSoft/Mars/macros/starmc.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/starmc.C	(revision 5020)
+++ /trunk/MagicSoft/Mars/macros/starmc.C	(revision 5021)
@@ -52,8 +52,8 @@
   // differences in gain of outer pixels)
   //
-  CalibrationFilename = new TString("../../gammas_nonoise/Gamma_zbin0_90_*.root");
+  CalibrationFilename = new TString("../../standard/gammas_nonoise/Gamma_zbin0_90_*.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_zbin9_90_7_52780to52784_w0.root";  // File to be analyzed
 
 
@@ -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 
@@ -130,5 +130,5 @@
 
   MHillasCalc       hcalc; // Calculates Hillas parameters not dependent on source position.
-  MHillasSrcCalc    scalc; // Calculates source-dependent Hillas parameters 
+  hcalc.Disable(MHillasCalc::kCalcHillasSrc);
 
   MMcCalibrationCalc mccalibcalc;
@@ -159,4 +159,5 @@
   write1.AddContainer("MHillasExt",    "Events");
   write1.AddContainer("MHillasSrc",    "Events");
+  write1.AddContainer("MImagePar",     "Events");
   write1.AddContainer("MNewImagePar",  "Events");
 
@@ -171,4 +172,5 @@
       write2.AddContainer("MHillasExt",    "Events");
       write2.AddContainer("MHillasSrc",    "Events");
+      write2.AddContainer("MImagePar",     "Events");
       write2.AddContainer("MNewImagePar",  "Events");
 
@@ -231,6 +233,5 @@
   tlist.RemoveFromList(&mccalibcalc); // Removes calibration task from list.
 
-  tlist.AddToList(&scalc);            // Calculates Source-dependent Hillas parameters
-
+  hcalc.Enable(MHillasCalc::kCalcHillasSrc);
 
   // Add tasks to write output:
Index: /trunk/MagicSoft/Mars/macros/starmc2.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/starmc2.C	(revision 5020)
+++ /trunk/MagicSoft/Mars/macros/starmc2.C	(revision 5021)
@@ -73,10 +73,9 @@
 
   MHillasCalc       hcalc; // Calculates Hillas parameters not dependent on source position.
-  MHillasSrcCalc    scalc; // Calculates source-dependent Hillas parameters 
+  hcalc.Enable(MHillasCalc::kCalcHillasSrc);
 
   tlist.AddToList(&read);
   tlist.AddToList(&clean);
   tlist.AddToList(&hcalc);
-  tlist.AddToList(&scalc); // Calculates Source-dependent Hillas parameters
 
   //