Index: trunk/MagicSoft/Cosy/main/MCosy.cc
===================================================================
--- trunk/MagicSoft/Cosy/main/MCosy.cc	(revision 924)
+++ trunk/MagicSoft/Cosy/main/MCosy.cc	(revision 925)
@@ -676,4 +676,7 @@
     fMac2->SetPosEndswitch(Deg2ZdRE(env.GetValue("Zd_Max[Deg]", +1.0)));
     cout << "done." << endl;
+
+    fMac1->EnableTimeout(kTRUE, 500);
+    fMac2->EnableTimeout(kTRUE, 500);
 
 /*
Index: trunk/MagicSoft/Cosy/main/MStarguider.h
===================================================================
--- trunk/MagicSoft/Cosy/main/MStarguider.h	(revision 924)
+++ trunk/MagicSoft/Cosy/main/MStarguider.h	(revision 925)
@@ -3,15 +3,15 @@
 
 #include "Camera.h"
-#include "Starguider.h"
+#include "MGStarguider.h"
 
 class MStarguider : public Camera
 {
 private:
-    Starguider *fDisplay;
+    MGStarguider *fDisplay;
 
 public:
     MStarguider()
     {
-        fDisplay = new Starguider;
+        fDisplay = new MGStarguider;
     }
 
Index: trunk/MagicSoft/Cosy/main/MainCint.cc
===================================================================
--- trunk/MagicSoft/Cosy/main/MainCint.cc	(revision 924)
+++ 	(revision )
@@ -1,285 +1,0 @@
-//
-// File generated by /home/tbretz/root/root/bin/rootcint at Thu Sep  6 11:48:35 2001.
-// Do NOT change. Changes will be lost next time file is generated
-//
-#include "MainCint.h"
-
-#include "TClass.h"
-#include "TBuffer.h"
-#include "TMemberInspector.h"
-#include "TError.h"
-
-#ifndef G__ROOT
-#define G__ROOT
-#endif
-
-/********************************************************
-* MainCint.cc
-********************************************************/
-
-#ifdef G__MEMTEST
-#undef malloc
-#undef free
-#endif
-
-extern "C" void G__cpp_reset_tagtableMainCint();
-
-extern "C" void G__set_cpp_environmentMainCint() {
-  G__add_compiledheader("TROOT.h");
-  G__add_compiledheader("TMemberInspector.h");
-  G__add_compiledheader("MainIncl.h");
-  G__cpp_reset_tagtableMainCint();
-}
-class G__MainCintdOcc_tag {};
-
-void* operator new(size_t size,G__MainCintdOcc_tag* p) {
-  if(p && G__PVOID!=G__getgvp()) return((void*)p);
-#ifndef G__ROOT
-  return(malloc(size));
-#else
-  return(::operator new(size));
-#endif
-}
-
-/* dummy, for exception */
-#ifdef G__EH_DUMMY_DELETE
-void operator delete(void *p,G__MainCintdOcc_tag* x) {
-  if((long)p==G__getgvp() && G__PVOID!=G__getgvp()) return;
-#ifndef G__ROOT
-  free(p);
-#else
-  ::operator delete(p);
-#endif
-}
-#endif
-
-static void G__operator_delete(void *p) {
-  if((long)p==G__getgvp() && G__PVOID!=G__getgvp()) return;
-#ifndef G__ROOT
-  free(p);
-#else
-  ::operator delete(p);
-#endif
-}
-
-void G__DELDMY_MainCintdOcc() { G__operator_delete(0); }
-
-extern "C" int G__cpp_dllrevMainCint() { return(30051503); }
-
-/*********************************************************
-* Member function Interface Method
-*********************************************************/
-
-/* Setting up global function */
-
-/*********************************************************
-* Member function Stub
-*********************************************************/
-
-/*********************************************************
-* Global function Stub
-*********************************************************/
-
-/*********************************************************
-* Get size of pointer to member function
-*********************************************************/
-class G__Sizep2memfuncMainCint {
- public:
-  G__Sizep2memfuncMainCint() {p=&G__Sizep2memfuncMainCint::sizep2memfunc;}
-    size_t sizep2memfunc() { return(sizeof(p)); }
-  private:
-    size_t (G__Sizep2memfuncMainCint::*p)();
-};
-
-size_t G__get_sizep2memfuncMainCint()
-{
-  G__Sizep2memfuncMainCint a;
-  G__setsizep2memfunc((int)a.sizep2memfunc());
-  return((size_t)a.sizep2memfunc());
-}
-
-
-/*********************************************************
-* virtual base class offset calculation interface
-*********************************************************/
-
-   /* Setting up class inheritance */
-
-/*********************************************************
-* Inheritance information setup/
-*********************************************************/
-extern "C" void G__cpp_setup_inheritanceMainCint() {
-
-   /* Setting up class inheritance */
-}
-
-/*********************************************************
-* typedef information setup/
-*********************************************************/
-extern "C" void G__cpp_setup_typetableMainCint() {
-
-   /* Setting up typedef entry */
-   G__search_typename2("Char_t",99,-1,0,
--1);
-   G__setnewtype(-1,"Signed Character 1 byte",0);
-   G__search_typename2("UChar_t",98,-1,0,
--1);
-   G__setnewtype(-1,"Unsigned Character 1 byte",0);
-   G__search_typename2("Short_t",115,-1,0,
--1);
-   G__setnewtype(-1,"Signed Short integer 2 bytes",0);
-   G__search_typename2("UShort_t",114,-1,0,
--1);
-   G__setnewtype(-1,"Unsigned Short integer 2 bytes",0);
-   G__search_typename2("Int_t",105,-1,0,
--1);
-   G__setnewtype(-1,"Signed integer 4 bytes",0);
-   G__search_typename2("UInt_t",104,-1,0,
--1);
-   G__setnewtype(-1,"Unsigned integer 4 bytes",0);
-   G__search_typename2("Seek_t",105,-1,0,
--1);
-   G__setnewtype(-1,"File pointer",0);
-   G__search_typename2("Long_t",108,-1,0,
--1);
-   G__setnewtype(-1,"Signed long integer 4 bytes",0);
-   G__search_typename2("ULong_t",107,-1,0,
--1);
-   G__setnewtype(-1,"Unsigned long integer 4 bytes",0);
-   G__search_typename2("Float_t",102,-1,0,
--1);
-   G__setnewtype(-1,"Float 4 bytes",0);
-   G__search_typename2("Double_t",100,-1,0,
--1);
-   G__setnewtype(-1,"Float 8 bytes",0);
-   G__search_typename2("Text_t",99,-1,0,
--1);
-   G__setnewtype(-1,"General string",0);
-   G__search_typename2("Bool_t",98,-1,0,
--1);
-   G__setnewtype(-1,"Boolean (0=false, 1=true)",0);
-   G__search_typename2("Byte_t",98,-1,0,
--1);
-   G__setnewtype(-1,"Byte (8 bits)",0);
-   G__search_typename2("Version_t",115,-1,0,
--1);
-   G__setnewtype(-1,"Class version identifier",0);
-   G__search_typename2("Option_t",99,-1,0,
--1);
-   G__setnewtype(-1,"Option string",0);
-   G__search_typename2("Ssiz_t",105,-1,0,
--1);
-   G__setnewtype(-1,"String size",0);
-   G__search_typename2("Real_t",102,-1,0,
--1);
-   G__setnewtype(-1,"TVector and TMatrix element type",0);
-   G__search_typename2("Streamer_t",89,-1,0,
--1);
-   G__setnewtype(-1,NULL,0);
-   G__search_typename2("VoidFuncPtr_t",89,-1,0,
--1);
-   G__setnewtype(-1,"pointer to void function",0);
-   G__search_typename2("FreeHookFun_t",89,-1,0,
--1);
-   G__setnewtype(-1,NULL,0);
-   G__search_typename2("ReAllocFun_t",81,-1,0,
--1);
-   G__setnewtype(-1,NULL,0);
-   G__search_typename2("ReAllocCFun_t",81,-1,0,
--1);
-   G__setnewtype(-1,NULL,0);
-   G__search_typename2("Axis_t",100,-1,0,
--1);
-   G__setnewtype(-1,"Axis values type",0);
-   G__search_typename2("Stat_t",100,-1,0,
--1);
-   G__setnewtype(-1,"Statistics type",0);
-}
-
-/*********************************************************
-* Data Member information setup/
-*********************************************************/
-
-   /* Setting up class,struct,union tag member variable */
-extern "C" void G__cpp_setup_memvarMainCint() {
-}
-/***********************************************************
-************************************************************
-************************************************************
-************************************************************
-************************************************************
-************************************************************
-************************************************************
-***********************************************************/
-
-/*********************************************************
-* Member function information setup for each class
-*********************************************************/
-
-/*********************************************************
-* Member function information setup
-*********************************************************/
-extern "C" void G__cpp_setup_memfuncMainCint() {
-}
-
-/*********************************************************
-* Global variable information setup for each class
-*********************************************************/
-extern "C" void G__cpp_setup_globalMainCint() {
-
-   /* Setting up global variables */
-   G__resetplocal();
-
-
-   G__resetglobalenv();
-}
-
-/*********************************************************
-* Global function information setup for each class
-*********************************************************/
-extern "C" void G__cpp_setup_funcMainCint() {
-   G__lastifuncposition();
-
-
-   G__resetifuncposition();
-}
-
-/*********************************************************
-* Class,struct,union,enum tag information setup
-*********************************************************/
-/* Setup class/struct taginfo */
-
-/* Reset class/struct taginfo */
-extern "C" void G__cpp_reset_tagtableMainCint() {
-}
-
-
-extern "C" void G__cpp_setup_tagtableMainCint() {
-
-   /* Setting up class,struct,union tag entry */
-}
-extern "C" void G__cpp_setupMainCint(void) {
-  G__check_setup_version(30051503,"G__cpp_setupMainCint()");
-  G__set_cpp_environmentMainCint();
-  G__cpp_setup_tagtableMainCint();
-
-  G__cpp_setup_inheritanceMainCint();
-
-  G__cpp_setup_typetableMainCint();
-
-  G__cpp_setup_memvarMainCint();
-
-  G__cpp_setup_memfuncMainCint();
-  G__cpp_setup_globalMainCint();
-  G__cpp_setup_funcMainCint();
-
-   if(0==G__getsizep2memfunc()) G__get_sizep2memfuncMainCint();
-  return;
-}
-class G__cpp_setup_initMainCint {
-  public:
-    G__cpp_setup_initMainCint() { G__add_setup_func("MainCint",(G__incsetup)(&G__cpp_setupMainCint)); G__call_setup_funcs(); }
-   ~G__cpp_setup_initMainCint() { G__remove_setup_func("MainCint"); }
-};
-G__cpp_setup_initMainCint G__cpp_setup_initializerMainCint;
-