git://git.uio.no
/
u
/
mrichter
/
AliRoot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Added Merge method and implemented destructor
[u/mrichter/AliRoot.git]
/
PWG0
/
esdTrackCuts
/
AliESDtrackCuts.h
diff --git
a/PWG0/esdTrackCuts/AliESDtrackCuts.h
b/PWG0/esdTrackCuts/AliESDtrackCuts.h
index 61bf97856e1caedfd430d52b911337d7ad2272b8..1c758d625526deb150be328d42692e5827dd02ec 100644
(file)
--- a/
PWG0/esdTrackCuts/AliESDtrackCuts.h
+++ b/
PWG0/esdTrackCuts/AliESDtrackCuts.h
@@
-42,6
+42,7
@@
public:
TObjArray* GetAcceptedTracks(AliESD* esd);
Int_t CountAcceptedTracks(AliESD* esd);
+ virtual Long64_t Merge(TCollection* list);
virtual void Copy(TObject &c) const;
//######################################################