polish

[u/mrichter/AliRoot.git] / STEER / AliStream.h

diff --git a/STEER/AliStream.h b/STEER/AliStream.h
index 32e4bc7e91805571e0e61d5b607302c69c87a1c7..5963ef9fe3809300b84ed3b74bc2281ad203fd9a 100644 (file)
--- a/STEER/AliStream.h
+++ b/STEER/AliStream.h
@@ -15,34 +15,41 @@
 
 // --- ROOT system ---
 #include "TNamed.h"
-#include "TObjString.h"
-#include "TArrayI.h"
-#include "TClonesArray.h"
-#include "TFile.h"
 
 // --- AliRoot header files ---
+//#include <TString.h>
+
+#include "TObjArray.h"
+class TFile;
+
+class TString;
 
 class AliStream: public TNamed {
 
 public:
   AliStream();
-  AliStream(Option_t *option);
+  AliStream(const char* foldername, Option_t *optioneventfoldername);
   virtual ~AliStream();
-  void AddFile(const char *fileName);
-  Bool_t NextEventInStream(Int_t &eventNr);
-  Bool_t OpenNextFile();
-  Bool_t ImportgAlice();
-  TFile* CurrentFile() { return fCurrentFile;}
-  void ChangeMode(Option_t* option);     // reset READ or UPDATE mode
-  
+
+  void       AddFile(const char *fileName);
+  Bool_t     NextEventInStream();
+  Bool_t     OpenNextFile();//returns kFALSE in case of failure
+  Bool_t     ImportgAlice();
+  void       ChangeMode(Option_t* option);     // reset READ or UPDATE mode
+ 
+  const TString& GetFolderName() const{return fEventFolderName;}
+  Int_t GetNInputFiles() const {return fFileNames->GetLast()+1;}
+  TString GetFileName(Int_t order) const;
+  void SetFolderName(const TString name) { fEventFolderName = name ; }    
 private:  
-  Int_t fLastEventSerialNr;
-  Int_t fLastEventNr;
-  Int_t fCurrentFileIndex;
-  Int_t fEvents;                //! nr. of events in the current file
-  TString fMode;                  // = 0 for READONLY, = 1 for READWRITE
-  TFile *fCurrentFile;          //! pointer to current open file
-  TObjArray * fFileNames;
+  Int_t      fLastEventSerialNr;
+  Int_t      fLastEventNr;
+  Int_t      fCurrentFileIndex;
+  Int_t      fEvents;                //! nr. of events in the current file
+  TString    fMode;                  // = 0 for READONLY, = 1 for READWRITE
+  TObjArray* fFileNames;
+  
+  TString fEventFolderName; //Name of the folder where data for this stram will be mounted
   
   ClassDef(AliStream,1)
 };