Fork me on GitHub

Changeset e7e90df in git for classes/DelphesFactory.h


Ignore:
Timestamp:
Dec 9, 2014, 1:26:26 PM (10 years ago)
Author:
Michele <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
49234af
Parents:
01f457a (diff), f6b6ee7 (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.
Message:

Merge branch 'master' into TestFastJet310b1

Conflicts:

Makefile
examples/Example1.C
examples/Example2.C
examples/Example3.C

File:
1 edited

Legend:

Unmodified
Added
Removed

  • classes/DelphesFactory.h

    r01f457a re7e90df  
    6767  ExRootTreeBranch *fObjArrays; //!
    6868
     69#if !defined(__CINT__) && !defined(__CLING__)
    6970  std::map< const TClass*, ExRootTreeBranch* > fBranches; //!
     71#endif
     72
    7073  std::set< TObject* > fPool; //!
    7174 
Note: See TracChangeset for help on using the changeset viewer.