Index: trunk/MagicSoft/Mars/macros/CT1collarea.C
===================================================================
--- trunk/MagicSoft/Mars/macros/CT1collarea.C	(revision 1986)
+++ trunk/MagicSoft/Mars/macros/CT1collarea.C	(revision 1987)
@@ -17,4 +17,5 @@
 !
 !   Author(s): Thomas Bretz  12/2000 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Abelardo Moralejo 4/2003 <mailto:moralejo@pd.infn.it>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -24,5 +25,5 @@
 
 
-void CT1collarea(TString filename="MC_ON2.root", TString outname="")
+void CT1collarea(TString filename="MC3.root", TString outname="")
 { 
     //
@@ -40,17 +41,28 @@
     //
     MReadMarsFile reader("Events", filename);
-    reader.EnableBranch("fHadronness");
+    reader.DisableAutoScheme();
 
-    MMcCT1CollectionAreaCalc effi;
-    MHMcCT1CollectionArea* collarea = new MHMcCT1CollectionArea("MHMcCT1CollectionArea","",30,2.,5.);
+    MHMcCT1CollectionArea* collarea = new MHMcCT1CollectionArea();
+
+    MBinning binsx("MBinningE");
+    binsx.SetEdges(30,2.,5.);
+
+    MBinning binsy("MBinningTheta");
+    const Double_t yedge[7] = {12.5, 17.5, 23.5, 29.5, 35.5, 42., 48.};
+    const TArrayD yed(7,yedge);
+    binsy.SetEdges(yed);
+
     parlist.AddToList(collarea);
+    parlist.AddToList(&binsx);
+    parlist.AddToList(&binsy);
 
     tasklist.AddToList(&reader);   
 
-    MF filterhadrons("MHadronness.fHadronness<0.25");
+    MF filterhadrons("HadNN.fHadronness<0.25");
     tasklist.AddToList(&filterhadrons);
-    effi.SetFilter(&filterhadrons);
 
-    tasklist.AddToList(&effi);
+    MFillH filler("MHMcCT1CollectionArea","MMcEvt");
+    filler.SetFilter(&filterhadrons);
+    tasklist.AddToList(&filler);
 
     //
@@ -70,9 +82,11 @@
     tasklist.PrintStatistics();
 
+    collarea->CalcEfficiency();
+
     //
     // Now the histogram we wanted to get out of the data is
     // filled and can be displayed
     //
-    parlist.FindObject("MHMcCT1CollectionArea")->DrawClone();
+    collarea->DrawClone();
 
     //
@@ -83,5 +97,5 @@
         return;
 
-    TFile f("area.root","recreate");
+    TFile f(outname,"recreate");
     collarea->GetHist()->Write();
     collarea->GetHAll()->Write();