X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ANALYSIS%2FAliAnalysisManager.h;h=941388ac4abbaf94cb6ee86a52fb2c9f31371f0c;hb=cbd58b9ca6f605fd8df95cbeb1726a7e90dd23ae;hp=b1f441d3a71e80d64fb091089fd58beea3feeec3;hpb=43072535904142a85b053bdcb8509639ec891dab;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ANALYSIS/AliAnalysisManager.h b/ANALYSIS/AliAnalysisManager.h
index b1f441d3a71..941388ac4ab 100644
--- a/ANALYSIS/AliAnalysisManager.h
+++ b/ANALYSIS/AliAnalysisManager.h
@@ -76,6 +76,7 @@ enum EAliAnalysisFlags {
    AliAnalysisManager& operator=(const AliAnalysisManager& other);
    
    // Event loop control
+   Bool_t              EventLoop(Long64_t nevents);
    virtual Int_t       GetEntry(Long64_t entry, Int_t getall = 0);
    virtual Bool_t      Init(TTree *tree);
    virtual Bool_t      Notify();
@@ -94,6 +95,7 @@ enum EAliAnalysisFlags {
 
    // Getters/Setters
    static AliAnalysisManager *GetAnalysisManager() {return fgAnalysisManager;}
+   static Int_t        LoadMacro(const char *filename, Int_t *error = 0, Bool_t check = kFALSE);
    EAliAnalysisExecMode 
                        GetAnalysisType() const    {return fMode;}
    void                GetAnalysisTypeString(TString &type) const;                    
@@ -121,6 +123,7 @@ enum EAliAnalysisFlags {
    AliVEventHandler*   GetOutputEventHandler() const  {return fOutputEventHandler;}
    TObjArray          *GetOutputs() const         {return fOutputs;}
    TObjArray          *GetParamOutputs() const    {return fParamCont;}
+   TObjArray          *GetExchangeContainers() const {return fExchangeCont;}
    Int_t               GetRunFromPath() const     {return fRunFromPath;}
    const char         *GetRequestedBranches() const {return fRequestedBranches.Data();}
    TObjArray          *GetTasks() const           {return fTasks;}
@@ -131,6 +134,8 @@ enum EAliAnalysisFlags {
    static Int_t        GetGlobalInt(const char *key, Bool_t &valid);
    static Double_t     GetGlobalDbl(const char *key, Bool_t &valid);
    TMap               *GetGlobals()               {return fGlobals;}
+   static Bool_t       IsMacroLoaded(const char * filename);
+   Bool_t              IsMCLoop() const           {return fMCLoop;}
    static Bool_t       IsPipe(std::ostream &out);
    Bool_t              IsProofMode() const        {return (fMode==kProofAnalysis)?kTRUE:kFALSE;}
    Bool_t              IsRemote() const           {return fIsRemote;}
@@ -149,6 +154,7 @@ enum EAliAnalysisFlags {
    void                SetDisableBranches(Bool_t disable=kTRUE)   {Changed(); TObject::SetBit(kDisableBranches,disable);}
    void                SetAsyncReading(Bool_t flag=kTRUE)    {fAsyncReading = flag;}
    void                SetExternalLoop(Bool_t flag)               {Changed(); TObject::SetBit(kExternalLoop,flag);}
+   void                SetMCLoop(Bool_t flag=kTRUE)               {fMCLoop = flag;}
    void                SetEventPool(AliVEventPool* const epool)   {Changed(); fEventPool = epool;}
    void                SetFileInfoLog(const char *name) {TObject::SetBit(kCollectThroughput,kTRUE); fFileInfoLog = name;}
    void                SetGridHandler(AliAnalysisGrid * const handler) {Changed(); fGridHandler = handler;}
@@ -175,6 +181,7 @@ enum EAliAnalysisFlags {
    // Including tasks and getting them
    void                 AddTask(AliAnalysisTask *task);
    AliAnalysisTask     *GetTask(const char *name) const;
+   Int_t                GetTaskIndex(const AliAnalysisTask *task) const;
    
    // Connecting data containers to task inputs/outputs
    Bool_t               ConnectInput(AliAnalysisTask *task, Int_t islot,
@@ -225,6 +232,7 @@ enum EAliAnalysisFlags {
 protected:
    void                 CreateReadCache();
    void                 ImportWrappers(TList *source);
+   void                 InputFileFromTree(TTree * const tree, TString &fname);
    void                 SetEventLoop(Bool_t flag=kTRUE) {TObject::SetBit(kEventLoop,flag);}
    void                 DoLoadBranch(const char *name);
 
@@ -241,6 +249,7 @@ private:
    Bool_t                  fMustClean;           // Flag to let ROOT do cleanup
    Bool_t                  fIsRemote;            //! Flag is set for remote analysis
    Bool_t                  fLocked;              //! Lock for the manager and handlers
+   Bool_t                  fMCLoop;              // External MC generator loop
    UInt_t                  fDebug;               // Debug level
    TString                 fSpecialOutputLocation; // URL/path where the special outputs will be copied
    TObjArray              *fTasks;               // List of analysis tasks
@@ -249,7 +258,8 @@ private:
    TObjArray              *fContainers;          // List of all containers
    TObjArray              *fInputs;              // List of containers with input data
    TObjArray              *fOutputs;             // List of containers with results
-   TObjArray              *fParamCont;           // List of containers with results
+   TObjArray              *fParamCont;           // List of containers with parameters
+   TObjArray              *fExchangeCont;        // List of exchange containers
    TObjArray              *fDebugOptions;        // List of debug options
    TObjArray              *fFileDescriptors;     //! List of file descriptors
    AliAnalysisFileDescriptor *fCurrentDescriptor; //! Current file descriptor
@@ -278,7 +288,8 @@ private:
    Double_t                fCPUTime;             //! Cumulated time in Exec
    Double_t                fInitTime;            //! Cumulated time in initialization
    static TString          fgCommonFileName;     //! Common output file name (not streamed)
+   static TString          fgMacroNames;         //! Loaded macro names
    static AliAnalysisManager *fgAnalysisManager; //! static pointer to object instance
-   ClassDef(AliAnalysisManager,18)  // Analysis manager class
+   ClassDef(AliAnalysisManager,20)  // Analysis manager class
 };   
 #endif