Index: trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc
===================================================================
--- trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc	(revision 6958)
+++ trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc	(revision 6959)
@@ -276,9 +276,7 @@
     TVirtualPad *pad = gPad;
 
-    TH1 *h=0;
+    TH1 *h1=0, *h2=0;
 
     pad->cd(1);
-    //if (gPad->FindObject("ProjAllX"))
-    //    fHistAll.ProjectionX("ProjAllX", -1, 9999, "E");
     if (gPad->FindObject("ProjSelX"))
         fHistSel.ProjectionX("ProjSelX", -1, 9999, "E");
@@ -286,13 +284,22 @@
     pad->cd(2);
     if (gPad->FindObject("ProjAllY"))
-        h=fHistAll.ProjectionY("ProjAllY", -1, 9999, "E");
+        h1=fHistAll.ProjectionY("ProjAllY", -1, 9999, "E");
     if (gPad->FindObject("ProjSelY"))
-        fHistSel.ProjectionY("ProjSelY", -1, 9999, "E");
-
-    if (h->GetMaximum()>0)
+        h2=fHistSel.ProjectionY("ProjSelY", -1, 9999, "E");
+
+    if (h1->GetMaximum()>0)
     {
         gPad->SetLogx();
         gPad->SetLogy();
     }
+
+    pad->cd(3);
+    TH1 *h=dynamic_cast<TH1*>(gPad->FindObject("Efficiency"));
+    if (h1 && h2 && h)
+    {
+        h->Divide(h2, h1);
+        h->SetMaximum(1);
+    }
+
     pad->cd(4);
     CalcEfficiency();
@@ -315,5 +322,5 @@
     pad->Divide(2,2);
 
-    TH1D *h=0;
+    TH1 *h=0, *h1=0, *h2=0;
 
     if (fHistSel.GetNbinsX()>1)
@@ -348,19 +355,34 @@
         gPad->SetGridy();
 
-        h = fHistAll.ProjectionY("ProjAllY", -1, 9999, "E");
-        h->SetDirectory(NULL);
-        h->SetLineColor(kGreen);
-        h->SetXTitle("E [GeV]");
-        h->SetBit(kCanDelete);
-        h->Draw();
-
-        h = fHistSel.ProjectionY("ProjSelY", -1, 9999, "E");
-        h->SetDirectory(NULL);
-        h->SetLineColor(kRed);
-        h->SetBit(kCanDelete);
-        h->Draw("same");
+        h1 = fHistAll.ProjectionY("ProjAllY", -1, 9999, "E");
+        h1->SetDirectory(NULL);
+        h1->SetLineColor(kGreen);
+        h1->SetXTitle("E [GeV]");
+        h1->SetBit(kCanDelete);
+        h1->Draw();
+
+        h2 = fHistSel.ProjectionY("ProjSelY", -1, 9999, "E");
+        h2->SetDirectory(NULL);
+        h2->SetLineColor(kRed);
+        h2->SetBit(kCanDelete);
+        h2->Draw("same");
     }
     else
         delete pad->GetPad(2);
+
+    if (h1 && h2)
+    {
+        pad->cd(3);
+        gPad->SetBorderMode(0);
+        gPad->SetGridx();
+        gPad->SetGridy();
+        gPad->SetLogx();
+        h = h2->DrawCopy();
+        h->Divide(h1);
+        h->SetNameTitle("Efficiency", "Combined cut and trigger efficiency");
+        h->SetDirectory(NULL);
+    }
+    else
+        delete pad->GetPad(4);
 
     if (fHEnergy.GetNbinsX()>1)
@@ -374,12 +396,4 @@
     else
         delete pad->GetPad(4);
-/*
-    if (fHistAll.GetNbinsY()>1)
-    {
-        pad->cd(4);
-    }
-    else
-        delete pad->GetPad(4);
-  */
 }