Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3441)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3442)
@@ -4,78 +4,89 @@
 
                                                  -*-*- END OF LINE -*-*-
-
-2004/03/08: Abelardo Moralejo
-
-  * macros/starmc.C, starmstereo.C, mccalibrate.C 
-    - adapted to m. Gaug's changes: now one MBadPixelsCam containers is 
-      added for each telescope to the parameter list.
-
-  * mmain/MEventDisplay.cc, Makefile
-    - added MBadPixelsCam to par list, and mbadpixels/ to includes.
-      Necessary due to changes in MCalibrate.
-
-2004/03/06: Markus Gaug
-
-  * macros/calibration.C
-    - adapted call to MHCamera::ProjectionS to the new version
-
-  * mcalib/Makefile
-    - include directory mbadpixels
-
-  * manalysis/Makefile
-    - include directory mbadpixels
-
-  * mcalib/MCalibrationChargeCalc.[h,cc]
-    - include MBadPixelsCam
-    - remove exclusion of pixels from ascii-file
-      (now accessible from MBadPixelsCam)
-
-  * mcalib/MCalibrationChargePix.[h,cc]
-    - include MBadPixelsCam
-
-  * mcalib/MCalibrationChargeCam.[h,cc]
-    - include MBadPixelsCam
-
-  * mcalib/MHCalibrationChargeCam.[h,cc]
-    - include MBadPixelsCam
-    - include one additional MBadPixelsPix for the average inner and 
-      outer pixel, respectively
-
-  * mcalib/MHCalibrationChargePix.[h,cc]
-    - make fSaturated and fPickup a Float_t (for average pixel)
-
-  * mbadpixels/MBadPixelsPix.h
-    - include the CalibrationType_t infos
-    - exchange "SetUnsuitable" by "SetUnsuitableRun"
-
-  * mbadpixels/MBadPixelsCam.cc
-  * mbadpixels/MMcBadPixelsSet.cc
-    - exchange "SetUnsuitable" by "SetUnsuitableRun"
-
-  * mbadpixels/MBadPixelsCalc.cc
-    - exchange "SetUnsuitable" by "SetUnsuitableEvt"
-
-  * manalysis/MGeomApply.cc
-    - remove obsolete MArrivalTime
-    - add MBadPixelsCam
-
-  * mcalib/MCalibrate.[h,cc]
-  * mcalib/MCalibrateData.[h,cc]
-    - implemented calls to MBadPixelsCam
-
-  * macros/calibration.C
-  * macros/bootcampstandardanalysis.C
-  * macros/pedphotcalc.C
-    - implemented calls to MBadPixelsCam
-
-  * mjobs/MJCalibration.cc
-    - call to MBadPixelsCam
-     
-
-2004/03/05: Nadia Tonello
-
-   * manalysis/MBlindPixelsCalc2.[h,cc]
-   * manalysis/AnalysisLinkDef.h
+ 2004/03/08: Thomas Bretz
+
+   * merpp.cc:
+     - fixed a bug in the screen output
+
+   * mgeom/MGeomMirror.cc:
+     - added comment
+
+   * mmc/MMcConfigRunHeader.h:
+     - added member function GetMirrors
+
+
+
+ 2004/03/08: Abelardo Moralejo
+
+   * macros/starmc.C, starmstereo.C, mccalibrate.C 
+      - adapted to m. Gaug's changes: now one MBadPixelsCam containers is 
+        added for each telescope to the parameter list.
+
+   * mmain/MEventDisplay.cc, Makefile
+     - added MBadPixelsCam to par list, and mbadpixels/ to includes.
+       Necessary due to changes in MCalibrate.
+
+
+
+ 2004/03/06: Markus Gaug
+
+   * macros/calibration.C
+     - adapted call to MHCamera::ProjectionS to the new version
+
+   * mcalib/Makefile
+     - include directory mbadpixels
+
    * manalysis/Makefile
