Index: trunk/MagicSoft/Mars/mraw/MRawEvtData.cc
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawEvtData.cc	(revision 717)
+++ trunk/MagicSoft/Mars/mraw/MRawEvtData.cc	(revision 718)
@@ -81,5 +81,5 @@
 }
 
-Byte_t MRawEvtData::GetNumPixels() const
+UShort_t MRawEvtData::GetNumPixels() const
 {
     return fHiGainPixId->GetSize();
@@ -149,69 +149,73 @@
 void MRawEvtData::Draw(Option_t *opt)
 {
-  // ----- AppendPad(opt);
-   
-  TString str(opt);
-  
-  UInt_t num = 0;
-  
-  if (str.BeginsWith("GRAPH", TString::kIgnoreCase))
-  {
-      if (str.Length()>5)
-          sscanf(&str[5], "%d", &num);
-
-      if (num>=GetNumPixels())
-          num= GetNumPixels();
-
-      *fLog << "Drawing Graph of Pixel " << num << endl;
-
-      const Int_t n = GetNumHiGainSamples();
-
-      Float_t *x = new Float_t[n];
-      Float_t *y = new Float_t[n];
-
-      for (int i=0; i<n; i++)
-      {
-          x[i] = i;
-          y[i] = (*fHiGainFadcSamples)[i + num*GetNumHiGainSamples()];
-      }
-
-      TGraph *graph = new TGraph(n, x, y);
-      graph->SetMaximum (256) ;
-      graph->SetMinimum (0) ;
-
-      graph->Draw("AC*");
-
-      return;
-  }
-
-  if (str.BeginsWith("HIST", TString::kIgnoreCase))
-  {
-      *fLog << "Length: " << str.Length() << endl;
-
-      if (str.Length()>4)
-          sscanf(&str[4], "%d", &num);
-
-      if (num>=GetNumPixels())
-          num= GetNumPixels();
-
-      *fLog << "Drawing Histogram of Pixel " << num << endl;
-
-      const Int_t n = GetNumHiGainSamples();
-
-      char *name = new char[16];
-
-      sprintf(name, "Pixel No.%d", (*fHiGainPixId)[num]);
-
-      TH1F *hist = new TH1F(name, "Hi Gain Samples FADC", n, 0, n);
-
-      for (int i=0; i<n; i++)
-          hist->Fill(0.5+i, (*fHiGainFadcSamples)[i + num*GetNumHiGainSamples()]);
-
-      hist->Draw();
-
-      return;
-  }
-
-  *fLog << "MRawEvtData::Draw: Warning: You must specify either 'GRAPH' or 'HIST'" << endl;
+    // ----- AppendPad(opt);
+
+    //
+    // FIXME: BIG MEMORY LEAK!
+    //
+
+    TString str(opt);
+
+    UInt_t num = 0;
+
+    if (str.BeginsWith("GRAPH", TString::kIgnoreCase))
+    {
+        if (str.Length()>5)
+            sscanf(&str[5], "%d", &num);
+
+        if (num>=GetNumPixels())
+            num= GetNumPixels();
+
+        *fLog << "Drawing Graph: Pixel #" << num << " of " << (int)GetNumPixels() << endl;
+
+        const Int_t n = GetNumHiGainSamples();
+
+        Float_t *x = new Float_t[n];
+        Float_t *y = new Float_t[n];
+
+        for (int i=0; i<n; i++)
+        {
+            x[i] = i;
+            y[i] = (*fHiGainFadcSamples)[i + num*GetNumHiGainSamples()];
+        }
+
+        TGraph *graph = new TGraph(n, x, y);
+        graph->SetMaximum (256) ;
+        graph->SetMinimum (0) ;
+
+        graph->Draw("AC*");
+
+        return;
+    }
+
+    if (str.BeginsWith("HIST", TString::kIgnoreCase))
+    {
+        *fLog << "Length: " << str.Length() << endl;
+
+        if (str.Length()>4)
+            sscanf(&str[4], "%d", &num);
+
+        if (num>=GetNumPixels())
+            num= GetNumPixels();
+
+        *fLog << "Drawing Histogram of Pixel " << num << endl;
+
+        const Int_t n = GetNumHiGainSamples();
+
+        char *name = new char[16];
+
+        sprintf(name, "Pixel No.%d", (*fHiGainPixId)[num]);
+
+        TH1F *hist = new TH1F(name, "Hi Gain Samples FADC", n, 0, n);
+
+        for (int i=0; i<n; i++)
+            hist->Fill(0.5+i, (*fHiGainFadcSamples)[i + num*GetNumHiGainSamples()]);
+
+        hist->Draw();
+
+        return;
+    }
+
+    *fLog << "MRawEvtData::Draw: Warning: You must specify either 'GRAPH' or 'HIST'" << endl;
 }
 
Index: trunk/MagicSoft/Mars/mraw/MRawEvtData.h
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawEvtData.h	(revision 717)
+++ trunk/MagicSoft/Mars/mraw/MRawEvtData.h	(revision 718)
@@ -50,7 +50,7 @@
     void AddPixel(UShort_t nOfPixel, TArrayC *data, Bool_t lflag=kFALSE);
 
-    Byte_t GetNumHiGainSamples() const;
-    Byte_t GetNumLoGainSamples() const;
-    Byte_t GetNumPixels() const;
+    Byte_t  GetNumHiGainSamples() const;
+    Byte_t  GetNumLoGainSamples() const;
+    UShort_t GetNumPixels() const;
 
     void ReadEvt(istream &fin);