Index: /trunk/MagicSoft/Mars/macros/readMagic.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/readMagic.C	(revision 2178)
+++ /trunk/MagicSoft/Mars/macros/readMagic.C	(revision 2179)
@@ -81,5 +81,5 @@
 
     tlist.AddToList(&read);
-    tlist.AddToList(&print1);
+    //tlist.AddToList(&print1);
     tlist.AddToList(&print2);
     tlist.AddToList(&pcopy);
@@ -100,4 +100,8 @@
     display.Draw();
 
+    display.SetAutoScale(kFALSE);
+    display.SetMinimum(0);
+    display.SetMaximum(100);
+
     while (tlist.Process())
     {
@@ -110,5 +114,5 @@
         if (!HandleInput())
             break;
-
+/*
 	hillas.Draw();
         hillas.Print();
@@ -122,5 +126,5 @@
         if (!HandleInput())
             break;
-    } 
+*/    }
 
     evtloop.PostProcess();
Index: /trunk/MagicSoft/Mars/macros/status.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/status.C	(revision 2178)
+++ /trunk/MagicSoft/Mars/macros/status.C	(revision 2179)
@@ -76,5 +76,5 @@
 
     // ------------- user change -----------------
-    read.AddFile("magictest/test/Gamma_z*.root");
+    read.AddFile("cosmics.root");
 
     MMcPedestalCopy   pcopy;
@@ -103,13 +103,13 @@
 
     tlist.AddToList(&read);
-    tlist.AddToList(&pcopy);
-    tlist.AddToList(&pnsb);
+    //tlist.AddToList(&pcopy);
+    //tlist.AddToList(&pnsb);
     tlist.AddToList(&ncalc);
     tlist.AddToList(&blind);
-    tlist.AddToList(&sgcal);
+    //tlist.AddToList(&sgcal);
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
     tlist.AddToList(&scalc);
-    tlist.AddToList(&calc1);
+    //tlist.AddToList(&calc1);
     tlist.AddToList(&hfill1);
     tlist.AddToList(&hfill2);
@@ -118,6 +118,6 @@
     tlist.AddToList(&hfill5);
     tlist.AddToList(&hfill6);
-    tlist.AddToList(&hfill7);
-    tlist.AddToList(&hfill8);
+    //tlist.AddToList(&hfill7);
+    //tlist.AddToList(&hfill8);
 
     MEvtLoop evtloop;
Index: /trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc	(revision 2178)
+++ /trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc	(revision 2179)
@@ -289,7 +289,7 @@
 {
     for (int i=0; i<fA.GetSize(); i++)
-      *fLog << all << "fA[" << i << "]=" << fA[i] << endl;
+        *fLog << all << "fA[" << i << "]=" << const_cast<TArrayD&>(fA)[i] << endl;
     for (int i=0; i<fB.GetSize(); i++)
-      *fLog << all << "fB[" << i << "]=" << fB[i] << endl;
+        *fLog << all << "fB[" << i << "]=" << const_cast<TArrayD&>(fB)[i] << endl;
 }
 
Index: /trunk/MagicSoft/Mars/mfilter/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mfilter/Makefile	(revision 2178)
+++ /trunk/MagicSoft/Mars/mfilter/Makefile	(revision 2179)
@@ -21,5 +21,6 @@
 
 INCLUDES = -I. -I../mbase -I../mraw -I../mmc -I../mdata -I../manalysis \
-           -I../mfileio  -I../mgeom -I../mimage -I../mhist -I../mmain
+           -I../mfileio  -I../mgeom -I../mimage -I../mhist -I../mmain \
+           -I../mgui
 
 # @code 
Index: /trunk/MagicSoft/Mars/mhist/MHTrigLvl0.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHTrigLvl0.cc	(revision 2178)
+++ /trunk/MagicSoft/Mars/mhist/MHTrigLvl0.cc	(revision 2179)
@@ -230,5 +230,5 @@
         fDispl = new MCamDisplay(fCam);
 
-    fDispl->FillPhotNum(fSum);
+    fDispl->Fill(fSum);
     fDispl->Paint();
 }
Index: /trunk/MagicSoft/Mars/mhist/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mhist/Makefile	(revision 2178)
+++ /trunk/MagicSoft/Mars/mhist/Makefile	(revision 2179)
@@ -59,6 +59,6 @@
 	   MHSigmabarTheta.cc \
 	   MHSigmaTheta.cc \
-	   MHOnSubtraction.cc \
 	   MHTrigLvl0.cc
+#	   MHOnSubtraction.cc \
 
 SRCS    = $(SRCFILES)
Index: /trunk/MagicSoft/Mars/mimage/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mimage/Makefile	(revision 2178)
+++ /trunk/MagicSoft/Mars/mimage/Makefile	(revision 2179)
@@ -22,5 +22,5 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mhist -I../mgeom -I../manalysis
+INCLUDES = -I. -I../mbase -I../mhist -I../mgeom -I../manalysis -I../mgui
 
 #------------------------------------------------------------------------------
Index: /trunk/MagicSoft/Mars/mmontecarlo/MMcEnergyEst.cc
===================================================================
--- /trunk/MagicSoft/Mars/mmontecarlo/MMcEnergyEst.cc	(revision 2178)
+++ /trunk/MagicSoft/Mars/mmontecarlo/MMcEnergyEst.cc	(revision 2179)
@@ -327,8 +327,8 @@
 {
   for (Int_t i = 0; i < fA.GetSize(); i++)
-    *fLog << inf << "Parameter " << i << ": " << fA[i] << endl; 
+    *fLog << inf << "Parameter " << i << ": " << const_cast<TArrayD&>(fA)[i] << endl;
 
   for (Int_t i = fA.GetSize(); i < fA.GetSize()+fB.GetSize(); i++)
-    *fLog << inf << "Parameter " << i << ": " << fB[i-fA.GetSize()] << endl; 
+    *fLog << inf << "Parameter " << i << ": " << const_cast<TArrayD&>(fB)[i-fA.GetSize()] << endl;
 
   /*