Index: trunk/MagicSoft/Mars/mraw/MRawEvtData.cc
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawEvtData.cc	(revision 2414)
+++ trunk/MagicSoft/Mars/mraw/MRawEvtData.cc	(revision 2416)
@@ -215,17 +215,9 @@
 //     <index>      The pixel with the given index is drawn
 //
-// Rem: DrawTS is the thread-safe version of Draw. In most cases
-//      you can use Draw instead
-//
-void MRawEvtData::DrawTS(TVirtualPad *pad=NULL, Option_t *opt="")
+void MRawEvtData::Draw(Option_t *opt)
 {
     if (GetNumPixels()==0)
     {
         *fLog << warn << "Sorry, no pixel to draw!" << endl;
-        return;
-    }
-    if (!pad)
-    {
-        *fLog << warn << "MRawEvtData::DrawTS - No pad available..." << endl;
         return;
     }
@@ -246,5 +238,5 @@
     if (!pix.Jump(id))
     {
-        *fLog << warn << "Pixel Idx #" << dec << id << " doesn't exist!" << endl;
+        *fLog << warn << dec << "Pixel Idx #" << id << " doesn't exist!" << endl;
         return;
     }
@@ -275,5 +267,5 @@
 
         graphhi->SetBit(kCanDelete);
-        MParContainer::DrawTS(graphhi, pad, same ? "C*" : "AC*");
+        graphhi->Draw(same ? "C*" : "AC*");
 
         TH1F *histhi = graphhi->GetHistogram();
@@ -294,5 +286,5 @@
 
             graphlo->SetBit(kCanDelete);
-            MParContainer::DrawTS(graphlo, pad, "C*");
+            graphlo->Draw("C*");
 
             TH1F *histlo = graphlo->GetHistogram();
@@ -308,6 +300,5 @@
     {
         // FIXME: Add Legend
-        *fLog << inf << "Drawing Histogram of Pixel with Idx #";
-        *fLog << dec << pix.GetPixelId() << endl;
+        *fLog << inf << "Drawing Histogram of Pixel with Idx #" << dec << pix.GetPixelId() << endl;
 
         TH1F *histh = new TH1F(name, "FADC Samples", nh, -0.5, nh-.5);
@@ -318,5 +309,5 @@
             histh->Fill(i, higains[i]);
         histh->SetBit(kCanDelete);
-        MParContainer::DrawTS(histh, pad, same ? "same" : "");
+        histh->Draw(same ? "same" : "");
 
         if (nl>0)
@@ -328,5 +319,5 @@
                 histl->Fill(i, logains[i]);
             histl->SetBit(kCanDelete);
-            MParContainer::DrawTS(histl, pad, "same");
+            histl->Draw("same");
         }
         return;
@@ -543,3 +534,2 @@
     evt.fArraySize       = fArraySize;
 }
-
Index: trunk/MagicSoft/Mars/mraw/MRawEvtData.h
===================================================================
--- trunk/MagicSoft/Mars/mraw/MRawEvtData.h	(revision 2414)
+++ trunk/MagicSoft/Mars/mraw/MRawEvtData.h	(revision 2416)
@@ -52,10 +52,5 @@
     void Clear(Option_t * = NULL);
     void Print(Option_t * = NULL) const;
-    void DrawTS(TVirtualPad *pad=NULL, Option_t *option="");
-    void Copy(TObject &named)
-#if ROOT_VERSION_CODE > ROOT_VERSION(3,04,01)
-const
-#endif
-        ;
+    void Draw (Option_t * = NULL);
 
     void DeletePixels(Bool_t flag=kFALSE);
@@ -70,11 +65,16 @@
 
     Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
-    void   DrawPixelContent(Int_t num, TVirtualPad *pad=NULL) const
+    void   DrawPixelContent(Int_t num) const
     {
         TString s("HIST");
         s += num;
-        const_cast<MRawEvtData*>(this)->DrawTS(pad, s);
-        //const_cast<MRawEvtData*>(this)->Draw(s);
+        const_cast<MRawEvtData*>(this)->Draw(s);
     }
+
+    void Copy(TObject &named)
+#if ROOT_VERSION_CODE > ROOT_VERSION(3,04,01)
+        const
+#endif
+        ;
 
     ClassDef(MRawEvtData, 2) //Container to store the raw Event Data