+     - include directory mbadpixels
+
+   * mcalib/MCalibrationChargeCalc.[h,cc]
+     - include MBadPixelsCam
+     - remove exclusion of pixels from ascii-file
+       (now accessible from MBadPixelsCam)
+
+   * mcalib/MCalibrationChargePix.[h,cc]
+     - include MBadPixelsCam
+
+   * mcalib/MCalibrationChargeCam.[h,cc]
+     - include MBadPixelsCam
+
+   * mcalib/MHCalibrationChargeCam.[h,cc]
+     - include MBadPixelsCam
+     - include one additional MBadPixelsPix for the average inner and 
+       outer pixel, respectively
+
+   * mcalib/MHCalibrationChargePix.[h,cc]
+     - make fSaturated and fPickup a Float_t (for average pixel)
+
+   * mbadpixels/MBadPixelsPix.h
+     - include the CalibrationType_t infos
+     - exchange "SetUnsuitable" by "SetUnsuitableRun"
+
+   * mbadpixels/MBadPixelsCam.cc, mbadpixels/MMcBadPixelsSet.cc:
+     - exchange "SetUnsuitable" by "SetUnsuitableRun"
+
+   * mbadpixels/MBadPixelsCalc.cc:
+     - exchange "SetUnsuitable" by "SetUnsuitableEvt"
+
+   * manalysis/MGeomApply.cc
+     - remove obsolete MArrivalTime
+     - add MBadPixelsCam
+
+   * mcalib/MCalibrate.[h,cc], mcalib/MCalibrateData.[h,cc]
+     - implemented calls to MBadPixelsCam
+
+   * macros/calibration.C, macros/bootcampstandardanalysis.C,
+     macros/pedphotcalc.C
+     - implemented calls to MBadPixelsCam
+
+   * mjobs/MJCalibration.cc
+     - call to MBadPixelsCam
+
+
+
+ 2004/03/05: Nadia Tonello
+
+   * manalysis/MBlindPixelsCalc2.[h,cc], manalysis/AnalysisLinkDef.h,
+     manalysis/Makefile
      - Temporary class added (will be included in mbadpixels/ soon)
      - All the functions of MBlindPixelCalc are kept(with small improvements)
@@ -88,15 +99,18 @@
      - Checks for Unmapped status added 
 
-   * mastro/MAstroCatalog.cc
-   * msql/MSQLServer.cc
+   * mastro/MAstroCatalog.cc, msql/MSQLServer.cc:
      - include <stdlib.h> to solve compilation error
 
 
-2004/03/05: Sebastian Raducci
+
+ 2004/03/05: Sebastian Raducci
+
    * msignal/MArrivalTimeCalc.cc
      - fixed a little bug (exchanged a - with a + in the Calc() method)
- 
-
-2004/03/05: Markus Gaug
+
+
+
+ 2004/03/05: Markus Gaug
+
    * mcalib/MCalibraitonChargeCalc.cc
      - remove some runheader line: 
@@ -107,4 +121,5 @@
 
 
+
  2004/03/04: Sebastian Raducci
   
@@ -112,4 +127,6 @@
      - fixed a memory leak (the spline was not deleted...)
 
+
+
  2004/03/04: Thomas Bretz
 
@@ -170,4 +187,10 @@
    * mjobs/MJPedestal.cc:
      - adapted to changes in MHCamera
+
+   * mastro/MAstroCatalog.[h,cc]:
+     - added preliminary catalog
+
+   * mastro/Makefile, mastro/AstroLinkDef.h:
+     - added MAstroCatalog
 
 
Index: trunk/MagicSoft/Mars/merpp.cc
===================================================================
--- trunk/MagicSoft/Mars/merpp.cc	(revision 3441)
+++ trunk/MagicSoft/Mars/merpp.cc	(revision 3442)
@@ -125,6 +125,10 @@
         gDebug=1;
 
-    MTime kTimeStart(AnalyseTime(arg.GetStringAndRemove("--start=")));
-    MTime kTimeStop(AnalyseTime(arg.GetStringAndRemove("--stop=")));
+    MTime kTimeStart;
+    MTime kTimeStop;
+    if (arg.HasOption("--star="))
+        kTimeStart = AnalyseTime(arg.GetStringAndRemove("--start="));
+    if (arg.HasOption("--stop="))
+        kTimeStop = AnalyseTime(arg.GetStringAndRemove("--stop="));
 
     const Int_t   kRunNumber   = arg.HasOption("--run=") ? arg.GetIntAndRemove("--run=") : -1;
Index: trunk/MagicSoft/Mars/mgeom/MGeomMirror.cc
===================================================================
--- trunk/MagicSoft/Mars/mgeom/MGeomMirror.cc	(revision 3441)
+++ trunk/MagicSoft/Mars/mgeom/MGeomMirror.cc	(revision 3442)
@@ -145,5 +145,7 @@
         return light;
 
-    // calculate distance to the camera
+    // calculate distance to the camera (stretch vector such, that
+    // its Z component is the distance between the camera and
+    // the mirror
     const TVector3 &pos = GetMirrorCenter();
     const Double_t d = (dist - pos.Z()) / light.Z();
Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.h
===================================================================
--- trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.h	(revision 3441)
+++ trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.h	(revision 3442)
@@ -69,4 +69,6 @@
     MGeomMirror &GetMirror(int i) const { return *(MGeomMirror*)(fMirrors->UncheckedAt(i)); }
 
+    TClonesArray *GetMirrors() { return fMirrors; }
+
     MGeomPMT &GetPMT(int i)  { return *(MGeomPMT*)(fPMTs->UncheckedAt(i)); }
     MGeomPMT &GetPMT(int i) const { return *(MGeomPMT*)(fPMTs->UncheckedAt(i)); }