Changeset bdf9e2e in git

Timestamp:

Jun 4, 2017, 3:03:55 PM (8 years ago)

Author:

GitHub <noreply@…>

Parents:

4339a7d (diff), e5ea42e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Joschka Lingemann <jlingema@…> (06/04/17 15:03:55)

git-committer:

GitHub <noreply@…> (06/04/17 15:03:55)

Message:

Merge e5ea42e567ec58be1c52023f0c4f91579c2e446b into 4339a7d9a3ef8c398bdb439133fddc550142271d

Files:

• external/ExRootAnalysis/ExRootTreeBranch.cc (modified) (1 diff)
• external/ExRootAnalysis/ExRootTreeBranch.h (modified) (1 diff)
• external/ExRootAnalysis/ExRootTreeWriter.cc (modified) (1 diff)
• external/ExRootAnalysis/ExRootTreeWriter.h (modified) (1 diff)
• modules/Delphes.cc (modified) (1 diff)
• modules/Delphes.h (modified) (1 diff)

external/ExRootAnalysis/ExRootTreeBranch.cc

@@ -82 +82 @@
 //------------------------------------------------------------------------------
 
-void ExRootTreeBranch::Clear()
+void ExRootTreeBranch::Clear(Option_t *option)
 {
   fSize = 0;
-  if(fData) fData->Clear();
+  if(fData) fData->Clear(option);
 }
 

external/ExRootAnalysis/ExRootTreeBranch.h

@@ -24 +24 @@
 
   TObject *NewEntry();
-  void Clear();
+  virtual void Clear(Option_t *option="");
 
 private:

external/ExRootAnalysis/ExRootTreeWriter.cc

@@ -59 +59 @@
 //------------------------------------------------------------------------------
 
-void ExRootTreeWriter::Write()
+Int_t ExRootTreeWriter::Write(const char *name, Int_t option, Int_t bufsize) const
 {
-  fFile = fTree ? fTree->GetCurrentFile() : 0;
-  if(fFile) fFile->Write();
+  if (fTree != 0) {
+    return fTree->GetCurrentFile()->Write(name, option, bufsize);
+  }
+  return 0;
 }
 
 //------------------------------------------------------------------------------
 
-void ExRootTreeWriter::Clear()
+Int_t ExRootTreeWriter::Write(const char *name, Int_t option, Int_t bufsize)
+{
+  // forward call to const version of this function
+  return static_cast<const ExRootTreeWriter*>(this)->Write(name, option, bufsize);
+}
+
+//------------------------------------------------------------------------------
+
+void ExRootTreeWriter::Clear(Option_t *option)
 {
   set<ExRootTreeBranch*>::iterator itBranches;
   for(itBranches = fBranches.begin(); itBranches != fBranches.end(); ++itBranches)
   {
-    (*itBranches)->Clear();
+    (*itBranches)->Clear(option);
   }
 }

external/ExRootAnalysis/ExRootTreeWriter.h

@@ -31 +31 @@
   ExRootTreeBranch *NewBranch(const char *name, TClass *cl);
 
-  void Clear();
+  virtual void Clear(Option_t *option = "");
   void Fill();
-  void Write();
+  virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0) const;
+  virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0);
 
 private:

modules/Delphes.cc

@@ -89 +89 @@
 //------------------------------------------------------------------------------
 
-void Delphes::Clear()
+void Delphes::Clear(Option_t* option)
 {
-  if(fFactory) fFactory->Clear();
+  if(fFactory) fFactory->Clear(option);
 }
 

modules/Delphes.h

@@ -49 +49 @@
   DelphesFactory *GetFactory() const { return fFactory; }
 
-  void Clear();
+  virtual void Clear(Option_t* option = "");
 
   virtual void Init();