Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 1438)
+++ trunk/MagicSoft/Mars/Changelog	(revision 1439)
@@ -1,3 +1,43 @@
                                                                   -*-*- END -*-*-
+
+
+ 2002/07/25: Thomas Bretz
+
+   * mtools, mtools/Makefile, mtools/ToolsLinkDef.h, mtools/ToolsIncl.h:
+     - added
+
+   * mgeom, mgeom/Makefile, mgeom/GeomLinkDef.h, mgeom/GeomIncl.h:
+     - added
+
+   * Makefile:
+     - mtools added
+     - mgeom added
+
+   * mtools/MagicCivilization.[h,cc], mtools/MagicDomino.[h,cc],
+     mtools/MagicShow.[h,cc], mtools/MagicSnake.[h,cc]:
+     - added
+
+   * mgui/MineSweeper.[h,cc]:
+     - moved to mtools
+
+   * mgui/MGeom*.[h,cc]:
+     - moved to mgeom
+
+   * mgeom/MGeomCamMagic.cc:
+     - corrected 48(!) wrong entries in the Next Neighbor table
+
+   * mmain/Makefile, eventdisp/Makefile:
+     - added mgeom
+
+   * mgui/Makefile, mgui/LinkDef.h, mhist/Makefile, manalysis/Makefile:
+     - removed MGeom* and MineSweeper
+
+   * macros/rootlogon.C:
+     - added new include paths
+
+   * manalysis/MCerPhotEvt.cc, mgeom/MGeomCam.cc:
+     - removed include of MHexagon
+
+
 
  2002/07/23: Thomas Bretz
Index: trunk/MagicSoft/Mars/Makefile
===================================================================
--- trunk/MagicSoft/Mars/Makefile	(revision 1438)
+++ trunk/MagicSoft/Mars/Makefile	(revision 1439)
@@ -37,5 +37,4 @@
 SUBDIRS = mmain       \
           mmc         \
-          mgui        \
 	  manalysis   \
           mfileio     \
@@ -47,4 +46,7 @@
           mdata       \
           mfilter     \
+          mtools      \
+          mgui        \
+          mgeom       \
           mraw
 
Index: trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- trunk/MagicSoft/Mars/manalysis/Makefile	(revision 1438)
+++ trunk/MagicSoft/Mars/manalysis/Makefile	(revision 1439)
@@ -50,5 +50,4 @@
 	   MCerPhotCalc.cc \
 	   MCerPhotCalc2.cc \
-	   MImageFit.cc \
 	   MPedCalcPedRun.cc \
            MBlindPixels.cc \
Index: trunk/MagicSoft/Mars/mhist/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mhist/Makefile	(revision 1438)
+++ trunk/MagicSoft/Mars/mhist/Makefile	(revision 1439)
@@ -56,4 +56,6 @@
            MHMcEnergyImpact.cc \
 	   MHMcRate.cc \
+	   MHMcIntRate.cc \
+           MHMcDifRate.cc \
            MHThetabarTime.cc \
            MHThetabarTheta.cc \
Index: trunk/MagicSoft/Mars/mtools/MagicCivilization.cc
===================================================================
--- trunk/MagicSoft/Mars/mtools/MagicCivilization.cc	(revision 1438)
+++ trunk/MagicSoft/Mars/mtools/MagicCivilization.cc	(revision 1439)
@@ -438,7 +438,2 @@
 }
 
-char       *MagicCivilization::GetObjectInfo(Int_t px, Int_t py) const
-{
-    cout << "GET " << px << " " << py << endl;
-    return 0;
-}
Index: trunk/MagicSoft/Mars/mtools/MagicCivilization.h
===================================================================
--- trunk/MagicSoft/Mars/mtools/MagicCivilization.h	(revision 1438)
+++ trunk/MagicSoft/Mars/mtools/MagicCivilization.h	(revision 1439)
@@ -30,5 +30,5 @@
         kHasFlag      = BIT(15),
         kHasCreation  = BIT(16),
-        kUserBits     = 0x0000ff00, // 14-23 are allowed
+        kUserBits     = 0x0000ff00 // 14-23 are allowed
     };
 
@@ -76,6 +76,4 @@
     void Reset();        //*MENU*
 
-    char       *MagicCivilization::GetObjectInfo(Int_t px, Int_t py) const;
-
     ClassDef(MagicCivilization, 0) // Tool to visualize next neighbours
 };
Index: trunk/MagicSoft/Mars/mtools/MagicShow.h
===================================================================
--- trunk/MagicSoft/Mars/mtools/MagicShow.h	(revision 1438)
+++ trunk/MagicSoft/Mars/mtools/MagicShow.h	(revision 1439)
@@ -28,5 +28,5 @@
     {
         kBackground = 50,
-        kUserBits   = 0x0000ff00, // 14-23 are allowed
+        kUserBits   = 0x0000ff00 // 14-23 are allowed
 
     };
Index: trunk/MagicSoft/Mars/mtools/MagicSnake.cc
===================================================================
--- trunk/MagicSoft/Mars/mtools/MagicSnake.cc	(revision 1438)
+++ trunk/MagicSoft/Mars/mtools/MagicSnake.cc	(revision 1439)
@@ -175,5 +175,5 @@
 }
 
-void MagicSnake::Pause(Bool_t yes=kTRUE)
+void MagicSnake::Pause(Bool_t yes)
 {
     if (yes && !fPaused)
Index: trunk/MagicSoft/Mars/mtools/MagicSnake.h
===================================================================
--- trunk/MagicSoft/Mars/mtools/MagicSnake.h	(revision 1438)
+++ trunk/MagicSoft/Mars/mtools/MagicSnake.h	(revision 1439)
@@ -42,5 +42,5 @@
         kHasTransport = BIT(18),
         kHasDoor      = BIT(19),
-        kUserBits     = 0x0000ff00, // 14-23 are allowed
+        kUserBits     = 0x0000ff00 // 14-23 are allowed
 
     };
Index: trunk/MagicSoft/Mars/mtools/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mtools/Makefile	(revision 1438)
+++ trunk/MagicSoft/Mars/mtools/Makefile	(revision 1439)
@@ -22,5 +22,5 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mgui
+INCLUDES = -I. -I../mbase -I../mgui -I../mgeom
 
 #------------------------------------------------------------------------------