Index: /trunk/MagicSoft/Mars/mastro/MAstroCamera.cc
===================================================================
--- /trunk/MagicSoft/Mars/mastro/MAstroCamera.cc	(revision 3518)
+++ /trunk/MagicSoft/Mars/mastro/MAstroCamera.cc	(revision 3519)
@@ -316,4 +316,5 @@
         }
 
-    MAstroCatalog::ExecuteEvent(event, mp1, mp2);
-}
+    MAstroCatalog::EventInfo(event, mp1, mp2);
+    //MAstroCatalog::ExecuteEvent(event, mp1, mp2);
+}
Index: /trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc
===================================================================
--- /trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc	(revision 3518)
+++ /trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc	(revision 3519)
@@ -561,6 +561,6 @@
 void MAstroCatalog::Paint(Option_t *o)
 {
-    if (!gPad->IsBatch())
-        gVirtualX->ClearWindow();
+//    if (!gPad->IsBatch())
+//        gVirtualX->ClearWindow();
 
     if (TestBit(kHasChanged))
@@ -643,6 +643,4 @@
      gPad->Range(-edge, -edge, edge, edge);
 
-     cout << gPad->GetWw() << " " << gPad->GetWh() << endl;
-
      const Float_t w = gPad->GetWw();
      const Float_t h = gPad->GetWh();
@@ -666,4 +664,8 @@
     clk.Print();
 
+    // Append to a possible second pad
+    if (!gPad->GetListOfPrimitives()->FindObject(this))
+        AppendPad(o);
+
     // Append all objects to pad
     DrawMap();
@@ -674,5 +676,6 @@
 void MAstroCatalog::Draw(Option_t *o)
 {
-    TObject::Draw(o);
+    // Append to first pad
+    AppendPad(o);
 
     if (!TestBit(kHasChanged))
Index: /trunk/MagicSoft/Mars/mastro/MAstroCatalog.h
===================================================================
--- /trunk/MagicSoft/Mars/mastro/MAstroCatalog.h	(revision 3518)
+++ /trunk/MagicSoft/Mars/mastro/MAstroCatalog.h	(revision 3519)
@@ -193,5 +193,5 @@
     void Draw(Option_t *o="");
 
-    void EventInfo(Int_t event, Int_t px, Int_t py, TObject *selected);
+    void EventInfo(Int_t event, Int_t px, Int_t py, TObject *selected=0);
 
     ClassDef(MAstroCatalog, 1)