Index: trunk/MagicSoft/Mars/mhistmc/MHMcDifRate.cc
===================================================================
--- trunk/MagicSoft/Mars/mhistmc/MHMcDifRate.cc	(revision 2016)
+++ trunk/MagicSoft/Mars/mhistmc/MHMcDifRate.cc	(revision 2017)
@@ -88,5 +88,5 @@
 void MHMcDifRate::Draw(Option_t *option)
 {
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
+    TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
Index: trunk/MagicSoft/Mars/mhistmc/MHMcEfficiency.cc
===================================================================
--- trunk/MagicSoft/Mars/mhistmc/MHMcEfficiency.cc	(revision 2016)
+++ trunk/MagicSoft/Mars/mhistmc/MHMcEfficiency.cc	(revision 2017)
@@ -97,5 +97,5 @@
 void MHMcEfficiency::Draw(Option_t *option)
 {
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
+    TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
Index: trunk/MagicSoft/Mars/mhistmc/MHMcEfficiencyEnergy.cc
===================================================================
--- trunk/MagicSoft/Mars/mhistmc/MHMcEfficiencyEnergy.cc	(revision 2016)
+++ trunk/MagicSoft/Mars/mhistmc/MHMcEfficiencyEnergy.cc	(revision 2017)
@@ -92,5 +92,5 @@
 void MHMcEfficiencyEnergy::Draw(Option_t *option)
 {
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
+    TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
Index: trunk/MagicSoft/Mars/mhistmc/MHMcEfficiencyImpact.cc
===================================================================
--- trunk/MagicSoft/Mars/mhistmc/MHMcEfficiencyImpact.cc	(revision 2016)
+++ trunk/MagicSoft/Mars/mhistmc/MHMcEfficiencyImpact.cc	(revision 2017)
@@ -92,5 +92,5 @@
 void MHMcEfficiencyImpact::Draw(Option_t *option)
 {
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
+    TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
@@ -103,23 +103,4 @@
     pad->Modified();
     pad->Update();
-}
-
-TObject *MHMcEfficiencyImpact::DrawClone(Option_t *option) const
-{
-    TCanvas *c = MH::MakeDefCanvas(&fHist);
-
-    c->SetLogx();
-
-    //
-    // This is necessary to get the expected bahviour of DrawClone
-    //
-    gROOT->SetSelectedPad(NULL);
-
-    ((TH1D&)fHist).DrawCopy(option);
-
-    c->Modified();
-    c->Update();
-
-    return c;
 }
 
Index: trunk/MagicSoft/Mars/mhistmc/MHMcEnergy.cc
===================================================================
--- trunk/MagicSoft/Mars/mhistmc/MHMcEnergy.cc	(revision 2016)
+++ trunk/MagicSoft/Mars/mhistmc/MHMcEnergy.cc	(revision 2017)
@@ -170,5 +170,5 @@
 void MHMcEnergy::Draw(Option_t *option)
 {
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
+    TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
Index: trunk/MagicSoft/Mars/mhistmc/MHMcEnergyImpact.cc
===================================================================
--- trunk/MagicSoft/Mars/mhistmc/MHMcEnergyImpact.cc	(revision 2016)
+++ trunk/MagicSoft/Mars/mhistmc/MHMcEnergyImpact.cc	(revision 2017)
@@ -128,5 +128,5 @@
 void MHMcEnergyImpact::Draw(Option_t *option)
 {
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
+    TVirtualPad *pad = gPad ? gPad : MH::MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
Index: trunk/MagicSoft/Mars/mhistmc/MHMcEnergyMigration.cc
===================================================================
--- trunk/MagicSoft/Mars/mhistmc/MHMcEnergyMigration.cc	(revision 2016)
+++ trunk/MagicSoft/Mars/mhistmc/MHMcEnergyMigration.cc	(revision 2017)
@@ -111,5 +111,5 @@
 void MHMcEnergyMigration::Draw(Option_t *opt)
 {
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fHist);
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
@@ -126,6 +126,6 @@
     h->SetTitle("Distribution of E_{true}");
     h->SetXTitle("E_{true} [GeV]");
+    h->SetBit(kCanDelete);
     h->Draw(opt);
-    h->SetBit(kCanDelete);
 
     pad->cd(2);
@@ -135,6 +135,6 @@
     h->SetTitle("Distribution of E_{est}");
     h->SetXTitle("E_{est} [GeV]");
+    h->SetBit(kCanDelete);
     h->Draw(opt);
-    h->SetBit(kCanDelete);
 
     pad->cd(3);
@@ -143,6 +143,6 @@
     h->SetTitle("Distribution of \\Theta");
     h->SetXTitle("\\Theta [\\circ]");
+    h->SetBit(kCanDelete);
     h->Draw(opt);
-    h->SetBit(kCanDelete);
 
     pad->cd(4);
Index: trunk/MagicSoft/Mars/mhistmc/MHMcRate.cc
===================================================================
--- trunk/MagicSoft/Mars/mhistmc/MHMcRate.cc	(revision 2016)
+++ trunk/MagicSoft/Mars/mhistmc/MHMcRate.cc	(revision 2017)
@@ -255,3 +255,2 @@
 }
 
-q