Changeset 988 for trunk/MagicSoft/Mars/mmain

Timestamp:

10/24/01 15:12:21 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mmain/MMonteCarlo.cc

@@ -219 +219 @@
     //
     MReadTree reader("Events", fInputFile);
+    reader.UseLeaf("fImpact");
+    reader.UseLeaf("fEnergy");
+    reader.UseLeaf("fNumFirstLevel");
+
     tlist.AddToList(&reader);
 
@@ -288 +292 @@
     // Check if the list really contains the right number of histograms
     //
-    if (hists.GetEntriesFast() != dim)
+    if (hists.GetEntriesFast() != dim && dim)
         return;
 
@@ -304 +308 @@
     //
     MReadTree reader("Events", fInputFile);
+    reader.UseLeaf("fImpact");
+    reader.UseLeaf("fEnergy");
+    reader.UseLeaf("fPhi");
+    reader.UseLeaf("fTheta");
+    reader.UseLeaf("fNumFirstLevel");
+    reader.UseLeaf("fPhotElfromShower");
+
     tlist.AddToList(&reader);
 
-    Float_t BgR[10]={660,4,0,0,0,0,0,0,0,0};
-
-    MMcTriggerRateCalc crate(dim, 14, BgR, 100000, 2.75, 10.91e-2);
+    Float_t BgR[10]={660, 4, 0, 0, 0, 0, 0, 0, 0, 0};
+
+    MMcTriggerRateCalc crate(dim, 14, BgR, 100000);
     tlist.AddToList(&crate);
 
@@ -323 +334 @@
         return;
 
-    TIter Next(&hists);
-    MHMcRate *rate=NULL;
-    while ((rate=(MHMcRate*)Next()))
-        rate->Print();
+    hists.Print();
 }
 
@@ -378 +386 @@
     //      like one dimension MMcThresholdCalc
     //
-    MReadTree        read("Events", fInputFile);
+    MReadTree read("Events", fInputFile);
+    read.VetoBranch("MRawEvtData");
+    read.VetoBranch("MRawEvtHeader");
+
     MMcThresholdCalc calc(dim);
-
     tlist.AddToList(&read);
     tlist.AddToList(&calc);
@@ -398 +408 @@
     //
     TIter Next(&hists);
-    MHMcRate *hist=NULL;
-    while ((hist=(MHMcRate*)Next()))
-        hist->DrawClone();
+    TObject *obj;
+    while ((obj=Next()))
+        obj->DrawClone();
 }