Index: trunk/MagicSoft/Cosy/base/BaseLinkDef.h
===================================================================
--- trunk/MagicSoft/Cosy/base/BaseLinkDef.h	(revision 4076)
+++ trunk/MagicSoft/Cosy/base/BaseLinkDef.h	(revision 4105)
@@ -8,8 +8,27 @@
 #pragma link C++ class MLog;
 #pragma link C++ class MStar+;
+#pragma link C++ class MGMap+;
 #pragma link C++ class MGList+;
 #pragma link C++ class MParContainer+;
+
 #pragma link C++ class MObservatory+;
+#pragma link C++ class MVector3+;
+
+#pragma link C++ class MString+;
 #pragma link C++ class MAstro+;
+#pragma link C++ class MAstroSky2Local+;
+#pragma link C++ class MAstroCatalog+;
+#pragma link C++ class MAstroCamera+;
+
+#pragma link C++ class MGeomPix+;
+#pragma link C++ class MGeomCam+;
+#pragma link C++ class MGeomCamMagic+;
+#pragma link C++ class MGeomMirror+;
+
+#pragma link C++ class MHCamera+;
+#pragma link C++ class MH+;
+#pragma link C++ class MBinning+;
+#pragma link C++ class MCamEvent+;
+#pragma link C++ class MHexagon+;
 
 #pragma link C++ class MTime+;
Index: trunk/MagicSoft/Cosy/base/MString.cc
===================================================================
--- trunk/MagicSoft/Cosy/base/MString.cc	(revision 4076)
+++ 	(revision )
@@ -1,4 +1,0 @@
-#include "MString.h"
-
-ClassImp(MString);
-
Index: trunk/MagicSoft/Cosy/base/MString.h
===================================================================
--- trunk/MagicSoft/Cosy/base/MString.h	(revision 4076)
+++ 	(revision )
@@ -1,45 +1,0 @@
-#ifndef MARS_MString
-#define MARS_MString
-
-#ifndef ROOT_TString
-#include <TString.h>
-#endif
-
-#include <stdio.h>
-#include <stdarg.h>
-
-class MString : public TString
-{
-public:
-    MString &Print(const char *fmt, ...)
-    {
-        va_list ap;
-        va_start(ap, fmt);
-
-        Int_t n=256;
-
-        char *ret=0;
-
-        while (1)
-        {
-            ret = new char[n+1];
-            Int_t sz = vsnprintf(ret, n, fmt, ap);
-            if (sz<=n)
-                break;
-
-            n *= 2;
-            delete [] ret;
-        };
-
-        va_end(ap);
-
-        *static_cast<TString*>(this) = ret;
-
-        delete [] ret;
-
-        return *this;
-    }
-    ClassDef(MString, 1)
-};
-
-#endif
Index: trunk/MagicSoft/Cosy/base/MThread.h
===================================================================
--- trunk/MagicSoft/Cosy/base/MThread.h	(revision 4076)
+++ trunk/MagicSoft/Cosy/base/MThread.h	(revision 4105)
@@ -1,4 +1,4 @@
-#ifndef MTHREAD_H
-#define MTHREAD_H
+#ifndef COSY_MThread
+#define COSY_MThread
 
 #ifdef __CINT__
Index: trunk/MagicSoft/Cosy/base/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/base/Makefile	(revision 4076)
+++ trunk/MagicSoft/Cosy/base/Makefile	(revision 4105)
@@ -31,13 +31,27 @@
 .SUFFIXES: .c .cc .cxx .h .hxx .o 
 
-SRCFILES = File.cc \
-	   MStopwatch.cc \
+SRCFILES = MStopwatch.cc \
            MParContainer.cc \
            MThread.cc \
 	   MTimeout.cc \
            MTime.cc \
-           MAstro.cc \
+           MString.cc \
 	   MStar.cc \
 	   MStarList.cc \
+           MAstro.cc \
+           MAstroCatalog.cc \
+           MAstroCamera.cc \
+           MAstroSky2Local.cc \
+           MGeomMirror.cc \
+           MGeomPix.cc \
+           MGeomCam.cc \
+           MGeomCamMagic.cc \
+           MGMap.cc \
+           MGMenu.cc \
+           MH.cc \
+           MBinning.cc \
+           MHexagon.cc \
+           MCamEvent.cc \
+           MHCamera.cc \
            msgqueue.cc \
            MLog.cc \
@@ -49,5 +63,20 @@
 	      MGList.h \
               MTime.h \
+              MString.h \
               MAstro.h \
+              MAstroSky2Local.h \
+              MAstroCatalog.h \
+              MAstroCamera.h \
+	      MGeomMirror.h \
+	      MGeomPix.h \
+	      MGeomCam.h \
+              MGeomCamMagic.h \
+ 	      MHCamera.h \
+              MBinning.h \
+              MH.h \
+              MGMap.h \
+              MGMenu.h \
+              MHexagon.h \
+              MCamEvent.h \
 	      MLog.h \
 	      MLogManip.h \