Index: trunk/MagicSoft/Mars/mraw/MRawEvtData.cc
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawEvtData.cc	(revision 1020)
+++ trunk/MagicSoft/Mars/mraw/MRawEvtData.cc	(revision 1030)
@@ -209,9 +209,9 @@
 void MRawEvtData::Draw(Option_t *opt)
 {
-    // ----- AppendPad(opt);
-
-    //
-    // FIXME: BIG MEMORY LEAK! (( How and when are the objects deleted?)
-    //
+    if (GetNumPixels()==0)
+    {
+        *fLog << "Sorry, no pixel to draw!" << endl;
+        return;
+    }
 
     TString str(opt);
@@ -247,4 +247,9 @@
         graph->Draw("AC*");
 
+        TH1F *hist = graph->GetHistogram();
+
+        hist->SetXTitle("Time/FADC Slices");
+        hist->SetYTitle("Signal/FADC Units");
+
         return;
     }
@@ -269,4 +274,6 @@
 
         TH1F *hist = new TH1F(name, "Hi Gain Samples FADC", n, 0, n);
+        hist->SetXTitle("Time/FADC Slices");
+        hist->SetYTitle("Signal/FADC Units");
 
         for (int i=0; i<n; i++)