Index: trunk/MagicSoft/Mars/macros/starmc.C
===================================================================
--- trunk/MagicSoft/Mars/macros/starmc.C	(revision 2874)
+++ trunk/MagicSoft/Mars/macros/starmc.C	(revision 2886)
@@ -1,26 +1,26 @@
 /* ======================================================================== *\
-!
-! *
-! * This file is part of MARS, the MAGIC Analysis and Reconstruction
-! * Software. It is distributed to you in the hope that it can be a useful
-! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
-! * It is distributed WITHOUT ANY WARRANTY.
-! *
-! * Permission to use, copy, modify and distribute this software and its
-! * documentation for any purpose is hereby granted without fee,
-! * provided that the above copyright notice appear in all copies and
-! * that both that copyright notice and this permission notice appear
-! * in supporting documentation. It is provided "as is" without express
-! * or implied warranty.
-! *
-!
-!
-!   Author(s): Abelardo Moralejo 1/2004 <mailto:moralejo@pd.infn.it>
-!              Thomas Bretz  5/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2004
-!
-!
-\* ======================================================================== */
+   !
+   ! *
+   ! * This file is part of MARS, the MAGIC Analysis and Reconstruction
+   ! * Software. It is distributed to you in the hope that it can be a useful
+   ! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
+   ! * It is distributed WITHOUT ANY WARRANTY.
+   ! *
+   ! * Permission to use, copy, modify and distribute this software and its
+   ! * documentation for any purpose is hereby granted without fee,
+   ! * provided that the above copyright notice appear in all copies and
+   ! * that both that copyright notice and this permission notice appear
+   ! * in supporting documentation. It is provided "as is" without express
+   ! * or implied warranty.
+   ! *
+   !
+   !
+   !   Author(s): Abelardo Moralejo 1/2004 <mailto:moralejo@pd.infn.it>
+   !              Thomas Bretz  5/2002 <mailto:tbretz@astro.uni-wuerzburg.de>
+   !
+   !   Copyright: MAGIC Software Development, 2000-2004
+   !
+   !
+   \* ======================================================================== */
 
 /////////////////////////////////////////////////////////////////////////////
