Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc	(revision 1050)
+++ /trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc	(revision 1051)
@@ -117,5 +117,5 @@
         const MPedestalPix &ped = (*fPedestals)[pixid];
 
-        const Float_t nphot = (Float_t)pixel.GetSumHiGainFadcSamples() - ped.GetMean();
+        const Float_t nphot = (Float_t)pixel.GetSumHiGainSamples() - ped.GetMean();
 
         fCerPhotEvt->AddPixel(pixid, nphot, ped.GetMeanRms());
Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 1050)
+++ /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.cc	(revision 1051)
@@ -30,9 +30,7 @@
 
 #include <TCanvas.h>
-#include <TClonesArray.h>
 
 #include "MLog.h"
 #include "MHexagon.h"
-#include "MCerPhotPix.h"
 
 ClassImp(MCerPhotEvt);
@@ -47,5 +45,5 @@
     fTitle = title ? title : "(Number of Photon)-Event Information";
 
-    fPixels = new TClonesArray ("MCerPhotPix", 0);
+    fPixels = new TClonesArray("MCerPhotPix", 0);
 }
 
@@ -66,17 +64,4 @@
     //    delete geom;
     //    disp->DrawPhotNum(this);
-}
-
-// --------------------------------------------------------------------------
-//
-// add a new pixel to the list and increase the number
-// of valid pixels in the list by one
-//
-void MCerPhotEvt::AddPixel(Int_t id, Float_t nph, Float_t err)
-{
-    // TClonesArray -> 'operator new with placement' should be used
-
-    //    fPixels->ExpandCreate(fNumPixels);
-    new ((*fPixels)[fNumPixels++]) MCerPhotPix(id, nph, err);
 }
 
Index: /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h	(revision 1050)
+++ /trunk/MagicSoft/Mars/manalysis/MCerPhotEvt.h	(revision 1051)
@@ -5,6 +5,6 @@
 #include <TClonesArray.h>
 #endif
-#ifndef MARS_MParContainer
-#include "MParContainer.h"
+#ifndef MARS_MCerPhotPix
+#include "MCerPhotPix.h"
 #endif
 
@@ -24,5 +24,9 @@
     void   InitSize(UInt_t num) { fPixels->Expand(num); }
 
-    void   AddPixel(Int_t id, Float_t nph, Float_t err);
+    void   AddPixel(Int_t id, Float_t nph, Float_t err)
+    {
+        new ((*fPixels)[fNumPixels++]) MCerPhotPix(id, nph, err);
+    }
+
 
     Bool_t  IsPixelExisting(Int_t id) const;
Index: /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc	(revision 1050)
+++ /trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc	(revision 1051)
@@ -63,5 +63,8 @@
     {
         if (run->GetRunType() != kRTMonteCarlo)
+        {
+            *fLog << "No Monte Carlo File - MMcPedestalCopy skipped." << endl;
             return kTRUE;
+        }
     }
 
Index: /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc	(revision 1050)
+++ /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc	(revision 1051)
@@ -87,5 +87,5 @@
     while (pixel.Next())
     {
-              Byte_t *ptr = pixel.GetHiGainFadcSamples();
+              Byte_t *ptr = pixel.GetHiGainSamples();
         const Byte_t *end = ptr + fRawEvt->GetNumHiGainSamples();
 
Index: /trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc	(revision 1050)
+++ /trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc	(revision 1051)
@@ -49,4 +49,5 @@
     //
     // TClonesArray: The 'new operator with placement' must be used
+    // FIXME: Use ExpandCraete instead
     //
     for (int i=0; i<577; i++)
Index: /trunk/MagicSoft/Mars/mbase/MReadTree.cc
===================================================================
--- /trunk/MagicSoft/Mars/mbase/MReadTree.cc	(revision 1050)
+++ /trunk/MagicSoft/Mars/mbase/MReadTree.cc	(revision 1051)
@@ -390,5 +390,5 @@
 
         //*fLog << "Branch " << bname << " autodel: " << (int)branch->IsAutoDelete() << endl;
-        branch->SetAutoDelete();
+        //branch->SetAutoDelete();
 
         num++;
Index: /trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc
===================================================================
--- /trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc	(revision 1050)
+++ /trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc	(revision 1051)
@@ -149,6 +149,4 @@
     //   Map the window, set up the layout, etc.
     //
-    SetWMSizeHints(450, 400, 1000, 1000, 10, 10 );      // set the smallest and biggest size of the Main frame
-
     MapSubwindows();
 
Index: /trunk/MagicSoft/Mars/mhist/MHFadcCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHFadcCam.cc	(revision 1050)
+++ /trunk/MagicSoft/Mars/mhist/MHFadcCam.cc	(revision 1051)
@@ -102,5 +102,5 @@
 
         for (Int_t i=0;  i<nhisamples; i++)
-            FillHi(id, pixel.GetHiGainFadcSamples()[i]);
+            FillHi(id, pixel.GetHiGainSamples()[i]);
 
         if (!pixel.HasLoGain())
@@ -108,5 +108,5 @@
 
         for (Int_t i=0; i<nlosamples; i++)
-            FillLo(id, pixel.GetLoGainFadcSamples()[i]);
+            FillLo(id, pixel.GetLoGainSamples()[i]);
     }