Changeset 991 for trunk/MagicSoft/Mars/mmain

Timestamp:

10/26/01 10:11:30 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc

@@ -290 +290 @@
     // macro yet)
     //
-    TObjArray hists(MParList::CreateObjList("MHMcRate", dim));
+    const UInt_t from = dim>0 ?   1 : -dim;
+    const UInt_t to   = dim>0 ? dim : -dim;
+    const Int_t  num  = to-from+1;
+
+    TObjArray hists(MParList::CreateObjList("MHMcRate", from, to));
     hists.SetOwner();
 
@@ -296 +300 @@
     // Check if the list really contains the right number of histograms
     //
-    if (hists.GetEntriesFast() != dim && dim)
+    if (hists.GetEntriesFast() != num)
         return;
 
@@ -367 +371 @@
     // and store the histograms in an TObjArray
     //
-    TObjArray hists(MParList::CreateObjList("MHMcEnergy", dim));
+    const UInt_t from = dim>0 ?   1 : -dim;
+    const UInt_t to   = dim>0 ? dim : -dim;
+    const Int_t  num  = to-from+1;
+
+    TObjArray hists(MParList::CreateObjList("MHMcEnergy", from, to));
     hists.SetOwner();
 
@@ -373 +381 @@
     // Check if the list really contains the right number of histograms
     //
-    if (hists.GetEntriesFast() != dim)
+    if (hists.GetEntriesFast() != num)
         return;
 
@@ -391 +399 @@
     //
     MReadTree read("Events", fInputFile);
-    read.VetoBranch("MRawEvtData");
-    read.VetoBranch("MRawEvtHeader");
+    read.UseLeaf("fEnergy");
+    read.UseLeaf("fNumFirstLevel");
 
     MMcThresholdCalc calc(dim);