Changeset 17867 for trunk/Mars

Timestamp:

05/16/14 11:52:02 (11 years ago)

Author:

tbretz

Message:

Added the possibility to limit the number of events written per branch per file.

Location:

trunk/Mars/mfileio

Files:

• MWriteRootFile.cc (modified) (7 diffs)
• MWriteRootFile.h (modified) (6 diffs)

trunk/Mars/mfileio/MWriteRootFile.cc

@@ -213 +213 @@
     Init(name, title);
 
+    const Bool_t hasrule = fSplitRule.BeginsWith("s/") && fSplitRule.EndsWith("/");
+    if (!hasrule)
+        fSplitRule = "";
+
     //
     // Open a TFile in dummy mode! This is necessary to be able to create
@@ -218 +222 @@
     // a valid file. (Stupid workaround - but does a good job)
     //
-    fOut = OpenFile("/dev/null", option, ftitle, comp);
+    const TString fname = hasrule ? "/dev/null" : rule;
+    fOut = OpenFile(fname, option, ftitle, comp);
 }
 
@@ -393 +398 @@
 // is the name of the tree.
 //
-void MWriteRootFile::AddContainer(const char *cname, const char *tname, Bool_t must)
+void MWriteRootFile::AddContainer(const char *cname, const char *tname, Bool_t must, Long64_t max)
 {
     if (!fOut && !tname)
@@ -412 +417 @@
     // add the entry to the list.
     //
-    MRootFileBranch *entry = new MRootFileBranch(AddSerialNumber(cname), tname, must);
+    MRootFileBranch *entry = new MRootFileBranch(AddSerialNumber(cname), tname, must, max);
     fBranches.AddLast(entry);
 
@@ -429 +434 @@
 // is the name of the tree.
 //
-void MWriteRootFile::AddContainer(MParContainer *cont, const char *tname, Bool_t must)
+void MWriteRootFile::AddContainer(MParContainer *cont, const char *tname, Bool_t must, Long64_t max)
 {
     if (!fOut && !tname)
@@ -449 +454 @@
     // add the entry to the list.
     //
-    MRootFileBranch *entry = new MRootFileBranch(cont, tname, must);
+    MRootFileBranch *entry = new MRootFileBranch(cont, tname, must, max);
     fBranches.AddLast(entry);
 }
@@ -712 +717 @@
             continue;
 
+        if (b->GetMaxEntries()==b->GetTree()->GetEntries())
+            continue;
+
         //
         // If the write flag of the branch entry is set, set the write flag of

trunk/Mars/mfileio/MWriteRootFile.h

@@ -25 +25 @@
 
     Bool_t         fMust;
+    Long64_t       fMaxEntries;
 
     void Init(const char *name, Bool_t must)
@@ -33 +34 @@
 
 public:
-    MRootFileBranch() : fTree(NULL), fBranch(NULL), fContainer(NULL), fMust(0)
+    MRootFileBranch() : fTree(NULL), fBranch(NULL), fContainer(NULL), fMust(0), fMaxEntries(0)
     {
         Init(NULL, kFALSE);
@@ -39 +40 @@
     }
 
-    MRootFileBranch(const char *cname, const char *tname=NULL, Bool_t must=kFALSE)
-        : fTree(NULL), fBranch(NULL), fContainer(NULL), fMust(0)
+    MRootFileBranch(const char *cname, const char *tname=NULL, Bool_t must=kFALSE, Long64_t max=-1)
+        : fTree(NULL), fBranch(NULL), fContainer(NULL), fMust(0), fMaxEntries(max)
     {
         Init(tname, must);
@@ -46 +47 @@
     }
 
-    MRootFileBranch(MParContainer *cont, const char *tname=NULL, Bool_t must=kFALSE)
-        : fTree(NULL), fBranch(NULL), fMust(0)
+    MRootFileBranch(MParContainer *cont, const char *tname=NULL, Bool_t must=kFALSE, Long64_t max=-1)
+        : fTree(NULL), fBranch(NULL), fMust(0), fMaxEntries(max)
     {
         Init(tname, must);
@@ -54 +55 @@
     }
 
-    TTree         *GetTree() const      { return fTree; }
-    MParContainer *GetContainer() const { return fContainer; }
-    void          *GetAddress()         { return &fContainer; }
-    TBranch       *GetBranch() const    { return fBranch; }
-    const char    *GetContName() const  { return fTitle; }
-    Bool_t         MustHave() const     { return fMust; }
+    TTree         *GetTree() const       { return fTree; }
+    MParContainer *GetContainer() const  { return fContainer; }
+    void          *GetAddress()          { return &fContainer; }
+    TBranch       *GetBranch() const     { return fBranch; }
+    const char    *GetContName() const   { return fTitle; }
+    Bool_t         MustHave() const      { return fMust; }
+    Long64_t         GetMaxEntries() const { return fMaxEntries; }
 
     void SetContainer(MParContainer *cont) { fContainer = cont; }
@@ -129 +131 @@
     ~MWriteRootFile();
 
-    void AddContainer(const char *cname,   const char *tname=NULL, Bool_t must=kTRUE);
-    void AddContainer(MParContainer *cont, const char *tname=NULL, Bool_t must=kTRUE);
+    void AddContainer(const char *cname,   const char *tname=NULL, Bool_t must=kTRUE, Long64_t max=-1);
+    void AddContainer(MParContainer *cont, const char *tname=NULL, Bool_t must=kTRUE, Long64_t max=-1);
     void AddCopySource(const char *tname, const char *bname=NULL, Bool_t force=kTRUE);
     void AddCopySource(const char *tname, Bool_t force)