Index: trunk/MagicSoft/Mars/macros/trigrate.C
===================================================================
--- trunk/MagicSoft/Mars/macros/trigrate.C	(revision 972)
+++ trunk/MagicSoft/Mars/macros/trigrate.C	(revision 984)
@@ -24,5 +24,5 @@
 
 
-void trigrate(int dim=0, char *filename = "/big0/Maggi/CamData/Gamma/gamma_15_on.root" )
+void trigrate(int dim=0, char *filename = "data/camera.root" )
 {
     // This macro has two input parameter:
@@ -67,5 +67,5 @@
     // Check if the list really contains the right number of histograms
     //
-    if (hists.GetEntriesFast() != dim)
+    if (hists.GetEntriesFast() != dim && dim)
         return;
 
@@ -83,4 +83,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);
 
@@ -88,5 +94,5 @@
     cout << "Number of Trigger conditions: " << dim << endl;
 
-    MMcTriggerRateCalc rate(dim, 14, BgR, 100000, 2.75, 10.91e-2);
+    MMcTriggerRateCalc rate(dim, 14, BgR, 100000);
     tasklist.AddToList(&rate);
 
@@ -104,6 +110,6 @@
 
     TIter Next(&hists);
-    MHMcRate *rate=NULL;
-    while ((rate=(MHMcRate*)Next()))
-        rate->Print();
+    MHMcRate *r=NULL;
+    while ((r=(MHMcRate*)Next()))
+        r->Print();
 }