Fix for IsTriggerInputFired,GetFiredTriggerInputs

[u/mrichter/AliRoot.git] / ANALYSIS / AliFileMerger.h

diff --git a/ANALYSIS/AliFileMerger.h b/ANALYSIS/AliFileMerger.h
index e1554d00c0f285c542452cdd926aabca011c21f1..ab8c2c75b662af557410ecefbe67592c847db2c1 100644 (file)
--- a/ANALYSIS/AliFileMerger.h
+++ b/ANALYSIS/AliFileMerger.h
@@ -40,7 +40,7 @@ class AliFileMerger : public TNamed
   Int_t GetMaxFilesOpen()          const {return fMaxFilesOpen;}
 protected:
   int AddFile(TList* sourcelist, std::string entry);
-  int MergeRootfile( TDirectory *target, TList *sourceNames);
+  int MergeRootfile( TDirectory *target, TList *sourceNames, Bool_t nameFiltering=kTRUE);
   int OpenNextChunks(const TList* namesList, TList* filesList, Int_t from, Int_t to);
 protected:
   TObjArray * fRejectMask;  // mask of the objects to be rejected