Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 1007)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 1008)
@@ -98,5 +98,8 @@
      - changed fName, fTitle from pointer to static object
      - changed to use auto enabling scheme
-     
+
+   * macros/threshold.C, macros/collarea.C, macros/trigrate.C:
+     - removed UseLeaf
+
    * mraw/MRawFileWrite.cc:
      - changed fName, fTitle from pointer to static object
Index: /trunk/MagicSoft/Mars/macros/threshold.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/threshold.C	(revision 1007)
+++ /trunk/MagicSoft/Mars/macros/threshold.C	(revision 1008)
@@ -78,7 +78,4 @@
     //
     MReadTree read("Events", filename);
-    read.UseLeaf("fEnergy");
-    read.UseLeaf("fNumFirstLevel");
-
     MMcThresholdCalc calc(numtrigcond);
 
@@ -99,4 +96,6 @@
     // Now you can display the results
     //
+    hists.Print();
+
     TIter Next(&hists);
     TObject *obj;
Index: /trunk/MagicSoft/Mars/macros/trigrate.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/trigrate.C	(revision 1007)
+++ /trunk/MagicSoft/Mars/macros/trigrate.C	(revision 1008)
@@ -61,5 +61,10 @@
     // macro yet)
     //
-    TObjArray hists(MParList::CreateObjList("MHMcRate", dim));
+    UInt_t from = dim>0 ?   1 : -dim;
+    UInt_t to   = dim>0 ? dim : -dim;
+
+    Int_t num = to-from+1;
+
+    TObjArray hists(MParList::CreateObjList("MHMcRate", num));
     hists.SetOwner();
 
@@ -67,5 +72,5 @@
     // Check if the list really contains the right number of histograms
     //
-    if (hists.GetEntriesFast() != dim && dim)
+    if (hists.GetEntriesFast() != num)
         return;
 
@@ -83,16 +88,10 @@
     //
     MReadTree reader("Events", filename);
-    reader.UseLeaf("fImpact");
-    reader.UseLeaf("fEnergy");
-    reader.UseLeaf("fPhi");
-    reader.UseLeaf("fTheta");
-    reader.UseLeaf("fNumFirstLevel");
-    reader.UseLeaf("fPhotElfromShower");
     tasklist.AddToList(&reader);
 
     Float_t BgR[10]={660, 4, 0, 0, 0, 0, 0, 0, 0, 0};
-    cout << "Number of Trigger conditions: " << dim << endl;
+    cout << "Number of Trigger conditions: " << num << endl;
 
-    MMcTriggerRateCalc rate(dim, 14, BgR, 100000);
+    MMcTriggerRateCalc rate(num, 14, BgR, 100000);
     tasklist.AddToList(&rate);