This commit was manufactured by cvs2svn to create tag 'v4-05-13'.

sevdokim · May 9, 2007 · 2619984 · 2619984
1 parent 524ecd4
commit 2619984
Show file tree

Hide file tree

Showing 639 changed files with 10,385 additions and 31,700 deletions.
diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg
@@ -7,7 +7,7 @@ ELIBSDIR:=
 
 
 
-ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUONmapping \
+ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONraw MUONcalib MUONmapping \
         TPCbase TPCsim TPCrec TPCfast \
 	ITSbase ITSsim ITSrec PMDbase PMDsim PMDrec TRDbase \
         TRDsim TRDrec TRDfast \
@@ -21,7 +21,7 @@ ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUON
         hijing TMEVSIM mevsim THbtp HBTP TEPEMGEN EPEMGEN \
         FASTSIM microcern \
 	RAWDatabase RAWDatarec RAWDatasim \
-	HLTbase AliHLTSrc AliHLTComp AliHLTMisc AliHLTMUON MUONevaluation \
+	HLTbase AliHLTSrc AliHLTComp AliHLTMisc AliHLTMUON \
 	AliHLTHough AliHLTITS\
 #	THerwig herwig TPHIC
 

diff --git a/ANALYSIS/ANALYSISLinkDef.h b/ANALYSIS/ANALYSISLinkDef.h
@@ -13,7 +13,7 @@
 #pragma link C++ class  AliAnalysisSelector+;
 
 #ifdef WITHXML
-#pragma link C++ class AliAnalysisGoodies+;
+//#pragma link C++ class  AliAnalysisGoodies+;
 #pragma link C++ class AliTagAnalysis+;
 #pragma link C++ class AliXMLCollection+;
 #endif

diff --git a/ANALYSIS/AliAnalysisDataContainer.cxx b/ANALYSIS/AliAnalysisDataContainer.cxx
@@ -266,7 +266,7 @@ void AliAnalysisDataContainer::PrintContainer(Option_t *option, Int_t indent) co
    opt.ToLower();
    Bool_t dep = (opt.Contains("dep"))?kTRUE:kFALSE;
    if (!dep) {
-      printf("%sContainer: %s  type: %s POST_LOOP=%i", ind.Data(), GetName(), GetTitle(), IsPostEventLoop());
+      printf("%sContainer: %s  type: %s", ind.Data(), GetName(), GetTitle());
       if (fProducer) 
          printf("%s = Data producer: task %s",ind.Data(),fProducer->GetName());
       else

diff --git a/ANALYSIS/AliAnalysisDataContainer.h b/ANALYSIS/AliAnalysisDataContainer.h
@@ -38,9 +38,6 @@ enum ENotifyMessage {
    kSaveData,
    kFileChange
 };   
-enum EAnalysisContainerFlags {
-   kPostEventLoop = BIT(14)
-};     
    AliAnalysisDataContainer();
    AliAnalysisDataContainer(const AliAnalysisDataContainer &cont);
    AliAnalysisDataContainer(const char *name, TClass *type);
@@ -59,7 +56,6 @@ enum EAnalysisContainerFlags {
    void                      ResetDataReady()     {fDataReady = kFALSE;}
    virtual Bool_t            SetData(TObject *data, Option_t *option="");
    void                      SetDataOwned(Bool_t flag) {fOwnedData = flag;}
-   void                      SetPostEventLoop(Bool_t flag=kTRUE) {TObject::SetBit(kPostEventLoop,flag);}
    void                      SetFileName(const char *filename) {fFileName = filename;}
    void                      SetProducer(AliAnalysisTask *prod, Int_t islot);
    void                      AddConsumer(AliAnalysisTask *cons, Int_t islot);
@@ -69,7 +65,6 @@ enum EAnalysisContainerFlags {
    void                      ImportData(AliAnalysisDataWrapper *pack);
    // Container status checking
    Bool_t                    IsDataReady() const  {return fDataReady;}
-   Bool_t                    IsPostEventLoop() const {return TObject::TestBit(kPostEventLoop);}
    Bool_t                    IsOwnedData() const  {return fOwnedData;}
    Bool_t                    ClientsExecuted() const;
    Bool_t                    HasConsumers() const {return (fConsumers != 0);}

diff --git a/ANALYSIS/AliAnalysisDataSlot.cxx b/ANALYSIS/AliAnalysisDataSlot.cxx
@@ -43,7 +43,6 @@
 #include <TROOT.h>
 #include <TClass.h>
 #include <TTree.h>
-#include <TLeaf.h>
 
 #include "AliAnalysisDataSlot.h"
 #include "AliAnalysisTask.h"
@@ -138,30 +137,6 @@ void *AliAnalysisDataSlot::GetBranchAddress(const char *branchname) const
    return br->GetAddress();
 }   
 
-//______________________________________________________________________________
-Int_t AliAnalysisDataSlot::EnableBranch(const char *bname, TTree *tree)
-{
-// Static method to enable recursively a branch in a tree (why this in not in ROOT?)
-   TBranch *branch = tree->GetBranch(bname);
-   Int_t count = 0;
-//   static Int_t indent = 0;
-   if (!branch) return count;
-//   TString s;
-//   for (Int_t i=0; i<indent; i++) s += " ";
-   count++;
-//   printf("%sbranch %s: kDoNotProcess=%d\n",s.Data(), branch->GetName(), branch->TestBit(kDoNotProcess));
-   branch->SetBit(kDoNotProcess, kFALSE);
-   TIter next(branch->GetListOfBranches());
-   TBranch *branch_sub;
-   // Activate all sub-branches
-//   indent++;
-   while ((branch_sub=(TBranch*)next())) {
-      count += AliAnalysisDataSlot::EnableBranch(branch_sub->GetName(), tree);
-   }
-//   indent--;
-   return count;   
-}   
-
 //______________________________________________________________________________
 Bool_t AliAnalysisDataSlot::SetBranchAddress(const char *branchname, void *address)
 {
@@ -172,6 +147,7 @@ Bool_t AliAnalysisDataSlot::SetBranchAddress(const char *branchname, void *addre
       return kFALSE;
    }
    TTree *tree = (TTree*)GetData();
+   tree->SetBranchStatus(branchname,1);
    tree->SetBranchAddress(branchname, address);
    return kTRUE;
 }   

diff --git a/ANALYSIS/AliAnalysisDataSlot.h b/ANALYSIS/AliAnalysisDataSlot.h
@@ -18,7 +18,6 @@
 #endif
 
 class TClass;
-class TTree;
 class AliAnalysisDataContainer;
 class AliAnalysisTask;
 
@@ -34,7 +33,6 @@ class AliAnalysisDataSlot : public TNamed {
    AliAnalysisDataSlot &operator=(const AliAnalysisDataSlot &slot);
    // Connect some container to the slot
    Bool_t                    ConnectContainer(AliAnalysisDataContainer *cont);
-   static Int_t              EnableBranch(const char *bname, TTree *tree);
    // Getters
    void                     *GetBranchAddress(const char *branch) const;
    Bool_t                    SetBranchAddress(const char *branch, void *address);