Changeset 965 for trunk

Timestamp:

10/16/01 15:10:43 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/getCollArea.C (modified) (2 diffs)
• mbase/MReadTree.cc (modified) (8 diffs)
• mbase/MReadTree.h (modified) (2 diffs)

trunk/MagicSoft/Mars/macros/getCollArea.C

@@ -24 +24 @@
 
 
-void getCollArea(char *filename = "data/gamma_15_on.root" )
+void getCollArea(char *filename = "camera.root")
 { 
     // FIXME: Harald, you should tell the people what the result of
@@ -55 +55 @@
     //
     MReadTree reader("Events", filename);
+    reader.UseLeaf("fImpact");
+    reader.UseLeaf("fEnergy");
+    reader.UseLeaf("fNumFirstLevel");
     tasklist.AddToList(&reader);
 
     MMcCollectionAreaCalc effi;
     tasklist.AddToList(&effi);
+
+    MTask task;
+    tasklist.AddToList(&task);
+
 
     //

trunk/MagicSoft/Mars/mbase/MReadTree.cc

@@ -38 +38 @@
 // MReadTree::SetEventNum after instantiating your MReadTree-object.       //
 //                                                                         //
+// To make reading much faster (up to a factor of 10 to 20) you can        //
+// ensure that only the data you are really processing is enabled by       //
+// calling MReadTree::UseLeaf.                                             //
+//                                                                         //
+// Later we'll use TChain::SetNotify to notify MReadTree if the TChain     //
+// starts to read a new file.                                              //
+//                                                                         //
 /////////////////////////////////////////////////////////////////////////////
 
@@ -67 +74 @@
 //
 MReadTree::MReadTree(const char *tname, const char *fname,
-                     const char *name, const char *title) : fNumEntry(0)
+                     const char *name, const char *title)
+    : fNumEntry(0), fLeafEnabled(kFALSE)
 {
     *fName  = name  ? name  : "MReadTree";
@@ -113 +121 @@
 //  anymore, tree wich are not existing in the first file are never read)
 //
-/*Int_t*/ void MReadTree::AddFile(const char *fname)
+//  Name may use the wildcarding notation, eg "xxx*.root" means all files
+//  starting with xxx in the current file system directory.
+//
+Int_t MReadTree::AddFile(const char *fname)
 {
     //
@@ -121 +132 @@
     // returns the number of file which were added
     //
-    /*return  root >3.0*/ fChain->Add(fname);
+    return fChain->Add(fname);
+}
+
+// --------------------------------------------------------------------------
+//
+// The first time this function is called all leafes/branches are disabled
+// and the given branch/leaf is enabled. By enabling only the branches you
+// are processing you can speed up your calculation many times (up to
+// a factor of 10 or 20)
+//
+void MReadTree::UseLeaf(const char *name)
+{
+    if (!fLeafEnabled)
+    {
+        *fLog << "Leaf choosing method enabled (only enabled leaves are read)." << endl;
+        fChain->SetBranchStatus("*", kFALSE);
+        fLeafEnabled = kTRUE;
+    }
+
+    fChain->SetBranchStatus(name, kTRUE);
 }
 
@@ -170 +200 @@
         // Get Name of Branch
         //
-        const char *name  = branch->GetName();
+        const char *name = branch->GetName();
 
         //
@@ -208 +238 @@
         //
         fChain->SetBranchAddress(name, pcont);
+
         *fLog << "Branch " << name << " enabled for reading." << endl;
 
@@ -227 +258 @@
 Bool_t MReadTree::Process()
 {
-    //
-    // check for end of file
-    //
-    if (fNumEntry>=fNumEntries)
-        return kFALSE;
-
-    //
-    // get entry
-    //
-    fChain->GetEntry(fNumEntry);
-
-    fNumEntry++;
-
-    return kTRUE;
+    return fChain->GetEntry(fNumEntry++, 0) == 0 ? kFALSE : kTRUE;
 }
 
@@ -249 +267 @@
 Bool_t MReadTree::GetEvent()
 {
-    fChain->GetEntry(fNumEntry);
-
-    return kTRUE;
+    return fChain->GetEntry(fNumEntry) == 0 ? kFALSE : kTRUE;
 }
 

trunk/MagicSoft/Mars/mbase/MReadTree.h

@@ -21 +21 @@
     UInt_t   fNumEntries; // Number of Events in Tree
 
+    Bool_t   fLeafEnabled; // Flag whether UseLeaf is called the first time or not
+
     Bool_t HasVeto(const char *name) const;
 
@@ -30 +32 @@
     Bool_t Process();
 
-    void AddFile(const char *fname);
-    void VetoBranch(const char *name);
+    Int_t AddFile(const char *fname);
+    void  VetoBranch(const char *name);
+
+    void UseLeaf(const char *name);
 
     Bool_t GetEvent();