Fork me on GitHub

Changeset bdf9e2e in git


Ignore:
Timestamp:
Jun 4, 2017, 3:03:55 PM (7 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:
6 edited

Legend:

Unmodified
Added
Removed
  • external/ExRootAnalysis/ExRootTreeBranch.cc

    r4339a7d rbdf9e2e  
    8282//------------------------------------------------------------------------------
    8383
    84 void ExRootTreeBranch::Clear()
     84void ExRootTreeBranch::Clear(Option_t *option)
    8585{
    8686  fSize = 0;
    87   if(fData) fData->Clear();
     87  if(fData) fData->Clear(option);
    8888}
    8989
  • external/ExRootAnalysis/ExRootTreeBranch.h

    r4339a7d rbdf9e2e  
    2424
    2525  TObject *NewEntry();
    26   void Clear();
     26  virtual void Clear(Option_t *option="");
    2727
    2828private:
  • external/ExRootAnalysis/ExRootTreeWriter.cc

    r4339a7d rbdf9e2e  
    5959//------------------------------------------------------------------------------
    6060
    61 void ExRootTreeWriter::Write()
     61Int_t ExRootTreeWriter::Write(const char *name, Int_t option, Int_t bufsize) const
    6262{
    63   fFile = fTree ? fTree->GetCurrentFile() : 0;
    64   if(fFile) fFile->Write();
     63  if (fTree != 0) {
     64    return fTree->GetCurrentFile()->Write(name, option, bufsize);
     65  }
     66  return 0;
    6567}
    6668
    6769//------------------------------------------------------------------------------
    6870
    69 void ExRootTreeWriter::Clear()
     71Int_t ExRootTreeWriter::Write(const char *name, Int_t option, Int_t bufsize)
     72{
     73  // forward call to const version of this function
     74  return static_cast<const ExRootTreeWriter*>(this)->Write(name, option, bufsize);
     75}
     76
     77//------------------------------------------------------------------------------
     78
     79void ExRootTreeWriter::Clear(Option_t *option)
    7080{
    7181  set<ExRootTreeBranch*>::iterator itBranches;
    7282  for(itBranches = fBranches.begin(); itBranches != fBranches.end(); ++itBranches)
    7383  {
    74     (*itBranches)->Clear();
     84    (*itBranches)->Clear(option);
    7585  }
    7686}
  • external/ExRootAnalysis/ExRootTreeWriter.h

    r4339a7d rbdf9e2e  
    3131  ExRootTreeBranch *NewBranch(const char *name, TClass *cl);
    3232
    33   void Clear();
     33  virtual void Clear(Option_t *option = "");
    3434  void Fill();
    35   void Write();
     35  virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0) const;
     36  virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0);
    3637
    3738private:
  • modules/Delphes.cc

    r4339a7d rbdf9e2e  
    8989//------------------------------------------------------------------------------
    9090
    91 void Delphes::Clear()
     91void Delphes::Clear(Option_t* option)
    9292{
    93   if(fFactory) fFactory->Clear();
     93  if(fFactory) fFactory->Clear(option);
    9494}
    9595
  • modules/Delphes.h

    r4339a7d rbdf9e2e  
    4949  DelphesFactory *GetFactory() const { return fFactory; }
    5050
    51   void Clear();
     51  virtual void Clear(Option_t* option = "");
    5252
    5353  virtual void Init();
Note: See TracChangeset for help on using the changeset viewer.