Index: trunk/MagicSoft/Mars/mmain/MCameraDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MCameraDisplay.cc	(revision 6569)
+++ trunk/MagicSoft/Mars/mmain/MCameraDisplay.cc	(revision 6856)
@@ -57,4 +57,15 @@
     fTop2->AddFrame(disp, laybut);
 
+/*
+    const TGPicture *pic2 = fList->GetPicture("marslogo.xpm");
+    if (pic2)
+    {
+        TGPictureButton *mars  = new TGPictureButton(fTop2, pic2, -1);
+        fList->Add(mars);
+        TGLayoutHints *lay2 = new TGLayoutHints(kLHintsRight, 10, 10, 10, 10);
+        fList->Add(lay2);
+        fTop2->AddFrame(mars,  lay2);
+    }
+  */
     MapSubwindows();
 
Index: trunk/MagicSoft/Mars/mmain/MEventDisplay.cc
===================================================================
--- trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 6569)
+++ trunk/MagicSoft/Mars/mmain/MEventDisplay.cc	(revision 6856)
@@ -70,5 +70,5 @@
 #include "MMcPedestalNSBAdd.h"    // MMcPedestalNSBAdd
 
-#include "MCerPhotAnal2.h"        // MPedestalCalc
+#include "MSignalCalc.h"          // MPedestalCalc
 #include "MTaskEnv.h"             // MTaskEnv
 #include "MExtractTimeAndChargeDigitalFilter.h"
@@ -159,5 +159,5 @@
         return -1;
 
-    if (t->FindBranch("MCerPhotEvt."))
+    if (t->FindBranch("MSignalCam."))
         return 1;
 
@@ -253,8 +253,8 @@
     taskenv1->SetOwner();
 
-    MCerPhotAnal2      *nanal  = new MCerPhotAnal2;
-    MFillH             *fill01 = new MFillH(evt01, "MCerPhotEvt", "MFillH01");
+    MSignalCalc        *nanal  = new MSignalCalc;
+    MFillH             *fill01 = new MFillH(evt01, "MSignalCam", "MFillH01");
     MImgCleanStd       *clean  = new MImgCleanStd;
-    MFillH             *fill02 = new MFillH(evt02, "MCerPhotEvt", "MFillH02");
+    MFillH             *fill02 = new MFillH(evt02, "MSignalCam", "MFillH02");
     MFillH             *fill03 = new MFillH(evt03, type==1?"MPedPhotFundamental":"MPedestalCam",       "MFillH03");
     MFillH             *fill04 = new MFillH(evt04, type==1?"MPedPhotFromExtractorRndm":"MPedestalCam", "MFillH04");
@@ -264,5 +264,5 @@
     MMcTriggerLvl2Calc *trcal  = new MMcTriggerLvl2Calc;
     MFillH             *fill09 = new MFillH(evt09, "MMcTriggerLvl2", "MFillH09");
-    MFillH             *fill10 = new MFillH(evt10, "MCerPhotEvt",    "MFillH10");
+    MFillH             *fill10 = new MFillH(evt10, "MSignalCam",    "MFillH10");
 
     MBadPixelsCalc     *bcalc  = new MBadPixelsCalc;
@@ -306,5 +306,5 @@
         tlist->AddToList(taskenv1); // Calculates MExtractedSignalCam, MArrivalTimeCam
         tlist->AddToList(mcupd);
-        tlist->AddToList(calib);    // MExtractedSignalCam --> MCerPhotEvt
+        tlist->AddToList(calib);    // MExtractedSignalCam --> MSignalCam
 
         tlist->AddToList(bcalc);    // Produce MBadPixelsCam
@@ -332,5 +332,5 @@
     if (type==1)
     {
-        MFillH *fill08 = new MFillH(evt08, "MArrivalTime", "MFillH8");
+        MFillH *fill08 = new MFillH(evt08, "MSignalCam", "MFillH8");
         tlist->AddToList(fill08);
     }
Index: trunk/MagicSoft/Mars/mmain/MainLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/mmain/MainLinkDef.h	(revision 6569)
+++ trunk/MagicSoft/Mars/mmain/MainLinkDef.h	(revision 6856)
@@ -7,15 +7,6 @@
 #pragma link C++ class MBrowser+;
 
-#pragma link C++ class MMars+;
-#pragma link C++ class MAnalysis+;
-#pragma link C++ class MDataCheck+;
-#pragma link C++ class MMonteCarlo+;
-
 #pragma link C++ class MCameraDisplay+;
 #pragma link C++ class MEventDisplay+;
-#pragma link C++ class MOnlineDisplay+;
-#pragma link C++ class MOnlineDump+;
-
-#pragma link C++ class MGDisplayAdc+;
 
 #endif
Index: trunk/MagicSoft/Mars/mmain/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mmain/Makefile	(revision 6569)
+++ trunk/MagicSoft/Mars/mmain/Makefile	(revision 6856)
@@ -26,12 +26,5 @@
 
 SRCFILES = MBrowser.cc \
-	   MDataCheck.cc \
-	   MMars.cc \
-           MAnalysis.cc \
-	   MMonteCarlo.cc \
-           MGDisplayAdc.cc \
-	   MEventDisplay.cc \
-	   MOnlineDisplay.cc \
-	   MOnlineDump.cc \
+           MEventDisplay.cc \
            MCameraDisplay.cc