Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 1836)
+++ trunk/MagicSoft/Mars/Changelog	(revision 1837)
@@ -1,3 +1,9 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/03/19: Abelardo Moralejo
+
+    * macros/CT1collarea.C:
+      -	Added filter to cut in hadronness (now available in new version of 
+	root CT1 Monte Carlo file from Wolfgang).
 
  2003/03/19: Robert Wagner
@@ -6,5 +12,4 @@
       - changed MH3::New() such that constructor according to Thomas'
         previous changes is supported
-
 
 
Index: trunk/MagicSoft/Mars/macros/CT1collarea.C
===================================================================
--- trunk/MagicSoft/Mars/macros/CT1collarea.C	(revision 1836)
+++ trunk/MagicSoft/Mars/macros/CT1collarea.C	(revision 1837)
@@ -24,5 +24,5 @@
 
 
-void CT1collarea(TString filename="MC_ON1.root", TString outname="")
+void CT1collarea(TString filename="MC_ON2.root", TString outname="")
 { 
     //
@@ -40,7 +40,16 @@
     //
     MReadMarsFile reader("Events", filename);
+    reader.DisableAutoScheme();
+    //    reader.EnableBranch("fHadronness");
+
     MMcCT1CollectionAreaCalc effi;
+    MHMcCT1CollectionArea* collarea = new MHMcCT1CollectionArea("MHMcCT1CollectionArea","",30,2.,5.);
+    parlist.AddToList(collarea);
 
     tasklist.AddToList(&reader);   
+
+    MF filterhadrons("MHadronness.fHadronness<0.25");
+    tasklist.AddToList(&filterhadrons);
+    effi.SetFilter(&filterhadrons);
 
     tasklist.AddToList(&effi);
@@ -75,8 +84,9 @@
         return;
 
-    TFile f(outname, "recreate");
-    if (!f)
-        return;
-    parlist.FindObject("MHMcCT1CollectionArea")->Write();
+    TFile f("area.root","recreate");
+    collarea->GetHist()->Write();
+    collarea->GetHAll()->Write();
+    collarea->GetHSel()->Write();
+    f.Close();
 }