Changeset 1008 for trunk/MagicSoft

Timestamp:

10/29/01 13:23:39 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/threshold.C (modified) (2 diffs)
• macros/trigrate.C (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -98 +98 @@
      - 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

trunk/MagicSoft/Mars/macros/threshold.C

@@ -78 +78 @@
     //
     MReadTree read("Events", filename);
-    read.UseLeaf("fEnergy");
-    read.UseLeaf("fNumFirstLevel");
-
     MMcThresholdCalc calc(numtrigcond);
 
@@ -99 +96 @@
     // Now you can display the results
     //
+    hists.Print();
+
     TIter Next(&hists);
     TObject *obj;

trunk/MagicSoft/Mars/macros/trigrate.C

@@ -61 +61 @@
     // 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 +72 @@
     // Check if the list really contains the right number of histograms
     //
-    if (hists.GetEntriesFast() != dim && dim)
+    if (hists.GetEntriesFast() != num)
         return;
 
@@ -83 +88 @@
     //
     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);