@@ -37,115 +37,152 @@
 void starmc()
 {
-    //
-    // This is a demonstration program which calculates the image 
-    // parameters from Magic Monte Carlo files (output of camera).
-
-    //
-    // Create a empty Parameter List and an empty Task List
-    // The tasklist is identified in the eventloop by its name
-    //
-    MParList  plist;
-
-    MTaskList tlist;
-
-    plist.AddToList(&tlist);
-
-    MSrcPosCam src;
-    src.SetReadyToSave();
-
-    plist.AddToList(&src);
-
-    //
-    // Now setup the tasks and tasklist:
-    // ---------------------------------
-    //
-    MReadMarsFile read("Events");
-
-    // ------------- user change -----------------
-
-    read.AddFile("Gamma_zbin*.root");
-
-    read.DisableAutoScheme();
-
-    MGeomApply geom; // Reads in geometry from MC file and sets the right sizes for
-                     // several parameter containers.
-
-    MMcPedestalCopy   pcopy; 
-    // Copies pedestal data from the MC file run fadc header to the MPedestalCam container.
-
-    MExtractSignal    sigextract;
-    // Define ADC slices to be integrated in high and low gain:
-    sigextract.SetRange(0, 5, 0, 5);
-
-    MMcCalibrationUpdate  mccalibupdate;
-
-    //
-    // Now introduce conversion factor from ADC counts to photons before camera for 
-    // inner pixels. The corresponding value for outer pixels is then calculated
-    // automatically. Bear in mind that the conversion factor depend both on the
-    // parameters used in the camera simulation as well as on the number of 
-    // integrated FADC slices. In the future it should be calculated in a previous
-    // event loop, either from the same MC file or from a MC calibration file
-    // written on purpose.
-    // (FIXME: the conversion must be calculated automatically from the analyzed file)
-    //
-    mccalibupdate.SetADC2PhInner(1.2586);
+  //
+  // This is a demonstration program which calculates the image 
+  // parameters from Magic Monte Carlo files (output of camera).
 
 
-    MCalibrate calib; // Transforms signals from ADC counts into photons.
+  // ------------- user change -----------------
 
-    //    MBlindPixelCalc   blind;
-    //    blind.SetUseInterpolation();
+  TString* CalibrationFilename;
 
-    MImgCleanStd      clean(4.1,3.4); // Applies tail cuts to image.
+  //
+  // Comment out next line to disable calibration. In that case the units of the 
+  // MHillas.fSize parameter will be ADC counts (rather, equivalent ADC counts in
+  // inner pixels, since we correct for the possible differences in gain of outer 
+  // pixels)
+  //
+  CalibrationFilename = new TString("../../../nonoise/gammas/Gamma_zbin0_0*.root");
+  // File to be used in the calibration (must be a camera file without added noise)
+
+  Char_t* AnalysisFilename = "Proton_zbin*.root";  // File to be analyzed
+  Char_t* OutFilename      = "star_mc.root";       // Output file name
+
+  Float_t CleanLev[2] = {4., 3.}; // Tail cuts for image analysis
+
+  Int_t BinsHigh[2] = {0, 5}; // First and last FADC bin of the range to be integrated,
+  Int_t BinsLow[2]  = {0, 5}; // for high and low gain respectively.
+
+  // -------------------------------------------
+
+  //
+  // Create a empty Parameter List and an empty Task List
+  // The tasklist is identified in the eventloop by its name
+  //
+  MParList  plist;
+
+  MTaskList tlist;
+
+  plist.AddToList(&tlist);
+
+  MSrcPosCam src;
+  src.SetReadyToSave();
+
+  plist.AddToList(&src);
+
+  //
+  // Now setup the tasks and tasklist:
+  // ---------------------------------
+  //
+  MReadMarsFile read("Events");
+
+  if (CalibrationFilename)
+    read.AddFile(CalibrationFilename->Data());
+
+  read.DisableAutoScheme();
+
+  MGeomApply geom; // Reads in geometry from MC file and sets the right sizes for
+  // several parameter containers.
+
+  MMcPedestalCopy   pcopy; 
+  // Copies pedestal data from the MC file run fadc header to the MPedestalCam container.
+
+  MExtractSignal    sigextract;
+  // Define ADC slices to be integrated in high and low gain:
+  sigextract.SetRange(BinsHigh[0], BinsHigh[1], BinsLow[0], BinsLow[1]);
+
+  MMcCalibrationUpdate  mccalibupdate;
+
+  MCalibrate calib; // Transforms signals from ADC counts into photons.
+
+  //    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.
+  MHillasSrcCalc    scalc; // Calculates source-dependent Hillas parameters 
+
+  MMcCalibrationCalc mccalibcalc;
+
+  tlist.AddToList(&read);
+  tlist.AddToList(&geom);
+  tlist.AddToList(&pcopy);
+
+  tlist.AddToList(&sigextract);
+  tlist.AddToList(&mccalibupdate);
+  tlist.AddToList(&calib);
+  tlist.AddToList(&clean);
+  //    tlist.AddToList(&blind);
+  tlist.AddToList(&hcalc);
+
+  tlist.AddToList(&mccalibcalc);
+
+  //
+  // Open output file:
+  //
+  MWriteRootFile write(OutFilename); // Writes output
+  write.AddContainer("MRawRunHeader", "RunHeaders");
+  write.AddContainer("MMcRunHeader",  "RunHeaders");
+  write.AddContainer("MSrcPosCam",    "RunHeaders");
+  write.AddContainer("MMcEvt",        "Events");
+  write.AddContainer("MHillas",       "Events");
+  write.AddContainer("MHillasExt",    "Events");
+  write.AddContainer("MHillasSrc",    "Events");
+  write.AddContainer("MNewImagePar",  "Events");
+
+  //
+  // First loop: Calibration loop
+  //
+
+  MProgressBar bar;
+  bar.SetWindowName("Calibrating...");
+
+  MEvtLoop evtloop;
+  evtloop.SetProgressBar(&bar);
+  evtloop.SetParList(&plist);
+
+  if (CalibrationFilename)
+    {
+      if (!evtloop.Eventloop())
+	return;
+      mccalibcalc->GetHist()->Write();
+    }
+
+  //
+  // Second loop: analysis loop
+  //
+
+  //
+  // Change the read task by another one which reads the file we want to analyze:
+  //
+
+  MReadMarsFile read2("Events");
+  read2.AddFile(AnalysisFilename);
+  read2.DisableAutoScheme();
+  tlist.AddToListBefore(&read2, &read, "All");
+  tlist.RemoveFromList(&read);
+
+  bar.SetWindowName("Analyzing...");
+
+  tlist.RemoveFromList(&mccalibcalc); // Removes calibration task from list.
+
+  tlist.AddToList(&scalc);            // Calculates Source-dependent Hillas parameters
+
+  tlist.AddToList(&write);            // Add task to write output.
+
+  if (!evtloop.Eventloop())
+    return;
 
 
-    MHillasCalc       hcalc; // Calculates Hillas parameters not dependent on source position.
-    MHillasSrcCalc    scalc; // Calculates source-dependent Hillas parameters 
-                             // (!!Preliminary!! Will be removed later!)
-
-
-    // ------------- user change -----------------
-
-    MWriteRootFile write("star_mc.root"); // Writes output
-
-    write.AddContainer("MRawRunHeader", "RunHeaders");
-    write.AddContainer("MMcRunHeader",  "RunHeaders");
-    write.AddContainer("MSrcPosCam",    "RunHeaders");
-    write.AddContainer("MMcEvt",        "Events");
-    write.AddContainer("MHillas",       "Events");
-    write.AddContainer("MHillasExt",    "Events");
-    write.AddContainer("MHillasSrc",    "Events");
-    write.AddContainer("MNewImagePar",  "Events");
-
-
-    tlist.AddToList(&read);
-    tlist.AddToList(&geom);
-    tlist.AddToList(&pcopy);
-
-    tlist.AddToList(&sigextract);
-    tlist.AddToList(&mccalibupdate);
-    tlist.AddToList(&calib);
-    tlist.AddToList(&clean);
-    //    tlist.AddToList(&blind);
-    tlist.AddToList(&hcalc);
-    tlist.AddToList(&scalc);
-    tlist.AddToList(&write);
-
-    //
-    // Create and set up the eventloop
-    //
-    MProgressBar bar;
-
-    MEvtLoop evtloop;
-    evtloop.SetProgressBar(&bar);
-    evtloop.SetParList(&plist);
-
-    //
-    // Execute your analysis
-     //
-    if (!evtloop.Eventloop())
-        return;
-
-    tlist.PrintStatistics();
+  tlist.PrintStatistics();
 }
