Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 9519)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 9520)
@@ -18,4 +18,104 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2009/10/26 Thomas Bretz
+
+   * Makefile:
+     - moved definition of OSTYPE to Makefile.conf.general
+     - removed mreflector 
+
+   * Makefile.conf.general:
+     - added definition of OSTYPE
+
+   * callisto.cc:
+     - added option for test mode
+
+   * ceres.rc:
+     - fixed a typo 
+     - added a line for the cone transmission
+
+   * condor/program.submit:
+     - Out shell be Output 
+     - Log is now set automatically by condor
+
+   * mastro/MAstroCatalog.cc:
+     - added a trailing / to the default path
+
+   * mbase/MAGIC.cc:
+     - added a warning when using root versions which contain a projection
+        bug which doesn't allow to reuse plotted histograms as expected
+
+   * mbase/MEnv.h:
+     - added a default to GetValue
+
+   * mbase/MLut.cc:
+     - added a validity check for the line data
+
+   * mbase/MParSpline.[h,cc]:
+     - added RecursiveRemove 
+     - added destructor
+
+   * mbase/MSpline3.[h,cc]:
+     - renamed overloaded Integral to avoid confusions in the interpreter
+
+   * mcalib/MCalibrationChargeCalc.cc:
+     - tiny cosmetics (a/=b instead of a=a/b)
+
+   * mcorsika/MCorsikaRead.h, mdata/MDataMember.h,
+     mhbase/MFillH.h, msim/MSimMMCS.h:
+     - excluded pointers from I/O, this causes some (the last) event 
+       to be stored, which could be quite large
+
+   * mfilter/MFSoftwareTrigger.cc:
+     - added some informal output to the log-stream
+
+   * mhbase/MH3.cc:
+     - added a sanity if when deleting fHist
+
+   * mhbase/MHn.[h,cc]:
+     - added RecursiveRemove
+
+   * mhist/MHCamEvent.cc:
+     - check for fSum in RecursiveRemove
+
+   * mjobs/MJCalibration.cc:
+     - write commandline to output
+
+   * mpointing/MPointingDevCalc.cc:
+     - added new pointing informations
+
+   * msimcamera/MSimAPD.cc:
+     - added the 3600 cell APD type
+
+   * msimcamera/MSimBundlePhotons.cc:
+     - improved a comment
+
+   * msimcamera/MSimExcessNoise.[h,cc]:
+     - changed size of excess noise to be variable
+
+   * msimcamera/MSimTrigger.cc:
+     - print some information if electronics is "switched off"
+
+   * msimreflector/MReflector.cc:
+     - improved a comment
+
+   * mbase/MStatusArray.[h,cc]:
+     - tried to improved stability by a completely self made deletion
+       scheme for the canvases
+
+   * mgeom/MGeomPix.h:
+     - replaced tan(60)/2 by sin(60)
+
+   * mjobs/MJCalibrateSignal.[h,cc]:
+     - added test mode to allow calibration of calibration files
+
+   * Makefile, */Makefile:
+     - brought includes in the correct order
+
+   * msimcamera/MSimRandomPhotons.cc:
+     - added the Cone transmission
+     - added a lot of comments
+
+
 
  2009/09/11 Daniela Dorner
Index: /trunk/MagicSoft/Mars/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/Makefile	(revision 9519)
+++ /trunk/MagicSoft/Mars/Makefile	(revision 9520)
@@ -59,5 +59,4 @@
 	  melectronics \
 	  msim \
-	  mreflector \
 	  msimreflector \
 	  msimcamera \
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 9519)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 9520)
@@ -22,4 +22,7 @@
    * the environment variable OSTYPE should now be obsolete. Instead
      the output of "uname -s" converted to lower cases is used
+
+   * The Makefiles should now detect the OSTYPE automatically using
+     uname. This should make the setting of OSTYPE obsolete
 
  ;showplot:
@@ -654,4 +657,7 @@
     * added a new tab "CalPos" showing the arrival time of extracted
       interleaved calibration events
+
+    * Using the new --test switch you can now calibrate the calibration
+      file
 
  ;star
Index: /trunk/MagicSoft/Mars/mhbase/MFillH.h
===================================================================
--- /trunk/MagicSoft/Mars/mhbase/MFillH.h	(revision 9519)
+++ /trunk/MagicSoft/Mars/mhbase/MFillH.h	(revision 9520)
@@ -23,5 +23,5 @@
 
 private:
-    MParContainer *fParContainer; // Pointer to the data container storing
+    MParContainer *fParContainer; //! Pointer to the data container storing
     TString fParContainerName;    // Name to a data container
 
@@ -31,5 +31,5 @@
     TString fTitleTab;
 
-    MParameterD *fWeight;         // Pointer to the container storing a weight
+    MParameterD *fWeight;         //! Pointer to the container storing a weight
     TString fWeightName;          // Name of a container storing a weight
 
Index: /trunk/MagicSoft/Mars/msimreflector/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/msimreflector/Makefile	(revision 9519)
+++ /trunk/MagicSoft/Mars/msimreflector/Makefile	(revision 9520)
@@ -6,6 +6,6 @@
 #
 ##################################################################
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 #------------------------------------------------------------------------------
Index: /trunk/MagicSoft/Mars/mtools/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mtools/Makefile	(revision 9519)
+++ /trunk/MagicSoft/Mars/mtools/Makefile	(revision 9520)
@@ -6,6 +6,6 @@
 #
 ##################################################################
+include ../Makefile.conf.general
 include ../Makefile.conf.$(OSTYPE)
-include ../Makefile.conf.general
 
 #------------------------------------------------------------------------------
@@ -29,5 +29,5 @@
 	   MSimulatedAnnealing.cc \
 	   MFFT.cc \
-	   MCubicCoeff.cc \
+           MCubicCoeff.cc \
            MCubicSpline.cc \
 	   MagicReversi.cc \
@@ -38,5 +38,5 @@
            MagicCivilization.cc \
            MineSweeper.cc \
-           MRolke.cc
+	   MRolke.cc
 
 ############################################################