Index: /trunk/MagicSoft/Mars/Makefile.conf.general
===================================================================
--- /trunk/MagicSoft/Mars/Makefile.conf.general	(revision 1437)
+++ /trunk/MagicSoft/Mars/Makefile.conf.general	(revision 1438)
@@ -4,11 +4,6 @@
 
 ROOTVER    =  `root-config --version`
-
-#ROOTLIBS   =  `root-config --libs`
 ROOTLIBS   =  `root-config --libs` -lMinuit
-
-#ROOTGLIBS  =  `root-config --glibs`
 ROOTGLIBS  =  `root-config --glibs` -lMinuit
-
 ROOTCFLAGS =  `root-config --cflags`
 
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 1437)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 1438)
@@ -4,4 +4,12 @@
 
    - added all subdirectories as Include-Paths for ACLIC (s. rootlogon.C)
+
+   - corrected 48(!) wrong entries in the Next Neighbor table of the
+     Magic Camera (all in the inner part of the outer ring, mostly 
+     missing a single NN)
+
+   - Fixed a bug in the table describing the Next Neighbours of the
+     CT1 camera (a pixel 127 doesn't exist and the pixel 126 didn't
+     have any neighbour)
 
    - changed trigrate.C: now it calculates the pure NSB triggers from
@@ -13,37 +21,4 @@
 
    - changed MWriteAsciiFile to accept rules (MDataChain)
-
-   - Implemented generalized event-matrices (one row per event)
-     (MHMatrix)
-
-   - implemented the one dimensional composite probabilities
-     (MHCompProb, MCompProbCalc, comprob.C)
-
-   - implemented the Multidimensional Distances (Next Neighbours)
-     (MMultiDimDistCalc, multidimdist.C, MHMatrix)
-
-   - Added a camera display displaying the pixel numbers to the
-     event display gui.
-
-   - Added Monte Carlo Informations to event display gui
-
-   - Changed the camera display to display the pixel numbering
-   
-   - Added three buttons to the camera display to change the palette
-
-   - Added the number of used and core pixels after image cleaning
-     to MHillas
-
-   - Changed the algorithm used in MHillas according to TDAS 02-03
-
-   - Changed the Alpha range according to TDAS 02-03 to [-90°,90°]
-
-   - Changed the algorithm used in MHillasSrc according to TDAS 02-03
-
-   - Added fCosDeltaAlpha to MHillasSrc
-
-   - Fixed a bug in the table describing the Next Neighbours of the
-     CT1 camera (a pixel 127 doesn't exist and the pixel 126 didn't
-     have any neighbour)
 
    - Calls to MWriteAsciiFile::AddContainer and MWriteAsciiFile::AddRule
@@ -51,4 +26,34 @@
      MWriteAsciiFile::AddColumns. Be carefull, the arguments have slightly
      changed.
+
+
+   - Implemented generalized event-matrices (one row per event)
+     (MHMatrix)
+
+   - implemented the one dimensional composite probabilities
+     (MHCompProb, MCompProbCalc, comprob.C)
+
+   - implemented the Multidimensional Distances (Next Neighbours)
+     (MMultiDimDistCalc, multidimdist.C, MHMatrix)
+
+   - Added a camera display displaying the pixel numbers to the
+     event display gui.
+
+   - Added Monte Carlo Informations to event display gui
+
+   - Changed the camera display to display the pixel numbering
+   
+   - Added three buttons to the camera display to change the palette
+
+   - Added the number of used and core pixels after image cleaning
+     to MHillas
+
+   - Changed the algorithm used in MHillas according to TDAS 02-03
+
+   - Changed the Alpha range according to TDAS 02-03 to [-90°,90°]
+
+   - Changed the algorithm used in MHillasSrc according to TDAS 02-03
+
+   - Added fCosDeltaAlpha to MHillasSrc
 
 
Index: /trunk/MagicSoft/Mars/macros/rootlogon.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/rootlogon.C	(revision 1437)
+++ /trunk/MagicSoft/Mars/macros/rootlogon.C	(revision 1438)
@@ -86,4 +86,5 @@
     gInterpreter->AddIncludePath("mfileio");
     gInterpreter->AddIncludePath("mfilter");
+    gInterpreter->AddIncludePath("mgeom");
     gInterpreter->AddIncludePath("mgui");
     gInterpreter->AddIncludePath("mhist");
@@ -92,4 +93,5 @@
     gInterpreter->AddIncludePath("mmontecarlo");
     gInterpreter->AddIncludePath("mraw");
+    gInterpreter->AddIncludePath("mtools");
 
     cout << "Welcome to the Mars Root environment." << endl;
Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 1437)
+++ /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 1438)
@@ -36,6 +36,4 @@
 #include "MGeomPix.h"
 
-#include "MHexagon.h"
-
 ClassImp(MCerPhotEvt);
 
Index: /trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/Makefile	(revision 1437)
+++ /trunk/MagicSoft/Mars/manalysis/Makefile	(revision 1438)
@@ -22,5 +22,6 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mgui -I../mmc -I../mraw -I../mdata -I../mhist
+INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom \
+	   -I../mdata -I../mhist 
 
 #------------------------------------------------------------------------------
@@ -45,8 +46,9 @@
            MHillasSrcCalc.cc \
 	   MCerPhotPix.cc \
-           MCerPhotCalc.cc \
+	   MCerPhotEvt.cc \
            MCerPhotAnal.cc \
-           MCerPhotCalc2.cc \
-	   MCerPhotEvt.cc \
+	   MCerPhotCalc.cc \
+	   MCerPhotCalc2.cc \
+	   MImageFit.cc \
 	   MPedCalcPedRun.cc \
            MBlindPixels.cc \
Index: /trunk/MagicSoft/Mars/meventdisp/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/meventdisp/Makefile	(revision 1437)
+++ /trunk/MagicSoft/Mars/meventdisp/Makefile	(revision 1438)
@@ -22,5 +22,5 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mraw -I../mgui \
+INCLUDES = -I. -I../mbase -I../mraw -I../mgui -I../mgeom \
 	   -I../manalysis -I../mfileio -I../mmc
 
Index: /trunk/MagicSoft/Mars/mgeom/MGeomCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mgeom/MGeomCam.cc	(revision 1437)
+++ /trunk/MagicSoft/Mars/mgeom/MGeomCam.cc	(revision 1438)
@@ -40,5 +40,4 @@
 
 #include "MGeomPix.h"
-#include "MHexagon.h"
 
 ClassImp(MGeomCam);
Index: /trunk/MagicSoft/Mars/mhist/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mhist/Makefile	(revision 1437)
+++ /trunk/MagicSoft/Mars/mhist/Makefile	(revision 1438)
@@ -22,5 +22,6 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mraw -I../manalysis -I../mmc -I../mgui -I../mdata
+INCLUDES = -I. -I../mbase -I../mraw -I../manalysis -I../mmc \
+	   -I../mgui -I../mgeom -I../mdata
 
 #------------------------------------------------------------------------------